diff --git a/ROMFS/px4fmu_test/init.d/rc.sensors b/ROMFS/px4fmu_test/init.d/rc.sensors index e36ca9c674..5103d15912 100644 --- a/ROMFS/px4fmu_test/init.d/rc.sensors +++ b/ROMFS/px4fmu_test/init.d/rc.sensors @@ -12,7 +12,7 @@ if bst start -X then fi -if adc start +if board_adc start then fi diff --git a/boards/airmind/mindpx-v2/default.cmake b/boards/airmind/mindpx-v2/default.cmake index c47a90fdad..0341f5bf91 100644 --- a/boards/airmind/mindpx-v2/default.cmake +++ b/boards/airmind/mindpx-v2/default.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/airmind/mindpx-v2/init/rc.board_sensors b/boards/airmind/mindpx-v2/init/rc.board_sensors index c0aec4c19d..9a85c715d7 100644 --- a/boards/airmind/mindpx-v2/init/rc.board_sensors +++ b/boards/airmind/mindpx-v2/init/rc.board_sensors @@ -3,7 +3,7 @@ # Airmind Mindpx-v2 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal I2C bus hmc5883 -T -I -R 12 start diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake index fd3c5a0441..e0be6b8c4f 100644 --- a/boards/av/x-v1/default.cmake +++ b/boards/av/x-v1/default.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL3:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/av/x-v1/init/rc.board_sensors b/boards/av/x-v1/init/rc.board_sensors index 961e306621..215d39b042 100644 --- a/boards/av/x-v1/init/rc.board_sensors +++ b/boards/av/x-v1/init/rc.board_sensors @@ -3,7 +3,7 @@ # av_x1-v1 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start adis16477 -s -R 8 start diff --git a/boards/beaglebone/blue/default.cmake b/boards/beaglebone/blue/default.cmake index 9feafcd7bc..5d0bdceea0 100644 --- a/boards/beaglebone/blue/default.cmake +++ b/boards/beaglebone/blue/default.cmake @@ -13,7 +13,7 @@ px4_add_board( TOOLCHAIN arm-linux-gnueabihf TESTING DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/bmp280 batt_smbus diff --git a/boards/bitcraze/crazyflie/init/rc.board_sensors b/boards/bitcraze/crazyflie/init/rc.board_sensors index 4bff8b20d5..fdbf6058dd 100644 --- a/boards/bitcraze/crazyflie/init/rc.board_sensors +++ b/boards/bitcraze/crazyflie/init/rc.board_sensors @@ -3,7 +3,7 @@ # Bitcraze Crazyflie specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Onboard I2C mpu9250 -I -R 12 start diff --git a/boards/cuav/nora/default.cmake b/boards/cuav/nora/default.cmake index a200a7b158..b1356dd5a6 100644 --- a/boards/cuav/nora/default.cmake +++ b/boards/cuav/nora/default.cmake @@ -19,7 +19,7 @@ px4_add_board( # CONSOLE: /dev/ttyS4 # RC: /dev/ttyS5 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/cuav/nora/init/rc.board_sensors b/boards/cuav/nora/init/rc.board_sensors index 81a51ac496..e12b50a5e5 100644 --- a/boards/cuav/nora/init/rc.board_sensors +++ b/boards/cuav/nora/init/rc.board_sensors @@ -2,7 +2,7 @@ # # board specific sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # SPI1 (internal) rm3100 -s start diff --git a/boards/cuav/x7pro/default.cmake b/boards/cuav/x7pro/default.cmake index af81e6583f..55b3ba1841 100644 --- a/boards/cuav/x7pro/default.cmake +++ b/boards/cuav/x7pro/default.cmake @@ -19,7 +19,7 @@ px4_add_board( # CONSOLE: /dev/ttyS4 # RC: /dev/ttyS5 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/cuav/x7pro/init/rc.board_sensors b/boards/cuav/x7pro/init/rc.board_sensors index 8aaa003e4b..d7071ff79f 100644 --- a/boards/cuav/x7pro/init/rc.board_sensors +++ b/boards/cuav/x7pro/init/rc.board_sensors @@ -2,7 +2,7 @@ # # CUAV X7Pro specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # SPI1 (internal) #adis16470 -s start diff --git a/boards/cubepilot/cubeorange/default.cmake b/boards/cubepilot/cubeorange/default.cmake index b10f625153..ccad4b489b 100644 --- a/boards/cubepilot/cubeorange/default.cmake +++ b/boards/cubepilot/cubeorange/default.cmake @@ -19,7 +19,7 @@ px4_add_board( # CONSOLE:/dev/ttyS4 GPS2:/dev/ttyS5 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/cubepilot/cubeorange/init/rc.board_sensors b/boards/cubepilot/cubeorange/init/rc.board_sensors index b8377cadfd..6a0a7ac88a 100644 --- a/boards/cubepilot/cubeorange/init/rc.board_sensors +++ b/boards/cubepilot/cubeorange/init/rc.board_sensors @@ -2,7 +2,7 @@ # # Board specific sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # SPI1 ms5611 -s -b 1 start diff --git a/boards/cubepilot/cubeyellow/default.cmake b/boards/cubepilot/cubeyellow/default.cmake index 3acae0c6e2..847f8f419e 100644 --- a/boards/cubepilot/cubeyellow/default.cmake +++ b/boards/cubepilot/cubeyellow/default.cmake @@ -18,7 +18,7 @@ px4_add_board( # CONSOLE:/dev/ttyS4 GPS2:/dev/ttyS5 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/cubepilot/cubeyellow/init/rc.board_sensors b/boards/cubepilot/cubeyellow/init/rc.board_sensors index b8377cadfd..6a0a7ac88a 100644 --- a/boards/cubepilot/cubeyellow/init/rc.board_sensors +++ b/boards/cubepilot/cubeyellow/init/rc.board_sensors @@ -2,7 +2,7 @@ # # Board specific sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # SPI1 ms5611 -s -b 1 start diff --git a/boards/emlid/navio2/default.cmake b/boards/emlid/navio2/default.cmake index e403485752..dcdd951258 100644 --- a/boards/emlid/navio2/default.cmake +++ b/boards/emlid/navio2/default.cmake @@ -11,7 +11,7 @@ px4_add_board( TOOLCHAIN arm-linux-gnueabihf TESTING DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 batt_smbus diff --git a/boards/holybro/durandal-v1/default.cmake b/boards/holybro/durandal-v1/default.cmake index f223fe721f..8d78fc8df1 100644 --- a/boards/holybro/durandal-v1/default.cmake +++ b/boards/holybro/durandal-v1/default.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/holybro/durandal-v1/init/rc.board_sensors b/boards/holybro/durandal-v1/init/rc.board_sensors index 211eabf0c7..99f3d37a74 100644 --- a/boards/holybro/durandal-v1/init/rc.board_sensors +++ b/boards/holybro/durandal-v1/init/rc.board_sensors @@ -2,7 +2,7 @@ # # Holybro Durandal V1 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal SPI bus ICM-20689 icm20689 -R 2 -s start diff --git a/boards/holybro/durandal-v1/stackcheck.cmake b/boards/holybro/durandal-v1/stackcheck.cmake index f13f47127a..31d73b3024 100644 --- a/boards/holybro/durandal-v1/stackcheck.cmake +++ b/boards/holybro/durandal-v1/stackcheck.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 batt_smbus diff --git a/boards/holybro/kakutef7/default.cmake b/boards/holybro/kakutef7/default.cmake index 64703e3984..63f96a8bd5 100644 --- a/boards/holybro/kakutef7/default.cmake +++ b/boards/holybro/kakutef7/default.cmake @@ -16,7 +16,7 @@ px4_add_board( RC:/dev/ttyS4 # UART6 # /dev/ttyS5: UART7 (ESC telemetry) DRIVERS - adc + adc/board_adc barometer/bmp280 dshot gps diff --git a/boards/holybro/kakutef7/init/rc.board_sensors b/boards/holybro/kakutef7/init/rc.board_sensors index 637a968373..0e9cf2a9ef 100644 --- a/boards/holybro/kakutef7/init/rc.board_sensors +++ b/boards/holybro/kakutef7/init/rc.board_sensors @@ -3,7 +3,7 @@ # KakuteF7 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # The default IMU is an ICM20689, but there might also be an MPU6000 if ! mpu6000 -R 6 -s start diff --git a/boards/holybro/pix32v5/default.cmake b/boards/holybro/pix32v5/default.cmake index 0db0d8f632..aa83f941d4 100644 --- a/boards/holybro/pix32v5/default.cmake +++ b/boards/holybro/pix32v5/default.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL3:/dev/ttyS4 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/holybro/pix32v5/init/rc.board_sensors b/boards/holybro/pix32v5/init/rc.board_sensors index 3e3e960404..26d3e136a0 100644 --- a/boards/holybro/pix32v5/init/rc.board_sensors +++ b/boards/holybro/pix32v5/init/rc.board_sensors @@ -3,7 +3,7 @@ # PX4 FMUv5 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal SPI bus ICM-20602 icm20602 -s -R 2 start diff --git a/boards/modalai/fc-v1/default.cmake b/boards/modalai/fc-v1/default.cmake index 0d053d385d..69cfa3ad70 100644 --- a/boards/modalai/fc-v1/default.cmake +++ b/boards/modalai/fc-v1/default.cmake @@ -15,7 +15,7 @@ px4_add_board( TEL2:/dev/ttyS4 # UART5 / J1 TEL3:/dev/ttyS1 # USART2 / J4 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/modalai/fc-v1/init/rc.board_sensors b/boards/modalai/fc-v1/init/rc.board_sensors index c14d28fc39..d99330afd7 100644 --- a/boards/modalai/fc-v1/init/rc.board_sensors +++ b/boards/modalai/fc-v1/init/rc.board_sensors @@ -3,7 +3,7 @@ # ModalAI FC-v1 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Start Digital power monitors voxlpm -X -b 3 -K -T VBATT start diff --git a/boards/mro/ctrl-zero-f7/default.cmake b/boards/mro/ctrl-zero-f7/default.cmake index 06abd5e87c..84df969ad7 100644 --- a/boards/mro/ctrl-zero-f7/default.cmake +++ b/boards/mro/ctrl-zero-f7/default.cmake @@ -17,7 +17,7 @@ px4_add_board( #CONSOLE:/dev/ttyS4 #FRSKY:/dev/ttyS5 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/dps310 batt_smbus diff --git a/boards/mro/ctrl-zero-f7/init/rc.board_sensors b/boards/mro/ctrl-zero-f7/init/rc.board_sensors index 19ca45eb41..79d2b3bacc 100644 --- a/boards/mro/ctrl-zero-f7/init/rc.board_sensors +++ b/boards/mro/ctrl-zero-f7/init/rc.board_sensors @@ -3,7 +3,7 @@ # mRo Control Zero specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal ICM-20602 icm20602 -s -R 8 start diff --git a/boards/mro/x21-777/default.cmake b/boards/mro/x21-777/default.cmake index 3baa931d10..ee5f34f4ac 100644 --- a/boards/mro/x21-777/default.cmake +++ b/boards/mro/x21-777/default.cmake @@ -19,7 +19,7 @@ px4_add_board( # CONSOLE:/dev/tty5 # OSD:/dev/tty6 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/mro/x21-777/init/rc.board_sensors b/boards/mro/x21-777/init/rc.board_sensors index 4670a29b06..402b84792a 100644 --- a/boards/mro/x21-777/init/rc.board_sensors +++ b/boards/mro/x21-777/init/rc.board_sensors @@ -2,7 +2,7 @@ # # Board specific sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # SPI1 ms5611 -s -b 1 start diff --git a/boards/mro/x21/default.cmake b/boards/mro/x21/default.cmake index bf342918d7..d07ed40104 100644 --- a/boards/mro/x21/default.cmake +++ b/boards/mro/x21/default.cmake @@ -15,7 +15,7 @@ px4_add_board( TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/mro/x21/init/rc.board_sensors b/boards/mro/x21/init/rc.board_sensors index 5efe2747dc..22ccc1b52d 100644 --- a/boards/mro/x21/init/rc.board_sensors +++ b/boards/mro/x21/init/rc.board_sensors @@ -3,7 +3,7 @@ # mRo x21 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal SPI bus ICM-20608-G icm20608g -s -R 8 start diff --git a/boards/nxp/fmuk66-e/default.cmake b/boards/nxp/fmuk66-e/default.cmake index c57fe07bad..4b0a3e6925 100644 --- a/boards/nxp/fmuk66-e/default.cmake +++ b/boards/nxp/fmuk66-e/default.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS4 TEL2:/dev/ttyS1 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers barometer/mpl3115a2 batt_smbus diff --git a/boards/nxp/fmuk66-e/init/rc.board_sensors b/boards/nxp/fmuk66-e/init/rc.board_sensors index 99f18aac6f..492c942f68 100644 --- a/boards/nxp/fmuk66-e/init/rc.board_sensors +++ b/boards/nxp/fmuk66-e/init/rc.board_sensors @@ -3,7 +3,7 @@ # NXP fmuk66-e specific board defaults #------------------------------------------------------------------------------ -adc start +board_adc start # Internal Mag I2C bus roll 180, yaw 90 bmm150 -I -R 10 start diff --git a/boards/nxp/fmuk66-e/socketcan.cmake b/boards/nxp/fmuk66-e/socketcan.cmake index 8003adc163..9c3f56b775 100644 --- a/boards/nxp/fmuk66-e/socketcan.cmake +++ b/boards/nxp/fmuk66-e/socketcan.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS4 TEL2:/dev/ttyS1 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers barometer/mpl3115a2 batt_smbus diff --git a/boards/nxp/fmuk66-v3/default.cmake b/boards/nxp/fmuk66-v3/default.cmake index 0a4d3a1ec7..f4efcb24d7 100644 --- a/boards/nxp/fmuk66-v3/default.cmake +++ b/boards/nxp/fmuk66-v3/default.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS4 TEL2:/dev/ttyS1 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers barometer/mpl3115a2 batt_smbus diff --git a/boards/nxp/fmuk66-v3/init/rc.board_sensors b/boards/nxp/fmuk66-v3/init/rc.board_sensors index ca32c571cc..c6ca931a93 100644 --- a/boards/nxp/fmuk66-v3/init/rc.board_sensors +++ b/boards/nxp/fmuk66-v3/init/rc.board_sensors @@ -3,7 +3,7 @@ # NXP fmuk66-v3 specific board defaults #------------------------------------------------------------------------------ -adc start +board_adc start # Internal Mag I2C bus roll 180, yaw 90 bmm150 -I -R 10 start diff --git a/boards/nxp/fmuk66-v3/socketcan.cmake b/boards/nxp/fmuk66-v3/socketcan.cmake index 67462f8d39..95eb123344 100644 --- a/boards/nxp/fmuk66-v3/socketcan.cmake +++ b/boards/nxp/fmuk66-v3/socketcan.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS4 TEL2:/dev/ttyS1 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers barometer/mpl3115a2 batt_smbus diff --git a/boards/nxp/fmurt1062-v1/default.cmake b/boards/nxp/fmurt1062-v1/default.cmake index 57adcbe9cc..4116ae87e7 100644 --- a/boards/nxp/fmurt1062-v1/default.cmake +++ b/boards/nxp/fmurt1062-v1/default.cmake @@ -17,7 +17,7 @@ px4_add_board( GPS2:/dev/ttyS4 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/nxp/fmurt1062-v1/init/rc.board_sensors b/boards/nxp/fmurt1062-v1/init/rc.board_sensors index 2b6a09fbe2..8d2b0d7808 100644 --- a/boards/nxp/fmurt1062-v1/init/rc.board_sensors +++ b/boards/nxp/fmurt1062-v1/init/rc.board_sensors @@ -15,7 +15,7 @@ # #------------------------------------------------------------------------------ -adc start +board_adc start # Internal SPI bus ICM-20602 icm20602 -R 2 -s start diff --git a/boards/nxp/rddrone-uavcan146/default.cmake b/boards/nxp/rddrone-uavcan146/default.cmake index 0568cc51a2..c9a2bfdc43 100644 --- a/boards/nxp/rddrone-uavcan146/default.cmake +++ b/boards/nxp/rddrone-uavcan146/default.cmake @@ -28,7 +28,7 @@ px4_add_board( ROMFSROOT cannode UAVCAN_INTERFACES 2 DRIVERS - #adc + #adc/board_adc #barometer # all available barometer drivers #bootloaders #differential_pressure # all available differential pressure drivers diff --git a/boards/omnibus/f4sd/default.cmake b/boards/omnibus/f4sd/default.cmake index ec3a4bf403..a6b39be51d 100644 --- a/boards/omnibus/f4sd/default.cmake +++ b/boards/omnibus/f4sd/default.cmake @@ -11,7 +11,7 @@ px4_add_board( TEL2:/dev/ttyS1 URT6:/dev/ttyS2 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/bmp280 #batt_smbus diff --git a/boards/omnibus/f4sd/init/rc.board_sensors b/boards/omnibus/f4sd/init/rc.board_sensors index f00d6bb4d2..2fa62a88ff 100644 --- a/boards/omnibus/f4sd/init/rc.board_sensors +++ b/boards/omnibus/f4sd/init/rc.board_sensors @@ -3,7 +3,7 @@ # Omnibus F4SD specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start if ! mpu6000 -R 6 -s start then diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake index b169e5c707..4bf35f57fa 100644 --- a/boards/px4/fmu-v2/default.cmake +++ b/boards/px4/fmu-v2/default.cmake @@ -18,7 +18,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 #batt_smbus diff --git a/boards/px4/fmu-v2/fixedwing.cmake b/boards/px4/fmu-v2/fixedwing.cmake index a940b3832e..69355e4ef2 100644 --- a/boards/px4/fmu-v2/fixedwing.cmake +++ b/boards/px4/fmu-v2/fixedwing.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 #batt_smbus diff --git a/boards/px4/fmu-v2/init/rc.board_sensors b/boards/px4/fmu-v2/init/rc.board_sensors index eda07d9c72..ceae143f10 100644 --- a/boards/px4/fmu-v2/init/rc.board_sensors +++ b/boards/px4/fmu-v2/init/rc.board_sensors @@ -5,7 +5,7 @@ rgbled start -I -adc start +board_adc start # Internal I2C bus hmc5883 -T -I -R 4 start diff --git a/boards/px4/fmu-v2/lpe.cmake b/boards/px4/fmu-v2/lpe.cmake index db737270b3..8b144f5a8d 100644 --- a/boards/px4/fmu-v2/lpe.cmake +++ b/boards/px4/fmu-v2/lpe.cmake @@ -20,7 +20,7 @@ px4_add_board( TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 #batt_smbus diff --git a/boards/px4/fmu-v2/multicopter.cmake b/boards/px4/fmu-v2/multicopter.cmake index 08dceecfb3..20255775b2 100644 --- a/boards/px4/fmu-v2/multicopter.cmake +++ b/boards/px4/fmu-v2/multicopter.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc barometer/ms5611 #batt_smbus camera_capture diff --git a/boards/px4/fmu-v2/rover.cmake b/boards/px4/fmu-v2/rover.cmake index 412fd3ae0d..97ef3324f6 100644 --- a/boards/px4/fmu-v2/rover.cmake +++ b/boards/px4/fmu-v2/rover.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc barometer/ms5611 batt_smbus camera_capture diff --git a/boards/px4/fmu-v2/test.cmake b/boards/px4/fmu-v2/test.cmake index 2e918e92cf..2a466d0275 100644 --- a/boards/px4/fmu-v2/test.cmake +++ b/boards/px4/fmu-v2/test.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 #batt_smbus diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake index 2dd5f64326..e996050b2e 100644 --- a/boards/px4/fmu-v3/default.cmake +++ b/boards/px4/fmu-v3/default.cmake @@ -18,7 +18,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v3/init/rc.board_sensors b/boards/px4/fmu-v3/init/rc.board_sensors index f2b4ba683b..832d2cd828 100644 --- a/boards/px4/fmu-v3/init/rc.board_sensors +++ b/boards/px4/fmu-v3/init/rc.board_sensors @@ -5,7 +5,7 @@ rgbled start -I -adc start +board_adc start # Internal I2C bus hmc5883 -T -I -R 4 start diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake index fb1c6671dc..4584c10eba 100644 --- a/boards/px4/fmu-v3/rtps.cmake +++ b/boards/px4/fmu-v3/rtps.cmake @@ -18,7 +18,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake index 74570143ac..691ed0c14c 100644 --- a/boards/px4/fmu-v3/stackcheck.cmake +++ b/boards/px4/fmu-v3/stackcheck.cmake @@ -20,7 +20,7 @@ px4_add_board( TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v4/cannode.cmake b/boards/px4/fmu-v4/cannode.cmake index 238491e6d6..589cd173da 100644 --- a/boards/px4/fmu-v4/cannode.cmake +++ b/boards/px4/fmu-v4/cannode.cmake @@ -32,7 +32,7 @@ px4_add_board( TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 bootloaders diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake index 9e9a6bed9b..686983ea86 100644 --- a/boards/px4/fmu-v4/default.cmake +++ b/boards/px4/fmu-v4/default.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v4/init/rc.board_sensors b/boards/px4/fmu-v4/init/rc.board_sensors index a5c89bbc3c..b6f2662f17 100644 --- a/boards/px4/fmu-v4/init/rc.board_sensors +++ b/boards/px4/fmu-v4/init/rc.board_sensors @@ -3,7 +3,7 @@ # PX4 FMUv4 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # We know there are sketchy boards out there # as chinese companies produce Pixracers without diff --git a/boards/px4/fmu-v4/optimized.cmake b/boards/px4/fmu-v4/optimized.cmake index 9829817ad7..eafe639800 100644 --- a/boards/px4/fmu-v4/optimized.cmake +++ b/boards/px4/fmu-v4/optimized.cmake @@ -18,7 +18,7 @@ px4_add_board( TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake index 743ffd306b..cf364674be 100644 --- a/boards/px4/fmu-v4/rtps.cmake +++ b/boards/px4/fmu-v4/rtps.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake index abf9b9bdf1..443a293992 100644 --- a/boards/px4/fmu-v4/stackcheck.cmake +++ b/boards/px4/fmu-v4/stackcheck.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL1:/dev/ttyS1 TEL2:/dev/ttyS2 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake index 6d793e059e..4363d66942 100644 --- a/boards/px4/fmu-v4pro/default.cmake +++ b/boards/px4/fmu-v4pro/default.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL3:/dev/ttyS0 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v4pro/init/rc.board_sensors b/boards/px4/fmu-v4pro/init/rc.board_sensors index 0b211f0cb9..ba81374533 100644 --- a/boards/px4/fmu-v4pro/init/rc.board_sensors +++ b/boards/px4/fmu-v4pro/init/rc.board_sensors @@ -5,7 +5,7 @@ rgbled start -I -adc start +board_adc start # Internal SPI bus ICM-20602 or ICM-20608-G if ! icm20602 -s -R 8 start diff --git a/boards/px4/fmu-v4pro/rtps.cmake b/boards/px4/fmu-v4pro/rtps.cmake index dfa6b7ce49..31767457d1 100644 --- a/boards/px4/fmu-v4pro/rtps.cmake +++ b/boards/px4/fmu-v4pro/rtps.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL3:/dev/ttyS0 TEL4:/dev/ttyS6 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/critmonitor.cmake b/boards/px4/fmu-v5/critmonitor.cmake index 19352c7d72..18b0910090 100644 --- a/boards/px4/fmu-v5/critmonitor.cmake +++ b/boards/px4/fmu-v5/critmonitor.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/debug.cmake b/boards/px4/fmu-v5/debug.cmake index 420f0ad62b..3f5f1b3966 100644 --- a/boards/px4/fmu-v5/debug.cmake +++ b/boards/px4/fmu-v5/debug.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 #batt_smbus diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake index 9bede18cfd..96c0e53bec 100644 --- a/boards/px4/fmu-v5/default.cmake +++ b/boards/px4/fmu-v5/default.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/fixedwing.cmake b/boards/px4/fmu-v5/fixedwing.cmake index 0b0937a94a..079c1c3d72 100644 --- a/boards/px4/fmu-v5/fixedwing.cmake +++ b/boards/px4/fmu-v5/fixedwing.cmake @@ -15,7 +15,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/init/rc.board_sensors b/boards/px4/fmu-v5/init/rc.board_sensors index 4b110bf3b1..712e3b6d7e 100644 --- a/boards/px4/fmu-v5/init/rc.board_sensors +++ b/boards/px4/fmu-v5/init/rc.board_sensors @@ -3,7 +3,7 @@ # PX4 FMUv5 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal SPI bus ICM-20602 icm20602 -s -R 2 -q start diff --git a/boards/px4/fmu-v5/irqmonitor.cmake b/boards/px4/fmu-v5/irqmonitor.cmake index cddd638256..95d49ec590 100644 --- a/boards/px4/fmu-v5/irqmonitor.cmake +++ b/boards/px4/fmu-v5/irqmonitor.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/multicopter.cmake b/boards/px4/fmu-v5/multicopter.cmake index 2d000adcec..850223af14 100644 --- a/boards/px4/fmu-v5/multicopter.cmake +++ b/boards/px4/fmu-v5/multicopter.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/optimized.cmake b/boards/px4/fmu-v5/optimized.cmake index 332049c100..723e537b11 100644 --- a/boards/px4/fmu-v5/optimized.cmake +++ b/boards/px4/fmu-v5/optimized.cmake @@ -20,7 +20,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/rover.cmake b/boards/px4/fmu-v5/rover.cmake index acad9e0c5e..f96ea900f9 100644 --- a/boards/px4/fmu-v5/rover.cmake +++ b/boards/px4/fmu-v5/rover.cmake @@ -15,7 +15,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake index a1f5de2c15..04e66f1934 100644 --- a/boards/px4/fmu-v5/rtps.cmake +++ b/boards/px4/fmu-v5/rtps.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake index be0249c06b..8009783856 100644 --- a/boards/px4/fmu-v5/stackcheck.cmake +++ b/boards/px4/fmu-v5/stackcheck.cmake @@ -16,7 +16,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc #barometer # all available barometer drivers barometer/ms5611 #batt_smbus diff --git a/boards/px4/fmu-v5x/base_phy_DP83848C.cmake b/boards/px4/fmu-v5x/base_phy_DP83848C.cmake index e1f9d7bd5d..7c032b4647 100644 --- a/boards/px4/fmu-v5x/base_phy_DP83848C.cmake +++ b/boards/px4/fmu-v5x/base_phy_DP83848C.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL3:/dev/ttyS1 GPS2:/dev/ttyS7 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5x/default.cmake b/boards/px4/fmu-v5x/default.cmake index 6fb1790f5c..9b4bd1b365 100644 --- a/boards/px4/fmu-v5x/default.cmake +++ b/boards/px4/fmu-v5x/default.cmake @@ -17,7 +17,7 @@ px4_add_board( TEL3:/dev/ttyS1 GPS2:/dev/ttyS7 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v5x/init/rc.board_sensors b/boards/px4/fmu-v5x/init/rc.board_sensors index 74e17e6cda..cf55517f3f 100644 --- a/boards/px4/fmu-v5x/init/rc.board_sensors +++ b/boards/px4/fmu-v5x/init/rc.board_sensors @@ -2,7 +2,7 @@ # # PX4 FMUv5X specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Start Digital power monitors ina226 -X -b 1 -t 1 -k start diff --git a/boards/px4/fmu-v6x/default.cmake b/boards/px4/fmu-v6x/default.cmake index fd21246684..a0ba89b333 100644 --- a/boards/px4/fmu-v6x/default.cmake +++ b/boards/px4/fmu-v6x/default.cmake @@ -18,7 +18,7 @@ px4_add_board( TEL3:/dev/ttyS1 GPS2:/dev/ttyS7 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/px4/fmu-v6x/init/rc.board_sensors b/boards/px4/fmu-v6x/init/rc.board_sensors index bcc632848e..79ef7b2ad0 100644 --- a/boards/px4/fmu-v6x/init/rc.board_sensors +++ b/boards/px4/fmu-v6x/init/rc.board_sensors @@ -3,7 +3,7 @@ # PX4 FMUv6X specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Start Digital power monitors ina226 -X -b 1 -t 1 -k start diff --git a/boards/px4/fmu-v6x/stackcheck.cmake b/boards/px4/fmu-v6x/stackcheck.cmake index fd21246684..a0ba89b333 100644 --- a/boards/px4/fmu-v6x/stackcheck.cmake +++ b/boards/px4/fmu-v6x/stackcheck.cmake @@ -18,7 +18,7 @@ px4_add_board( TEL3:/dev/ttyS1 GPS2:/dev/ttyS7 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers batt_smbus camera_capture diff --git a/boards/spracing/h7extreme/default.cmake b/boards/spracing/h7extreme/default.cmake index af50e03333..12adcf1a15 100644 --- a/boards/spracing/h7extreme/default.cmake +++ b/boards/spracing/h7extreme/default.cmake @@ -13,7 +13,7 @@ px4_add_board( # TEL2:/dev/ttyS2 # TEL4:/dev/ttyS3 DRIVERS - adc + adc/board_adc barometer # all available barometer drivers #batt_smbus camera_capture diff --git a/boards/spracing/h7extreme/init/rc.board_sensors b/boards/spracing/h7extreme/init/rc.board_sensors index 077520337f..d189faaff3 100644 --- a/boards/spracing/h7extreme/init/rc.board_sensors +++ b/boards/spracing/h7extreme/init/rc.board_sensors @@ -2,7 +2,7 @@ # # SP Racing H7 EXTREME specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal SPI bus ICM-20602 mpu6000 -s -b 2 -R 11 -T 20602 start # SPI 2 diff --git a/boards/uvify/core/default.cmake b/boards/uvify/core/default.cmake index 490c75709d..8f3738422d 100644 --- a/boards/uvify/core/default.cmake +++ b/boards/uvify/core/default.cmake @@ -14,7 +14,7 @@ px4_add_board( TEL2:/dev/ttyS2 TEL3:/dev/ttyS6 DRIVERS - adc + adc/board_adc barometer/ms5611 batt_smbus camera_capture diff --git a/boards/uvify/core/init/rc.board_sensors b/boards/uvify/core/init/rc.board_sensors index 9771bcce7b..eb3e3a410d 100644 --- a/boards/uvify/core/init/rc.board_sensors +++ b/boards/uvify/core/init/rc.board_sensors @@ -3,7 +3,7 @@ # UVify UVF4 specific board sensors init #------------------------------------------------------------------------------ -adc start +board_adc start # Internal SPI if ! ms5611 -T 5607 -s start diff --git a/posix-configs/bbblue/px4.config b/posix-configs/bbblue/px4.config index 27e8161272..08856d59d8 100644 --- a/posix-configs/bbblue/px4.config +++ b/posix-configs/bbblue/px4.config @@ -58,7 +58,7 @@ gps start -d /dev/ttyS2 -s -p ubx #rgbled start -I -b 1 -adc start +board_adc start battery_status start rc_update start diff --git a/posix-configs/bbblue/px4_fw.config b/posix-configs/bbblue/px4_fw.config index a95822a276..2b4b620fc0 100644 --- a/posix-configs/bbblue/px4_fw.config +++ b/posix-configs/bbblue/px4_fw.config @@ -56,7 +56,7 @@ gps start -d /dev/ttyS2 -s -p ubx #rgbled start -I -b 1 -adc start +board_adc start battery_status start rc_update start diff --git a/posix-configs/ocpoc/px4.config b/posix-configs/ocpoc/px4.config index 3228ab28f3..34f4eb005a 100644 --- a/posix-configs/ocpoc/px4.config +++ b/posix-configs/ocpoc/px4.config @@ -24,7 +24,7 @@ ms5611 -s start rgbled start -b 1 -adc start +board_adc start battery_status start gps start -d /dev/ttyS3 -s diff --git a/posix-configs/rpi/px4.config b/posix-configs/rpi/px4.config index 620b2b5971..1fce866cae 100644 --- a/posix-configs/rpi/px4.config +++ b/posix-configs/rpi/px4.config @@ -28,7 +28,7 @@ ms5611 -X start navio_rgbled start -adc start +board_adc start battery_status start gps start -d /dev/spidev0.0 -i spi -p ubx diff --git a/posix-configs/rpi/px4_fw.config b/posix-configs/rpi/px4_fw.config index a3140f92e9..2b0ce09a4a 100644 --- a/posix-configs/rpi/px4_fw.config +++ b/posix-configs/rpi/px4_fw.config @@ -28,7 +28,7 @@ ms5611 -X start navio_rgbled start -adc start +board_adc start battery_status start gps start -d /dev/spidev0.0 -i spi -p ubx diff --git a/posix-configs/rpi/px4_test.config b/posix-configs/rpi/px4_test.config index 9b149d3b94..4790ffa06d 100644 --- a/posix-configs/rpi/px4_test.config +++ b/posix-configs/rpi/px4_test.config @@ -28,7 +28,7 @@ ms5611 -X start navio_rgbled start -adc start +board_adc start battery_status start gps start -d /dev/spidev0.0 -i spi -p ubx diff --git a/src/drivers/adc/ADC.cpp b/src/drivers/adc/board_adc/ADC.cpp similarity index 99% rename from src/drivers/adc/ADC.cpp rename to src/drivers/adc/board_adc/ADC.cpp index f56208fae9..63cad5f147 100644 --- a/src/drivers/adc/ADC.cpp +++ b/src/drivers/adc/board_adc/ADC.cpp @@ -331,7 +331,7 @@ ADC driver. return 0; } -extern "C" __EXPORT int adc_main(int argc, char *argv[]) +extern "C" __EXPORT int board_adc_main(int argc, char *argv[]) { return ADC::main(argc, argv); } diff --git a/src/drivers/adc/ADC.hpp b/src/drivers/adc/board_adc/ADC.hpp similarity index 100% rename from src/drivers/adc/ADC.hpp rename to src/drivers/adc/board_adc/ADC.hpp diff --git a/src/drivers/adc/CMakeLists.txt b/src/drivers/adc/board_adc/CMakeLists.txt similarity index 97% rename from src/drivers/adc/CMakeLists.txt rename to src/drivers/adc/board_adc/CMakeLists.txt index f8a535113a..e22c3d2c16 100644 --- a/src/drivers/adc/CMakeLists.txt +++ b/src/drivers/adc/board_adc/CMakeLists.txt @@ -32,8 +32,8 @@ ############################################################################ px4_add_module( - MODULE drivers__adc - MAIN adc + MODULE drivers__board_adc + MAIN board_adc SRCS ADC.cpp ADC.hpp