diff --git a/boards/accton-godwit/ga1/src/board_config.h b/boards/accton-godwit/ga1/src/board_config.h index 021b73d331..d82e96a3b7 100644 --- a/boards/accton-godwit/ga1/src/board_config.h +++ b/boards/accton-godwit/ga1/src/board_config.h @@ -259,7 +259,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -286,7 +286,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -452,7 +452,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_PD15, \ diff --git a/boards/accton-godwit/ga1/src/init.cpp b/boards/accton-godwit/ga1/src/init.cpp index ca48a74479..cd1f8afa53 100644 --- a/boards/accton-godwit/ga1/src/init.cpp +++ b/boards/accton-godwit/ga1/src/init.cpp @@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); /* Keep Spektum on to discharge rail*/ @@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_PERIPH_EN(true); } @@ -219,7 +219,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_3V3_SD_CARD_EN(true); VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/accton-godwit/ga1/src/spi.cpp b/boards/accton-godwit/ga1/src/spi.cpp index 7be7fb2ada..7208d44879 100644 --- a/boards/accton-godwit/ga1/src/spi.cpp +++ b/boards/accton-godwit/ga1/src/spi.cpp @@ -48,7 +48,7 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = { }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) diff --git a/boards/ark/fmu-v6x/src/board_config.h b/boards/ark/fmu-v6x/src/board_config.h index 2774b8ef42..049a99d6e6 100644 --- a/boards/ark/fmu-v6x/src/board_config.h +++ b/boards/ark/fmu-v6x/src/board_config.h @@ -273,7 +273,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -295,7 +295,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -455,7 +455,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_PD15, \ diff --git a/boards/ark/fmu-v6x/src/init.c b/boards/ark/fmu-v6x/src/init.c index c60f700af1..ce4911b30f 100644 --- a/boards/ark/fmu-v6x/src/init.c +++ b/boards/ark/fmu-v6x/src/init.c @@ -108,7 +108,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_HIPOWER_EN(false); VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); SPI6_RESET(true); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); @@ -124,7 +124,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_HIPOWER_EN(true); VDD_5V_PERIPH_EN(true); @@ -221,7 +221,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) /* Power on Interfaces */ VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); SPI6_RESET(false); diff --git a/boards/ark/fmu-v6x/src/spi.cpp b/boards/ark/fmu-v6x/src/spi.cpp index fc60153efe..6ef0c9263c 100644 --- a/boards/ark/fmu-v6x/src/spi.cpp +++ b/boards/ark/fmu-v6x/src/spi.cpp @@ -48,7 +48,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -71,7 +71,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) diff --git a/boards/ark/pi6x/src/spi.cpp b/boards/ark/pi6x/src/spi.cpp index bae9af7622..dd9a1f508a 100644 --- a/boards/ark/pi6x/src/spi.cpp +++ b/boards/ark/pi6x/src/spi.cpp @@ -48,7 +48,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), // initSPIBus(SPI::Bus::SPI5, { // initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -69,7 +69,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), // initSPIBus(SPI::Bus::SPI5, { // initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) diff --git a/boards/auterion/fmu-v6x/src/board_config.h b/boards/auterion/fmu-v6x/src/board_config.h index 3ed583edd1..7f9825b14c 100644 --- a/boards/auterion/fmu-v6x/src/board_config.h +++ b/boards/auterion/fmu-v6x/src/board_config.h @@ -262,7 +262,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -289,7 +289,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -453,7 +453,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_PD15, \ diff --git a/boards/auterion/fmu-v6x/src/init.cpp b/boards/auterion/fmu-v6x/src/init.cpp index d11026f677..69ef472ba1 100644 --- a/boards/auterion/fmu-v6x/src/init.cpp +++ b/boards/auterion/fmu-v6x/src/init.cpp @@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); /* Keep Spektum on to discharge rail*/ @@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_PERIPH_EN(true); } @@ -215,7 +215,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_3V3_SD_CARD_EN(true); VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/auterion/fmu-v6x/src/spi.cpp b/boards/auterion/fmu-v6x/src/spi.cpp index b1100edacf..75e81ee566 100644 --- a/boards/auterion/fmu-v6x/src/spi.cpp +++ b/boards/auterion/fmu-v6x/src/spi.cpp @@ -48,7 +48,7 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = { }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) diff --git a/boards/cuav/fmu-v6x/src/board_config.h b/boards/cuav/fmu-v6x/src/board_config.h index fea8513544..8f99505fda 100644 --- a/boards/cuav/fmu-v6x/src/board_config.h +++ b/boards/cuav/fmu-v6x/src/board_config.h @@ -271,7 +271,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -297,7 +297,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -463,7 +463,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_SYNC, \ diff --git a/boards/cuav/fmu-v6x/src/init.cpp b/boards/cuav/fmu-v6x/src/init.cpp index 5ca52e8076..6e70c4a005 100644 --- a/boards/cuav/fmu-v6x/src/init.cpp +++ b/boards/cuav/fmu-v6x/src/init.cpp @@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); /* Keep Spektum on to discharge rail*/ @@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_PERIPH_EN(true); } @@ -219,7 +219,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_3V3_SD_CARD_EN(true); VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/cuav/fmu-v6x/src/spi.cpp b/boards/cuav/fmu-v6x/src/spi.cpp index bb44570b5e..adc897f214 100644 --- a/boards/cuav/fmu-v6x/src/spi.cpp +++ b/boards/cuav/fmu-v6x/src/spi.cpp @@ -49,7 +49,7 @@ constexpr px4_spi_bus_t px4_spi_buses[SPI_BUS_MAX_BUS_ITEMS] = { }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) diff --git a/boards/px4/fmu-v5x/src/board_config.h b/boards/px4/fmu-v5x/src/board_config.h index 8b52624f05..0e35b8f92a 100644 --- a/boards/px4/fmu-v5x/src/board_config.h +++ b/boards/px4/fmu-v5x/src/board_config.h @@ -233,7 +233,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PF12 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTF|GPIO_PIN12) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -258,7 +258,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -409,7 +409,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_PH11, \ diff --git a/boards/px4/fmu-v5x/src/init.cpp b/boards/px4/fmu-v5x/src/init.cpp index 1aacfd6ebd..8c8f4a72a8 100644 --- a/boards/px4/fmu-v5x/src/init.cpp +++ b/boards/px4/fmu-v5x/src/init.cpp @@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); /* Keep Spektum on to discharge rail*/ @@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_PERIPH_EN(true); } @@ -217,7 +217,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_3V3_SD_CARD_EN(true); VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/px4/fmu-v5x/src/spi.cpp b/boards/px4/fmu-v5x/src/spi.cpp index dd6bfbb25e..da01e05828 100644 --- a/boards/px4/fmu-v5x/src/spi.cpp +++ b/boards/px4/fmu-v5x/src/spi.cpp @@ -49,7 +49,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -73,7 +73,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -96,7 +96,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) diff --git a/boards/px4/fmu-v6c/src/board_config.h b/boards/px4/fmu-v6c/src/board_config.h index 52429dc1e4..d7663cddfb 100644 --- a/boards/px4/fmu-v6c/src/board_config.h +++ b/boards/px4/fmu-v6c/src/board_config.h @@ -185,7 +185,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) /* Tone alarm output */ diff --git a/boards/px4/fmu-v6x/src/board_config.h b/boards/px4/fmu-v6x/src/board_config.h index 99c949a2b9..39545d295c 100644 --- a/boards/px4/fmu-v6x/src/board_config.h +++ b/boards/px4/fmu-v6x/src/board_config.h @@ -268,7 +268,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -290,7 +290,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -454,7 +454,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_PD15, \ diff --git a/boards/px4/fmu-v6x/src/init.cpp b/boards/px4/fmu-v6x/src/init.cpp index 5d2a614206..71d10f100e 100644 --- a/boards/px4/fmu-v6x/src/init.cpp +++ b/boards/px4/fmu-v6x/src/init.cpp @@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); /* Keep Spektum on to discharge rail*/ @@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_PERIPH_EN(true); } @@ -219,7 +219,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_3V3_SD_CARD_EN(true); VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/px4/fmu-v6x/src/spi.cpp b/boards/px4/fmu-v6x/src/spi.cpp index eb85a8b7a9..5cb6cba5dc 100644 --- a/boards/px4/fmu-v6x/src/spi.cpp +++ b/boards/px4/fmu-v6x/src/spi.cpp @@ -49,7 +49,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -73,7 +73,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -97,7 +97,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -120,7 +120,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -143,7 +143,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -166,7 +166,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) @@ -190,7 +190,7 @@ constexpr px4_spi_bus_all_hw_t px4_spi_buses_all_hw[BOARD_NUM_SPI_CFG_HW_VERSION }, {GPIO::PortE, GPIO::Pin7}), // initSPIBus(SPI::Bus::SPI4, { // // no devices - // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS4_EN from board_config.h + // TODO: if enabled, remove GPIO_VDD_3V3_SENSORS_EN from board_config.h // }, {GPIO::PortG, GPIO::Pin8}), initSPIBus(SPI::Bus::SPI5, { initSPIDevice(SPIDEV_FLASH(0), SPI::CS{GPIO::PortG, GPIO::Pin7}) diff --git a/boards/radiolink/PIX6/src/board_config.h b/boards/radiolink/PIX6/src/board_config.h index 845d5d7bd4..94535c0e7e 100644 --- a/boards/radiolink/PIX6/src/board_config.h +++ b/boards/radiolink/PIX6/src/board_config.h @@ -161,7 +161,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) diff --git a/boards/radiolink/PIX6/src/init.cpp b/boards/radiolink/PIX6/src/init.cpp index 6db9aea80f..04fd1231b0 100644 --- a/boards/radiolink/PIX6/src/init.cpp +++ b/boards/radiolink/PIX6/src/init.cpp @@ -108,7 +108,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); /* Keep Spektum on to discharge rail*/ @@ -123,7 +123,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_PERIPH_EN(true); } @@ -212,7 +212,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/sky-drones/smartap-airlink/src/board_config.h b/boards/sky-drones/smartap-airlink/src/board_config.h index d74d40a68f..48c7695cb9 100644 --- a/boards/sky-drones/smartap-airlink/src/board_config.h +++ b/boards/sky-drones/smartap-airlink/src/board_config.h @@ -210,7 +210,7 @@ #define GPIO_VDD_3V5_LTE_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PF12 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTF|GPIO_PIN12) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) /* Spare GPIO */ @@ -227,7 +227,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_3V5_LTE_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V5_LTE_nEN, on_true) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, on_true) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) /* Tone alarm output */ @@ -342,7 +342,7 @@ GPIO_VDD_3V5_LTE_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_PH11, \ GPIO_NFC_GPIO, \ GPIO_TONE_ALARM_IDLE, \ diff --git a/boards/sky-drones/smartap-airlink/src/init.cpp b/boards/sky-drones/smartap-airlink/src/init.cpp index 07aab31e64..fa99e83feb 100644 --- a/boards/sky-drones/smartap-airlink/src/init.cpp +++ b/boards/sky-drones/smartap-airlink/src/init.cpp @@ -109,7 +109,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_3V5_LTE_EN(false); VDD_5V_HIPOWER_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); /* wait for the peripheral rail to reach GND */ usleep(ms * 1000); @@ -121,7 +121,7 @@ __EXPORT void board_peripheral_reset(int ms) board_control_spi_sensors_power(true, 0xffff); VDD_3V5_LTE_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); } @@ -211,7 +211,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) /* Power on Interfaces */ VDD_3V5_LTE_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/svehicle/e2/src/board_config.h b/boards/svehicle/e2/src/board_config.h index bb06d291c2..778224ae4c 100644 --- a/boards/svehicle/e2/src/board_config.h +++ b/boards/svehicle/e2/src/board_config.h @@ -259,7 +259,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -276,7 +276,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -420,7 +420,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_ETH_POWER_EN, \ diff --git a/boards/svehicle/e2/src/init.c b/boards/svehicle/e2/src/init.c index 585bb41d5e..a497635ccd 100644 --- a/boards/svehicle/e2/src/init.c +++ b/boards/svehicle/e2/src/init.c @@ -212,7 +212,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_3V3_SD_CARD_EN(true); VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */ diff --git a/boards/zeroone/x6/src/board_config.h b/boards/zeroone/x6/src/board_config.h index 8c1235826f..f26740e790 100644 --- a/boards/zeroone/x6/src/board_config.h +++ b/boards/zeroone/x6/src/board_config.h @@ -267,7 +267,7 @@ #define GPIO_VDD_5V_PERIPH_nOC /* PE15 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTE|GPIO_PIN15) #define GPIO_VDD_5V_HIPOWER_nEN /* PG10 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTG|GPIO_PIN10) #define GPIO_VDD_5V_HIPOWER_nOC /* PF13 */ (GPIO_INPUT |GPIO_FLOAT|GPIO_PORTF|GPIO_PIN13) -#define GPIO_VDD_3V3_SENSORS4_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) +#define GPIO_VDD_3V3_SENSORS_EN /* PG8 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTG|GPIO_PIN8) #define GPIO_VDD_3V3_SPEKTRUM_POWER_EN /* PH2 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTH|GPIO_PIN2) #define GPIO_VDD_3V3_SD_CARD_EN /* PC13 */ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13) @@ -289,7 +289,7 @@ #define VDD_5V_PERIPH_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_PERIPH_nEN, !(on_true)) #define VDD_5V_HIPOWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_5V_HIPOWER_nEN, !(on_true)) -#define VDD_3V3_SENSORS4_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS4_EN, (on_true)) +#define VDD_3V3_SENSORS_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SENSORS_EN, (on_true)) #define VDD_3V3_SPEKTRUM_POWER_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SPEKTRUM_POWER_EN, (on_true)) #define READ_VDD_3V3_SPEKTRUM_POWER_EN() px4_arch_gpioread(GPIO_VDD_3V3_SPEKTRUM_POWER_EN) #define VDD_3V3_SD_CARD_EN(on_true) px4_arch_gpiowrite(GPIO_VDD_3V3_SD_CARD_EN, (on_true)) @@ -452,7 +452,7 @@ GPIO_VDD_5V_PERIPH_nOC, \ GPIO_VDD_5V_HIPOWER_nEN, \ GPIO_VDD_5V_HIPOWER_nOC, \ - GPIO_VDD_3V3_SENSORS4_EN, \ + GPIO_VDD_3V3_SENSORS_EN, \ GPIO_VDD_3V3_SPEKTRUM_POWER_EN, \ GPIO_VDD_3V3_SD_CARD_EN, \ GPIO_PD15, \ diff --git a/boards/zeroone/x6/src/init.c b/boards/zeroone/x6/src/init.c index 6320b5580e..fcd2135296 100644 --- a/boards/zeroone/x6/src/init.c +++ b/boards/zeroone/x6/src/init.c @@ -107,7 +107,7 @@ __EXPORT void board_peripheral_reset(int ms) VDD_5V_PERIPH_EN(false); board_control_spi_sensors_power(false, 0xffff); - VDD_3V3_SENSORS4_EN(false); + VDD_3V3_SENSORS_EN(false); bool last = READ_VDD_3V3_SPEKTRUM_POWER_EN(); /* Keep Spektum on to discharge rail*/ @@ -122,7 +122,7 @@ __EXPORT void board_peripheral_reset(int ms) /* switch the peripheral rail back on */ VDD_3V3_SPEKTRUM_POWER_EN(last); board_control_spi_sensors_power(true, 0xffff); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_5V_PERIPH_EN(true); } @@ -219,7 +219,7 @@ __EXPORT int board_app_initialize(uintptr_t arg) VDD_3V3_SD_CARD_EN(true); VDD_5V_PERIPH_EN(true); VDD_5V_HIPOWER_EN(true); - VDD_3V3_SENSORS4_EN(true); + VDD_3V3_SENSORS_EN(true); VDD_3V3_SPEKTRUM_POWER_EN(true); /* Need hrt running before using the ADC */