diff --git a/boards/airmind/mindpx-v2/default.cmake b/boards/airmind/mindpx-v2/default.cmake index e16f87d51b..d015969766 100644 --- a/boards/airmind/mindpx-v2/default.cmake +++ b/boards/airmind/mindpx-v2/default.cmake @@ -41,7 +41,6 @@ px4_add_board( pwm_out_sim px4fmu rc_input - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/airmind/mindpx-v2/src/timer_config.c b/boards/airmind/mindpx-v2/src/timer_config.c index c93957177e..6f9b6fee53 100644 --- a/boards/airmind/mindpx-v2/src/timer_config.c +++ b/boards/airmind/mindpx-v2/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/auav/esc35-v1/default.cmake b/boards/auav/esc35-v1/default.cmake index a5ce12d196..2c36fae924 100644 --- a/boards/auav/esc35-v1/default.cmake +++ b/boards/auav/esc35-v1/default.cmake @@ -45,7 +45,6 @@ px4_add_board( DRIVERS bootloaders - stm32 uavcanesc MODULES diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake index b7c2026cc6..1c2fc5836b 100644 --- a/boards/auav/x21/default.cmake +++ b/boards/auav/x21/default.cmake @@ -47,7 +47,6 @@ px4_add_board( px4fmu px4io roboclaw - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/auav/x21/src/timer_config.c b/boards/auav/x21/src/timer_config.c index 66f375b0a6..6350d7c5e0 100644 --- a/boards/auav/x21/src/timer_config.c +++ b/boards/auav/x21/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake index 0353576530..e17bd74707 100644 --- a/boards/av/x-v1/default.cmake +++ b/boards/av/x-v1/default.cmake @@ -48,7 +48,6 @@ px4_add_board( px4fmu rc_input #roboclaw - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/av/x-v1/src/timer_config.c b/boards/av/x-v1/src/timer_config.c index 50018efeac..110e512747 100644 --- a/boards/av/x-v1/src/timer_config.c +++ b/boards/av/x-v1/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/bitcraze/crazyflie/default.cmake b/boards/bitcraze/crazyflie/default.cmake index 95b422b433..73a9a8cf15 100644 --- a/boards/bitcraze/crazyflie/default.cmake +++ b/boards/bitcraze/crazyflie/default.cmake @@ -14,7 +14,6 @@ px4_add_board( imu/mpu9250 optical_flow/pmw3901 px4fmu - stm32 MODULES attitude_estimator_q diff --git a/boards/bitcraze/crazyflie/src/timer_config.c b/boards/bitcraze/crazyflie/src/timer_config.c index feedf26c7b..510ca6f5c6 100644 --- a/boards/bitcraze/crazyflie/src/timer_config.c +++ b/boards/bitcraze/crazyflie/src/timer_config.c @@ -48,7 +48,7 @@ #include "board_config.h" #include -#include +#include /* IO Timers normally free-run at 1MHz diff --git a/boards/holybro/kakutef7/default.cmake b/boards/holybro/kakutef7/default.cmake index 94e39ebaa2..2548c0aa71 100644 --- a/boards/holybro/kakutef7/default.cmake +++ b/boards/holybro/kakutef7/default.cmake @@ -26,7 +26,6 @@ px4_add_board( pwm_out_sim px4fmu rc_input - stm32 telemetry tone_alarm osd diff --git a/boards/holybro/kakutef7/src/timer_config.c b/boards/holybro/kakutef7/src/timer_config.c index cb5827af77..325d6a1608 100644 --- a/boards/holybro/kakutef7/src/timer_config.c +++ b/boards/holybro/kakutef7/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/intel/aerofc-v1/default.cmake b/boards/intel/aerofc-v1/default.cmake index 21c0fdffa9..bb38e3727e 100644 --- a/boards/intel/aerofc-v1/default.cmake +++ b/boards/intel/aerofc-v1/default.cmake @@ -27,7 +27,6 @@ px4_add_board( pwm_out_sim px4fmu rc_input - stm32 tap_esc #telemetry # all available telemetry drivers #uavcan diff --git a/boards/intel/aerofc-v1/rtps.cmake b/boards/intel/aerofc-v1/rtps.cmake index 0310c2bc1f..b78db85143 100644 --- a/boards/intel/aerofc-v1/rtps.cmake +++ b/boards/intel/aerofc-v1/rtps.cmake @@ -30,7 +30,6 @@ px4_add_board( pwm_out_sim px4fmu rc_input - stm32 tap_esc #telemetry # all available telemetry drivers #uavcan diff --git a/boards/intel/aerofc-v1/src/timer_config.c b/boards/intel/aerofc-v1/src/timer_config.c index b9385b2fbe..887e5013e9 100644 --- a/boards/intel/aerofc-v1/src/timer_config.c +++ b/boards/intel/aerofc-v1/src/timer_config.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/mro/ctrl-zero-f7/default.cmake b/boards/mro/ctrl-zero-f7/default.cmake index 8f6be85d7e..933aac5ab6 100644 --- a/boards/mro/ctrl-zero-f7/default.cmake +++ b/boards/mro/ctrl-zero-f7/default.cmake @@ -50,7 +50,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/mro/ctrl-zero-f7/src/timer_config.c b/boards/mro/ctrl-zero-f7/src/timer_config.c index f092ef9ee1..bc6a90aed9 100644 --- a/boards/mro/ctrl-zero-f7/src/timer_config.c +++ b/boards/mro/ctrl-zero-f7/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/nxp/fmuk66-v3/default.cmake b/boards/nxp/fmuk66-v3/default.cmake index f0ef779774..fce85d8889 100644 --- a/boards/nxp/fmuk66-v3/default.cmake +++ b/boards/nxp/fmuk66-v3/default.cmake @@ -31,7 +31,6 @@ px4_add_board( imu/mpu6000 imu/mpu9250 irlock - kinetis lights/blinkm lights/oreoled lights/rgbled diff --git a/boards/nxp/fmuk66-v3/src/timer_config.c b/boards/nxp/fmuk66-v3/src/timer_config.c index 3d61c2041e..67eac5cd51 100644 --- a/boards/nxp/fmuk66-v3/src/timer_config.c +++ b/boards/nxp/fmuk66-v3/src/timer_config.c @@ -47,7 +47,7 @@ #include "chip/kinetis_ftm.h" #include -#include +#include #include "board_config.h" diff --git a/boards/omnibus/f4sd/default.cmake b/boards/omnibus/f4sd/default.cmake index b866da13e3..2da984ed7d 100644 --- a/boards/omnibus/f4sd/default.cmake +++ b/boards/omnibus/f4sd/default.cmake @@ -36,7 +36,6 @@ px4_add_board( #pwm_out_sim px4fmu rc_input - stm32 #tap_esc #telemetry # all available telemetry drivers telemetry/frsky_telemetry diff --git a/boards/omnibus/f4sd/src/timer_config.c b/boards/omnibus/f4sd/src/timer_config.c index 23783b9b7a..615a728522 100644 --- a/boards/omnibus/f4sd/src/timer_config.c +++ b/boards/omnibus/f4sd/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/px4/cannode-v1/default.cmake b/boards/px4/cannode-v1/default.cmake index 4a08ac97b9..8075713e59 100644 --- a/boards/px4/cannode-v1/default.cmake +++ b/boards/px4/cannode-v1/default.cmake @@ -43,7 +43,6 @@ px4_add_board( DRIVERS bootloaders - stm32 uavcannode MODULES diff --git a/boards/px4/esc-v1/default.cmake b/boards/px4/esc-v1/default.cmake index a466be1648..394441bed0 100644 --- a/boards/px4/esc-v1/default.cmake +++ b/boards/px4/esc-v1/default.cmake @@ -45,7 +45,6 @@ px4_add_board( DRIVERS bootloaders - stm32 uavcanesc MODULES diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake index f60d03bdc8..f2ba1df675 100644 --- a/boards/px4/fmu-v2/default.cmake +++ b/boards/px4/fmu-v2/default.cmake @@ -56,7 +56,6 @@ px4_add_board( px4fmu px4io #roboclaw - stm32 #tap_esc #telemetry # all available telemetry drivers #test_ppm diff --git a/boards/px4/fmu-v2/fixedwing.cmake b/boards/px4/fmu-v2/fixedwing.cmake index 85e6063c30..49cebe8e35 100644 --- a/boards/px4/fmu-v2/fixedwing.cmake +++ b/boards/px4/fmu-v2/fixedwing.cmake @@ -36,7 +36,6 @@ px4_add_board( magnetometer/hmc5883 px4fmu px4io - stm32 #telemetry # all available telemetry drivers telemetry/iridiumsbd tone_alarm diff --git a/boards/px4/fmu-v2/lpe.cmake b/boards/px4/fmu-v2/lpe.cmake index d87f636a9f..8c1a55379f 100644 --- a/boards/px4/fmu-v2/lpe.cmake +++ b/boards/px4/fmu-v2/lpe.cmake @@ -52,7 +52,6 @@ px4_add_board( pwm_out_sim px4fmu px4io - stm32 #tap_esc #telemetry # all available telemetry drivers #test_ppm diff --git a/boards/px4/fmu-v2/multicopter.cmake b/boards/px4/fmu-v2/multicopter.cmake index 9924604101..0ddefaed1a 100644 --- a/boards/px4/fmu-v2/multicopter.cmake +++ b/boards/px4/fmu-v2/multicopter.cmake @@ -36,7 +36,6 @@ px4_add_board( optical_flow/px4flow px4fmu px4io - stm32 tone_alarm MODULES diff --git a/boards/px4/fmu-v2/rover.cmake b/boards/px4/fmu-v2/rover.cmake index dd1c53bcbd..a355c5bd19 100644 --- a/boards/px4/fmu-v2/rover.cmake +++ b/boards/px4/fmu-v2/rover.cmake @@ -32,7 +32,6 @@ px4_add_board( optical_flow/px4flow px4fmu px4io - stm32 tone_alarm MODULES diff --git a/boards/px4/fmu-v2/src/timer_config.c b/boards/px4/fmu-v2/src/timer_config.c index 5adc4260db..492400eb26 100644 --- a/boards/px4/fmu-v2/src/timer_config.c +++ b/boards/px4/fmu-v2/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/px4/fmu-v2/test.cmake b/boards/px4/fmu-v2/test.cmake index f2f9a59e86..0a0258a9cc 100644 --- a/boards/px4/fmu-v2/test.cmake +++ b/boards/px4/fmu-v2/test.cmake @@ -52,7 +52,6 @@ px4_add_board( #pwm_out_sim px4fmu px4io - stm32 #tap_esc #telemetry # all available telemetry drivers #test_ppm diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake index 212323c3ae..b8590f6da9 100644 --- a/boards/px4/fmu-v3/default.cmake +++ b/boards/px4/fmu-v3/default.cmake @@ -55,7 +55,6 @@ px4_add_board( px4fmu px4io roboclaw - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake index fb65db17d6..a1e90322f7 100644 --- a/boards/px4/fmu-v3/rtps.cmake +++ b/boards/px4/fmu-v3/rtps.cmake @@ -54,7 +54,6 @@ px4_add_board( px4fmu px4io roboclaw - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v3/src/timer_config.c b/boards/px4/fmu-v3/src/timer_config.c index 5adc4260db..492400eb26 100644 --- a/boards/px4/fmu-v3/src/timer_config.c +++ b/boards/px4/fmu-v3/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake index 00cbd280a8..46cb455a87 100644 --- a/boards/px4/fmu-v3/stackcheck.cmake +++ b/boards/px4/fmu-v3/stackcheck.cmake @@ -54,7 +54,6 @@ px4_add_board( px4fmu px4io roboclaw - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake index a21e1f6a61..af57e810a7 100644 --- a/boards/px4/fmu-v4/default.cmake +++ b/boards/px4/fmu-v4/default.cmake @@ -40,7 +40,6 @@ px4_add_board( px4fmu rc_input safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake index 875957f332..a8d36810d0 100644 --- a/boards/px4/fmu-v4/rtps.cmake +++ b/boards/px4/fmu-v4/rtps.cmake @@ -42,7 +42,6 @@ px4_add_board( px4fmu rc_input safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v4/src/timer_config.c b/boards/px4/fmu-v4/src/timer_config.c index 25363fd723..57cd33ec7c 100644 --- a/boards/px4/fmu-v4/src/timer_config.c +++ b/boards/px4/fmu-v4/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake index 67a27b79ee..8b7180837c 100644 --- a/boards/px4/fmu-v4/stackcheck.cmake +++ b/boards/px4/fmu-v4/stackcheck.cmake @@ -40,7 +40,6 @@ px4_add_board( px4fmu rc_input safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake index 167590fc47..a46b74cc48 100644 --- a/boards/px4/fmu-v4pro/default.cmake +++ b/boards/px4/fmu-v4pro/default.cmake @@ -53,7 +53,6 @@ px4_add_board( px4fmu px4io roboclaw - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v4pro/rtps.cmake b/boards/px4/fmu-v4pro/rtps.cmake index 4a72d9c7a5..ee11cf8619 100644 --- a/boards/px4/fmu-v4pro/rtps.cmake +++ b/boards/px4/fmu-v4pro/rtps.cmake @@ -52,7 +52,6 @@ px4_add_board( px4fmu px4io roboclaw - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v4pro/src/timer_config.c b/boards/px4/fmu-v4pro/src/timer_config.c index c2a778b793..9947d27daf 100644 --- a/boards/px4/fmu-v4pro/src/timer_config.c +++ b/boards/px4/fmu-v4pro/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/px4/fmu-v5/critmonitor.cmake b/boards/px4/fmu-v5/critmonitor.cmake index ce3815256f..93ab6b4b60 100644 --- a/boards/px4/fmu-v5/critmonitor.cmake +++ b/boards/px4/fmu-v5/critmonitor.cmake @@ -54,7 +54,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake index e608f37608..d87af72801 100644 --- a/boards/px4/fmu-v5/default.cmake +++ b/boards/px4/fmu-v5/default.cmake @@ -54,7 +54,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v5/fixedwing.cmake b/boards/px4/fmu-v5/fixedwing.cmake index a82b3767ee..d4a134f48e 100644 --- a/boards/px4/fmu-v5/fixedwing.cmake +++ b/boards/px4/fmu-v5/fixedwing.cmake @@ -38,7 +38,6 @@ px4_add_board( px4io rc_input safety_button - stm32 telemetry # all available telemetry drivers tone_alarm uavcan diff --git a/boards/px4/fmu-v5/irqmonitor.cmake b/boards/px4/fmu-v5/irqmonitor.cmake index f79508a129..0edf3e6db3 100644 --- a/boards/px4/fmu-v5/irqmonitor.cmake +++ b/boards/px4/fmu-v5/irqmonitor.cmake @@ -54,7 +54,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v5/multicopter.cmake b/boards/px4/fmu-v5/multicopter.cmake index aef30e7c36..e043e91968 100644 --- a/boards/px4/fmu-v5/multicopter.cmake +++ b/boards/px4/fmu-v5/multicopter.cmake @@ -42,7 +42,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers tone_alarm diff --git a/boards/px4/fmu-v5/rover.cmake b/boards/px4/fmu-v5/rover.cmake index da4edda54c..a0645d1bf6 100644 --- a/boards/px4/fmu-v5/rover.cmake +++ b/boards/px4/fmu-v5/rover.cmake @@ -42,7 +42,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 telemetry # all available telemetry drivers tone_alarm uavcan diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake index c0e267067d..a9e3f2b286 100644 --- a/boards/px4/fmu-v5/rtps.cmake +++ b/boards/px4/fmu-v5/rtps.cmake @@ -52,7 +52,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v5/src/timer_config.c b/boards/px4/fmu-v5/src/timer_config.c index bf4db8f412..42a838eef2 100644 --- a/boards/px4/fmu-v5/src/timer_config.c +++ b/boards/px4/fmu-v5/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake index c2bdbcbe20..01aa59128f 100644 --- a/boards/px4/fmu-v5/stackcheck.cmake +++ b/boards/px4/fmu-v5/stackcheck.cmake @@ -52,7 +52,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v5x/default.cmake b/boards/px4/fmu-v5x/default.cmake index 3c387a9ba1..86297b21ee 100644 --- a/boards/px4/fmu-v5x/default.cmake +++ b/boards/px4/fmu-v5x/default.cmake @@ -54,7 +54,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v5x/fixedwing.cmake b/boards/px4/fmu-v5x/fixedwing.cmake index d77cc2149f..1609bf7311 100644 --- a/boards/px4/fmu-v5x/fixedwing.cmake +++ b/boards/px4/fmu-v5x/fixedwing.cmake @@ -48,7 +48,6 @@ px4_add_board( px4io rc_input safety_button - stm32 telemetry # all available telemetry drivers tone_alarm uavcan diff --git a/boards/px4/fmu-v5x/multicopter.cmake b/boards/px4/fmu-v5x/multicopter.cmake index 4f4e690f34..3607bd0918 100644 --- a/boards/px4/fmu-v5x/multicopter.cmake +++ b/boards/px4/fmu-v5x/multicopter.cmake @@ -49,7 +49,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers tone_alarm diff --git a/boards/px4/fmu-v5x/rover.cmake b/boards/px4/fmu-v5x/rover.cmake index f871fc2a5d..f620b4a702 100644 --- a/boards/px4/fmu-v5x/rover.cmake +++ b/boards/px4/fmu-v5x/rover.cmake @@ -52,7 +52,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 telemetry # all available telemetry drivers tone_alarm uavcan diff --git a/boards/px4/fmu-v5x/rtps.cmake b/boards/px4/fmu-v5x/rtps.cmake index 3102504d84..381b1c1b89 100644 --- a/boards/px4/fmu-v5x/rtps.cmake +++ b/boards/px4/fmu-v5x/rtps.cmake @@ -54,7 +54,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/fmu-v5x/src/timer_config.c b/boards/px4/fmu-v5x/src/timer_config.c index 6d70c8686a..51f07bbf73 100644 --- a/boards/px4/fmu-v5x/src/timer_config.c +++ b/boards/px4/fmu-v5x/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/boards/px4/fmu-v5x/stackcheck.cmake b/boards/px4/fmu-v5x/stackcheck.cmake index abd6282436..5c0b5bc7cc 100644 --- a/boards/px4/fmu-v5x/stackcheck.cmake +++ b/boards/px4/fmu-v5x/stackcheck.cmake @@ -54,7 +54,6 @@ px4_add_board( rc_input roboclaw safety_button - stm32 tap_esc telemetry # all available telemetry drivers test_ppm diff --git a/boards/px4/io-v2/default.cmake b/boards/px4/io-v2/default.cmake index 0dbbf93cfe..d1144c1bd4 100644 --- a/boards/px4/io-v2/default.cmake +++ b/boards/px4/io-v2/default.cmake @@ -6,7 +6,6 @@ px4_add_board( TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m3 DRIVERS - stm32 MODULES px4iofirmware ) diff --git a/boards/px4/io-v2/src/timer_config.c b/boards/px4/io-v2/src/timer_config.c index 7d75d4c5b1..72968008aa 100644 --- a/boards/px4/io-v2/src/timer_config.c +++ b/boards/px4/io-v2/src/timer_config.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include diff --git a/boards/thiemar/s2740vc-v1/default.cmake b/boards/thiemar/s2740vc-v1/default.cmake index 045206334a..4c2fa67db9 100644 --- a/boards/thiemar/s2740vc-v1/default.cmake +++ b/boards/thiemar/s2740vc-v1/default.cmake @@ -36,7 +36,6 @@ px4_add_board( DRIVERS bootloaders - stm32 #uavcannode MODULES diff --git a/boards/thiemar/s2740vc-v1/src/CMakeLists.txt b/boards/thiemar/s2740vc-v1/src/CMakeLists.txt index 1f19644ff9..20a1df3f1c 100644 --- a/boards/thiemar/s2740vc-v1/src/CMakeLists.txt +++ b/boards/thiemar/s2740vc-v1/src/CMakeLists.txt @@ -41,6 +41,6 @@ add_library(drivers_board ) target_link_libraries(drivers_board - PRIVATE - drivers_arch + PRIVATE + px4_layer ) diff --git a/boards/uvify/core/default.cmake b/boards/uvify/core/default.cmake index 95cc8306a2..6df30e332d 100644 --- a/boards/uvify/core/default.cmake +++ b/boards/uvify/core/default.cmake @@ -46,7 +46,6 @@ px4_add_board( pwm_out_sim px4fmu rc_input - stm32 #tap_esc telemetry # all available telemetry drivers #test_ppm diff --git a/boards/uvify/core/src/timer_config.c b/boards/uvify/core/src/timer_config.c index 0d9ff0898c..f567504324 100644 --- a/boards/uvify/core/src/timer_config.c +++ b/boards/uvify/core/src/timer_config.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include "board_config.h" diff --git a/cmake/px4_add_common_flags.cmake b/cmake/px4_add_common_flags.cmake index 9d8f722c38..6347394a6f 100644 --- a/cmake/px4_add_common_flags.cmake +++ b/cmake/px4_add_common_flags.cmake @@ -174,7 +174,9 @@ function(px4_add_common_flags) ${PX4_BINARY_DIR}/src/lib ${PX4_BINARY_DIR}/src/modules - ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/${PX4_CHIP_MANUFACTURER}/${PX4_CHIP} + ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/${PX4_CHIP_MANUFACTURER}/${PX4_CHIP}/include + ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/common/include + ${PX4_SOURCE_DIR}/platforms/common/include ${PX4_SOURCE_DIR}/src ${PX4_SOURCE_DIR}/src/include ${PX4_SOURCE_DIR}/src/lib diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt index 893f432978..0177b3953f 100644 --- a/platforms/nuttx/CMakeLists.txt +++ b/platforms/nuttx/CMakeLists.txt @@ -78,7 +78,6 @@ endif() target_link_libraries(nuttx_arch INTERFACE drivers_board - drivers_arch drivers_boards_common drivers_boards_common_arch arch_hrt diff --git a/platforms/nuttx/cmake/px4_impl_os.cmake b/platforms/nuttx/cmake/px4_impl_os.cmake index 34cd7bb32f..7c98a88b4d 100644 --- a/platforms/nuttx/cmake/px4_impl_os.cmake +++ b/platforms/nuttx/cmake/px4_impl_os.cmake @@ -100,6 +100,9 @@ function(px4_os_determine_build_chip) if (CONFIG_STM32_STM32F10XX) set(CHIP_MANUFACTURER "stm") set(CHIP "stm32f1") + elseif(CONFIG_STM32_STM32F30XX) + set(CHIP_MANUFACTURER "stm") + set(CHIP "stm32f3") elseif(CONFIG_STM32_STM32F4XXX) set(CHIP_MANUFACTURER "stm") set(CHIP "stm32f4") diff --git a/platforms/nuttx/src/px4/common/px4_platform_adc.h b/platforms/nuttx/src/px4/common/include/px4_platform/adc.h similarity index 100% rename from platforms/nuttx/src/px4/common/px4_platform_adc.h rename to platforms/nuttx/src/px4/common/include/px4_platform/adc.h diff --git a/platforms/nuttx/src/px4/common/px4_platform_micro_hal.h b/platforms/nuttx/src/px4/common/include/px4_platform/micro_hal.h similarity index 100% rename from platforms/nuttx/src/px4/common/px4_platform_micro_hal.h rename to platforms/nuttx/src/px4/common/include/px4_platform/micro_hal.h diff --git a/platforms/nuttx/src/px4/nxp/kinetis/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/k66/CMakeLists.txt similarity index 88% rename from platforms/nuttx/src/px4/nxp/kinetis/CMakeLists.txt rename to platforms/nuttx/src/px4/nxp/k66/CMakeLists.txt index 482262fff2..7f95fdb519 100644 --- a/platforms/nuttx/src/px4/nxp/kinetis/CMakeLists.txt +++ b/platforms/nuttx/src/px4/nxp/k66/CMakeLists.txt @@ -32,10 +32,11 @@ ############################################################################ -add_subdirectory(../common/adc adc) -add_subdirectory(../common/led_pwm led_pwm) -add_subdirectory(../common/hrt hrt) -add_subdirectory(../common/tone_alarm tone_alarm) +add_subdirectory(../kinetis/adc adc) +add_subdirectory(../kinetis/led_pwm led_pwm) +add_subdirectory(../kinetis/hrt hrt) +add_subdirectory(../kinetis/io_pins io_pins) +add_subdirectory(../kinetis/tone_alarm tone_alarm) diff --git a/platforms/nuttx/src/px4/stm/stm32f7/px4_arch_adc.h b/platforms/nuttx/src/px4/nxp/k66/include/px4_arch/adc.h similarity index 97% rename from platforms/nuttx/src/px4/stm/stm32f7/px4_arch_adc.h rename to platforms/nuttx/src/px4/nxp/k66/include/px4_arch/adc.h index bcca649943..743deaed33 100644 --- a/platforms/nuttx/src/px4/stm/stm32f7/px4_arch_adc.h +++ b/platforms/nuttx/src/px4/nxp/k66/include/px4_arch/adc.h @@ -32,5 +32,5 @@ ****************************************************************************/ #pragma once -#include "../stm32_common/px4_arch_adc.h" +#include "../../../kinetis/include/px4_arch/adc.h" diff --git a/platforms/nuttx/src/px4/nxp/k66/include/px4_arch/io_timer.h b/platforms/nuttx/src/px4/nxp/k66/include/px4_arch/io_timer.h new file mode 100644 index 0000000000..11661f853a --- /dev/null +++ b/platforms/nuttx/src/px4/nxp/k66/include/px4_arch/io_timer.h @@ -0,0 +1,37 @@ +/**************************************************************************** + * + * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ +#pragma once + + +#include "../../../kinetis/include/px4_arch/io_timer.h" + diff --git a/platforms/nuttx/src/px4/nxp/kinetis/px4_arch_micro_hal.h b/platforms/nuttx/src/px4/nxp/k66/include/px4_arch/micro_hal.h similarity index 99% rename from platforms/nuttx/src/px4/nxp/kinetis/px4_arch_micro_hal.h rename to platforms/nuttx/src/px4/nxp/k66/include/px4_arch/micro_hal.h index fd8eb7adb5..33930f5235 100644 --- a/platforms/nuttx/src/px4/nxp/kinetis/px4_arch_micro_hal.h +++ b/platforms/nuttx/src/px4/nxp/k66/include/px4_arch/micro_hal.h @@ -33,7 +33,7 @@ #pragma once -#include "../../common/px4_platform_micro_hal.h" +#include __BEGIN_DECLS diff --git a/platforms/nuttx/src/px4/nxp/common/adc/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/kinetis/adc/CMakeLists.txt similarity index 100% rename from platforms/nuttx/src/px4/nxp/common/adc/CMakeLists.txt rename to platforms/nuttx/src/px4/nxp/kinetis/adc/CMakeLists.txt diff --git a/platforms/nuttx/src/px4/nxp/common/adc/adc.cpp b/platforms/nuttx/src/px4/nxp/kinetis/adc/adc.cpp similarity index 99% rename from platforms/nuttx/src/px4/nxp/common/adc/adc.cpp rename to platforms/nuttx/src/px4/nxp/kinetis/adc/adc.cpp index 124c3b7d39..78a650ec93 100644 --- a/platforms/nuttx/src/px4/nxp/common/adc/adc.cpp +++ b/platforms/nuttx/src/px4/nxp/kinetis/adc/adc.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/platforms/nuttx/src/px4/nxp/common/hrt/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/kinetis/hrt/CMakeLists.txt similarity index 100% rename from platforms/nuttx/src/px4/nxp/common/hrt/CMakeLists.txt rename to platforms/nuttx/src/px4/nxp/kinetis/hrt/CMakeLists.txt diff --git a/platforms/nuttx/src/px4/nxp/common/hrt/hrt.c b/platforms/nuttx/src/px4/nxp/kinetis/hrt/hrt.c similarity index 100% rename from platforms/nuttx/src/px4/nxp/common/hrt/hrt.c rename to platforms/nuttx/src/px4/nxp/kinetis/hrt/hrt.c diff --git a/platforms/nuttx/src/px4/nxp/common/px4_arch_adc.h b/platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/adc.h similarity index 97% rename from platforms/nuttx/src/px4/nxp/common/px4_arch_adc.h rename to platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/adc.h index faa4c174cd..400305ebd2 100644 --- a/platforms/nuttx/src/px4/nxp/common/px4_arch_adc.h +++ b/platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/adc.h @@ -36,6 +36,6 @@ #define SYSTEM_ADC_BASE 0 // not used on kinetis -#include "../../common/px4_platform_adc.h" +#include diff --git a/src/drivers/kinetis/drv_io_timer.h b/platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/io_timer.h similarity index 100% rename from src/drivers/kinetis/drv_io_timer.h rename to platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/io_timer.h diff --git a/platforms/nuttx/src/px4/nxp/kinetis/io_pins/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/CMakeLists.txt new file mode 100644 index 0000000000..401bf06ef5 --- /dev/null +++ b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/CMakeLists.txt @@ -0,0 +1,39 @@ +############################################################################ +# +# Copyright (c) 2015-2019 PX4 Development Team. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name PX4 nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +px4_add_library(arch_io_pins + io_timer.c + pwm_servo.c + pwm_trigger.c + input_capture.c +) diff --git a/src/drivers/kinetis/drv_input_capture.c b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/input_capture.c similarity index 99% rename from src/drivers/kinetis/drv_input_capture.c rename to platforms/nuttx/src/px4/nxp/kinetis/io_pins/input_capture.c index c44138118d..ed3bdeaff0 100644 --- a/src/drivers/kinetis/drv_input_capture.c +++ b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/input_capture.c @@ -72,9 +72,7 @@ #include #include -#include "drv_io_timer.h" - -#include "drv_input_capture.h" +#include #include #include "chip/kinetis_sim.h" diff --git a/src/drivers/kinetis/drv_io_timer.c b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/io_timer.c similarity index 99% rename from src/drivers/kinetis/drv_io_timer.c rename to platforms/nuttx/src/px4/nxp/kinetis/io_pins/io_timer.c index 4aaa8bb095..7ba1ce7fd4 100644 --- a/src/drivers/kinetis/drv_io_timer.c +++ b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/io_timer.c @@ -56,7 +56,7 @@ #include #include -#include "drv_io_timer.h" +#include #include #include "chip/kinetis_sim.h" diff --git a/src/drivers/kinetis/drv_pwm_servo.c b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/pwm_servo.c similarity index 98% rename from src/drivers/kinetis/drv_pwm_servo.c rename to platforms/nuttx/src/px4/nxp/kinetis/io_pins/pwm_servo.c index be1ab4050d..908b71225c 100644 --- a/src/drivers/kinetis/drv_pwm_servo.c +++ b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/pwm_servo.c @@ -58,8 +58,7 @@ #include #include -#include "drv_io_timer.h" -#include "drv_pwm_servo.h" +#include #include diff --git a/src/drivers/kinetis/drv_pwm_trigger.c b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/pwm_trigger.c similarity index 98% rename from src/drivers/kinetis/drv_pwm_trigger.c rename to platforms/nuttx/src/px4/nxp/kinetis/io_pins/pwm_trigger.c index 722e32d474..6c5bc0e92e 100644 --- a/src/drivers/kinetis/drv_pwm_trigger.c +++ b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/pwm_trigger.c @@ -54,8 +54,7 @@ #include #include -#include "drv_io_timer.h" -#include "drv_pwm_trigger.h" +#include int up_pwm_trigger_set(unsigned channel, uint16_t value) { diff --git a/platforms/nuttx/src/px4/nxp/common/led_pwm/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/kinetis/led_pwm/CMakeLists.txt similarity index 100% rename from platforms/nuttx/src/px4/nxp/common/led_pwm/CMakeLists.txt rename to platforms/nuttx/src/px4/nxp/kinetis/led_pwm/CMakeLists.txt diff --git a/platforms/nuttx/src/px4/nxp/common/led_pwm/led_pwm.cpp b/platforms/nuttx/src/px4/nxp/kinetis/led_pwm/led_pwm.cpp similarity index 99% rename from platforms/nuttx/src/px4/nxp/common/led_pwm/led_pwm.cpp rename to platforms/nuttx/src/px4/nxp/kinetis/led_pwm/led_pwm.cpp index 68a2d40b6c..8450d87d72 100644 --- a/platforms/nuttx/src/px4/nxp/common/led_pwm/led_pwm.cpp +++ b/platforms/nuttx/src/px4/nxp/kinetis/led_pwm/led_pwm.cpp @@ -56,7 +56,7 @@ #include #include -#include +#include #include #include "chip/kinetis_sim.h" diff --git a/platforms/nuttx/src/px4/nxp/common/tone_alarm/CMakeLists.txt b/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/CMakeLists.txt similarity index 100% rename from platforms/nuttx/src/px4/nxp/common/tone_alarm/CMakeLists.txt rename to platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/CMakeLists.txt diff --git a/platforms/nuttx/src/px4/nxp/common/tone_alarm/ToneAlarmInterface.cpp b/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp similarity index 100% rename from platforms/nuttx/src/px4/nxp/common/tone_alarm/ToneAlarmInterface.cpp rename to platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp diff --git a/platforms/nuttx/src/px4/stm/stm32_common/adc/adc.cpp b/platforms/nuttx/src/px4/stm/stm32_common/adc/adc.cpp index df2b5bddd7..6661c27c1c 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/adc/adc.cpp +++ b/platforms/nuttx/src/px4/stm/stm32_common/adc/adc.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/platforms/nuttx/src/px4/stm/stm32_common/px4_arch_adc.h b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/adc.h similarity index 98% rename from platforms/nuttx/src/px4/stm/stm32_common/px4_arch_adc.h rename to platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/adc.h index fd5d4d4bbe..17ff583045 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/px4_arch_adc.h +++ b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/adc.h @@ -53,5 +53,5 @@ # define SYSTEM_ADC_BASE STM32_ADC1_BASE #endif -#include "../../common/px4_platform_adc.h" +#include diff --git a/src/drivers/stm32/drv_io_timer.h b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/io_timer.h similarity index 100% rename from src/drivers/stm32/drv_io_timer.h rename to platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/io_timer.h diff --git a/platforms/nuttx/src/px4/stm/stm32_common/px4_arch_micro_hal.h b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/micro_hal.h similarity index 99% rename from platforms/nuttx/src/px4/stm/stm32_common/px4_arch_micro_hal.h rename to platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/micro_hal.h index 2f01b48f27..6b1bb58216 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/px4_arch_micro_hal.h +++ b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/micro_hal.h @@ -32,7 +32,7 @@ ****************************************************************************/ #pragma once -#include "../../common/px4_platform_micro_hal.h" +#include __BEGIN_DECLS diff --git a/platforms/nuttx/src/px4/stm/stm32_common/px4io_serial/arch_px4io_serial.h b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/px4io_serial.h similarity index 99% rename from platforms/nuttx/src/px4/stm/stm32_common/px4io_serial/arch_px4io_serial.h rename to platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/px4io_serial.h index 7d72d65dbb..f8888f4024 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/px4io_serial/arch_px4io_serial.h +++ b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/px4io_serial.h @@ -32,7 +32,7 @@ ****************************************************************************/ /** - * @file arch_px4io_serial.h + * @file px4io_serial.h * * Serial Interface definition for PX4IO */ diff --git a/platforms/nuttx/src/px4/stm/stm32_common/io_pins/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/CMakeLists.txt new file mode 100644 index 0000000000..401bf06ef5 --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/CMakeLists.txt @@ -0,0 +1,39 @@ +############################################################################ +# +# Copyright (c) 2015-2019 PX4 Development Team. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name PX4 nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +px4_add_library(arch_io_pins + io_timer.c + pwm_servo.c + pwm_trigger.c + input_capture.c +) diff --git a/src/drivers/stm32/drv_input_capture.c b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/input_capture.c similarity index 99% rename from src/drivers/stm32/drv_input_capture.c rename to platforms/nuttx/src/px4/stm/stm32_common/io_pins/input_capture.c index c7505087b1..a1eb6a9743 100644 --- a/src/drivers/stm32/drv_input_capture.c +++ b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/input_capture.c @@ -72,9 +72,7 @@ #include #include -#include "drv_io_timer.h" - -#include "drv_input_capture.h" +#include #include #include diff --git a/src/drivers/stm32/drv_io_timer.c b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/io_timer.c similarity index 99% rename from src/drivers/stm32/drv_io_timer.c rename to platforms/nuttx/src/px4/stm/stm32_common/io_pins/io_timer.c index 4f654e8a67..7a11dec0ad 100644 --- a/src/drivers/stm32/drv_io_timer.c +++ b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/io_timer.c @@ -58,7 +58,7 @@ #include #include -#include "drv_io_timer.h" +#include #include #include diff --git a/src/drivers/stm32/drv_pwm_servo.c b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/pwm_servo.c similarity index 98% rename from src/drivers/stm32/drv_pwm_servo.c rename to platforms/nuttx/src/px4/stm/stm32_common/io_pins/pwm_servo.c index b75772ebc4..9121ea488b 100644 --- a/src/drivers/stm32/drv_pwm_servo.c +++ b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/pwm_servo.c @@ -58,8 +58,7 @@ #include #include -#include "drv_io_timer.h" -#include "drv_pwm_servo.h" +#include #include diff --git a/src/drivers/stm32/drv_pwm_trigger.c b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/pwm_trigger.c similarity index 98% rename from src/drivers/stm32/drv_pwm_trigger.c rename to platforms/nuttx/src/px4/stm/stm32_common/io_pins/pwm_trigger.c index 86f38acf39..477206d25f 100644 --- a/src/drivers/stm32/drv_pwm_trigger.c +++ b/platforms/nuttx/src/px4/stm/stm32_common/io_pins/pwm_trigger.c @@ -54,8 +54,7 @@ #include #include -#include "drv_io_timer.h" -#include "drv_pwm_trigger.h" +#include #include diff --git a/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/led_pwm.cpp b/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/led_pwm.cpp index c9eafb2391..46cfceeb47 100644 --- a/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/led_pwm.cpp +++ b/platforms/nuttx/src/px4/stm/stm32_common/led_pwm/led_pwm.cpp @@ -57,7 +57,7 @@ #include #include -#include +#include diff --git a/platforms/nuttx/src/px4/stm/stm32f1/include/px4_arch/io_timer.h b/platforms/nuttx/src/px4/stm/stm32f1/include/px4_arch/io_timer.h new file mode 100644 index 0000000000..2960835d2e --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32f1/include/px4_arch/io_timer.h @@ -0,0 +1,37 @@ +/**************************************************************************** + * + * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ +#pragma once + + +#include "../../../stm32_common/include/px4_arch/io_timer.h" + diff --git a/platforms/nuttx/src/px4/stm/stm32f1/px4_arch_micro_hal.h b/platforms/nuttx/src/px4/stm/stm32f1/include/px4_arch/micro_hal.h similarity index 97% rename from platforms/nuttx/src/px4/stm/stm32f1/px4_arch_micro_hal.h rename to platforms/nuttx/src/px4/stm/stm32f1/include/px4_arch/micro_hal.h index 1e5beb9206..2c06c7641c 100644 --- a/platforms/nuttx/src/px4/stm/stm32f1/px4_arch_micro_hal.h +++ b/platforms/nuttx/src/px4/stm/stm32f1/include/px4_arch/micro_hal.h @@ -33,7 +33,7 @@ #pragma once -#include "../stm32_common/px4_arch_micro_hal.h" +#include "../../../stm32_common/include/px4_arch/micro_hal.h" __BEGIN_DECLS diff --git a/platforms/posix/src/px4/px4/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32f3/CMakeLists.txt similarity index 97% rename from platforms/posix/src/px4/px4/CMakeLists.txt rename to platforms/nuttx/src/px4/stm/stm32f3/CMakeLists.txt index ec489bf559..40432707c7 100644 --- a/platforms/posix/src/px4/px4/CMakeLists.txt +++ b/platforms/nuttx/src/px4/stm/stm32f3/CMakeLists.txt @@ -32,5 +32,6 @@ ############################################################################ -add_subdirectory(${PX4_CHIP}) +add_subdirectory(../stm32_common/hrt hrt) + diff --git a/platforms/nuttx/src/px4/stm/stm32f4/px4_arch_adc.h b/platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/adc.h similarity index 96% rename from platforms/nuttx/src/px4/stm/stm32f4/px4_arch_adc.h rename to platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/adc.h index bcca649943..9aa5b0c7ae 100644 --- a/platforms/nuttx/src/px4/stm/stm32f4/px4_arch_adc.h +++ b/platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/adc.h @@ -32,5 +32,5 @@ ****************************************************************************/ #pragma once -#include "../stm32_common/px4_arch_adc.h" +#include "../../../stm32_common/include/px4_arch/adc.h" diff --git a/platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/io_timer.h b/platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/io_timer.h new file mode 100644 index 0000000000..2960835d2e --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/io_timer.h @@ -0,0 +1,37 @@ +/**************************************************************************** + * + * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ +#pragma once + + +#include "../../../stm32_common/include/px4_arch/io_timer.h" + diff --git a/platforms/nuttx/src/px4/stm/stm32f4/px4_arch_micro_hal.h b/platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/micro_hal.h similarity index 97% rename from platforms/nuttx/src/px4/stm/stm32f4/px4_arch_micro_hal.h rename to platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/micro_hal.h index 1e5beb9206..2c06c7641c 100644 --- a/platforms/nuttx/src/px4/stm/stm32f4/px4_arch_micro_hal.h +++ b/platforms/nuttx/src/px4/stm/stm32f3/include/px4_arch/micro_hal.h @@ -33,7 +33,7 @@ #pragma once -#include "../stm32_common/px4_arch_micro_hal.h" +#include "../../../stm32_common/include/px4_arch/micro_hal.h" __BEGIN_DECLS diff --git a/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt index a4fc7ce2c2..0b5fe399e0 100644 --- a/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt +++ b/platforms/nuttx/src/px4/stm/stm32f4/CMakeLists.txt @@ -35,6 +35,7 @@ add_subdirectory(../stm32_common/adc adc) add_subdirectory(../stm32_common/hrt hrt) add_subdirectory(../stm32_common/led_pwm led_pwm) +add_subdirectory(../stm32_common/io_pins io_pins) add_subdirectory(../stm32_common/tone_alarm tone_alarm) add_subdirectory(px4io_serial) diff --git a/platforms/nuttx/src/px4/nxp/kinetis/px4_arch_adc.h b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/adc.h similarity index 96% rename from platforms/nuttx/src/px4/nxp/kinetis/px4_arch_adc.h rename to platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/adc.h index c96bf50478..9aa5b0c7ae 100644 --- a/platforms/nuttx/src/px4/nxp/kinetis/px4_arch_adc.h +++ b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/adc.h @@ -32,5 +32,5 @@ ****************************************************************************/ #pragma once -#include "../common/px4_arch_adc.h" +#include "../../../stm32_common/include/px4_arch/adc.h" diff --git a/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/io_timer.h b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/io_timer.h new file mode 100644 index 0000000000..2960835d2e --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/io_timer.h @@ -0,0 +1,37 @@ +/**************************************************************************** + * + * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ +#pragma once + + +#include "../../../stm32_common/include/px4_arch/io_timer.h" + diff --git a/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/micro_hal.h b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/micro_hal.h new file mode 100644 index 0000000000..2c06c7641c --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/micro_hal.h @@ -0,0 +1,51 @@ +/**************************************************************************** + * + * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ +#pragma once + + +#include "../../../stm32_common/include/px4_arch/micro_hal.h" + +__BEGIN_DECLS + +#include +#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_STM32F4 +#define PX4_FLASH_BASE STM32_FLASH_BASE +#if defined(CONFIG_STM32_STM32F4XXX) +# include +# define PX4_BBSRAM_SIZE STM32_BBSRAM_SIZE +# define PX4_BBSRAM_GETDESC_IOCTL STM32_BBSRAM_GETDESC_IOCTL +#endif +#define PX4_NUMBER_I2C_BUSES STM32_NI2C + +__END_DECLS + diff --git a/platforms/nuttx/src/px4/stm/stm32f4/px4io_serial/arch_px4io_serial.h b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/px4io_serial.h similarity index 96% rename from platforms/nuttx/src/px4/stm/stm32f4/px4io_serial/arch_px4io_serial.h rename to platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/px4io_serial.h index fb1f5c8dae..77564d2ad0 100644 --- a/platforms/nuttx/src/px4/stm/stm32f4/px4io_serial/arch_px4io_serial.h +++ b/platforms/nuttx/src/px4/stm/stm32f4/include/px4_arch/px4io_serial.h @@ -34,5 +34,5 @@ #pragma once #define PX4IO_SERIAL_BUF_ALIGN 4 -#include "../stm32_common/px4io_serial/arch_px4io_serial.h" +#include "../../../stm32_common/include/px4_arch/px4io_serial.h" diff --git a/platforms/nuttx/src/px4/stm/stm32f4/px4io_serial/px4io_serial.cpp b/platforms/nuttx/src/px4/stm/stm32f4/px4io_serial/px4io_serial.cpp index 6b186f8a3c..8b70c62dc4 100644 --- a/platforms/nuttx/src/px4/stm/stm32f4/px4io_serial/px4io_serial.cpp +++ b/platforms/nuttx/src/px4/stm/stm32f4/px4io_serial/px4io_serial.cpp @@ -37,7 +37,7 @@ * Serial interface for PX4IO on STM32F4 */ -#include "arch_px4io_serial.h" +#include /* serial register accessors */ #define REG(_x) (*(volatile uint32_t *)(PX4IO_SERIAL_BASE + _x)) diff --git a/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt b/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt index a4fc7ce2c2..0b5fe399e0 100644 --- a/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt +++ b/platforms/nuttx/src/px4/stm/stm32f7/CMakeLists.txt @@ -35,6 +35,7 @@ add_subdirectory(../stm32_common/adc adc) add_subdirectory(../stm32_common/hrt hrt) add_subdirectory(../stm32_common/led_pwm led_pwm) +add_subdirectory(../stm32_common/io_pins io_pins) add_subdirectory(../stm32_common/tone_alarm tone_alarm) add_subdirectory(px4io_serial) diff --git a/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/adc.h b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/adc.h new file mode 100644 index 0000000000..9aa5b0c7ae --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/adc.h @@ -0,0 +1,36 @@ +/**************************************************************************** + * + * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ +#pragma once + +#include "../../../stm32_common/include/px4_arch/adc.h" + diff --git a/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/io_timer.h b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/io_timer.h new file mode 100644 index 0000000000..2960835d2e --- /dev/null +++ b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/io_timer.h @@ -0,0 +1,37 @@ +/**************************************************************************** + * + * Copyright (c) 2019 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ +#pragma once + + +#include "../../../stm32_common/include/px4_arch/io_timer.h" + diff --git a/platforms/nuttx/src/px4/stm/stm32f7/px4_arch_micro_hal.h b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/micro_hal.h similarity index 97% rename from platforms/nuttx/src/px4/stm/stm32f7/px4_arch_micro_hal.h rename to platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/micro_hal.h index ff2eb0d5d3..af9a595895 100644 --- a/platforms/nuttx/src/px4/stm/stm32f7/px4_arch_micro_hal.h +++ b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/micro_hal.h @@ -33,7 +33,7 @@ #pragma once -#include "../stm32_common/px4_arch_micro_hal.h" +#include "../../../stm32_common/include/px4_arch/micro_hal.h" __BEGIN_DECLS diff --git a/platforms/nuttx/src/px4/stm/stm32f7/px4io_serial/arch_px4io_serial.h b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/px4io_serial.h similarity index 96% rename from platforms/nuttx/src/px4/stm/stm32f7/px4io_serial/arch_px4io_serial.h rename to platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/px4io_serial.h index 4528e75174..0e78048670 100644 --- a/platforms/nuttx/src/px4/stm/stm32f7/px4io_serial/arch_px4io_serial.h +++ b/platforms/nuttx/src/px4/stm/stm32f7/include/px4_arch/px4io_serial.h @@ -34,5 +34,5 @@ #pragma once #define PX4IO_SERIAL_BUF_ALIGN ARMV7M_DCACHE_LINESIZE -#include "../stm32_common/px4io_serial/arch_px4io_serial.h" +#include "../../../stm32_common/include/px4_arch/px4io_serial.h" diff --git a/platforms/nuttx/src/px4/stm/stm32f7/px4io_serial/px4io_serial.cpp b/platforms/nuttx/src/px4/stm/stm32f7/px4io_serial/px4io_serial.cpp index 03e3ee0963..0161736a7b 100644 --- a/platforms/nuttx/src/px4/stm/stm32f7/px4io_serial/px4io_serial.cpp +++ b/platforms/nuttx/src/px4/stm/stm32f7/px4io_serial/px4io_serial.cpp @@ -37,7 +37,7 @@ * Serial interface for PX4IO on STM32F7 */ -#include "arch_px4io_serial.h" +#include #include "stm32_uart.h" #include diff --git a/src/drivers/adc/adc.cpp b/src/drivers/adc/adc.cpp index 7126de15c5..b50929394d 100644 --- a/src/drivers/adc/adc.cpp +++ b/src/drivers/adc/adc.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include diff --git a/src/drivers/boards/common/stm32/CMakeLists.txt b/src/drivers/boards/common/stm32/CMakeLists.txt index a5dc0048b7..5c3dc2b680 100644 --- a/src/drivers/boards/common/stm32/CMakeLists.txt +++ b/src/drivers/boards/common/stm32/CMakeLists.txt @@ -39,7 +39,5 @@ add_library(drivers_boards_common_arch board_critmon.c ) add_dependencies(drivers_boards_common_arch prebuild_targets) -add_dependencies(drivers_boards_common_arch arch_adc) target_compile_options(drivers_boards_common_arch PRIVATE -Wno-cast-align) # TODO: fix and enable target_link_libraries(drivers_boards_common_arch PRIVATE nuttx_arch) -target_link_libraries(drivers_boards_common_arch PRIVATE arch_adc) diff --git a/src/drivers/boards/common/stm32/board_hw_rev_ver.c b/src/drivers/boards/common/stm32/board_hw_rev_ver.c index 44aa335b19..d3e83df51a 100644 --- a/src/drivers/boards/common/stm32/board_hw_rev_ver.c +++ b/src/drivers/boards/common/stm32/board_hw_rev_ver.c @@ -38,7 +38,7 @@ */ #include -#include +#include #include #include #include "board_config.h" diff --git a/src/drivers/drv_adc.h b/src/drivers/drv_adc.h index a725bd4307..3e7e984eaf 100644 --- a/src/drivers/drv_adc.h +++ b/src/drivers/drv_adc.h @@ -40,7 +40,6 @@ #pragma once -#include #include #include diff --git a/src/drivers/kinetis/CMakeLists.txt b/src/drivers/kinetis/CMakeLists.txt deleted file mode 100644 index de68197948..0000000000 --- a/src/drivers/kinetis/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################ -# -# Copyright (c) 2016-2017 PX4 Development Team. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -add_library(drivers_arch - drv_io_timer.c - drv_pwm_servo.c - drv_pwm_trigger.c - drv_input_capture.c -) -add_dependencies(drivers_arch prebuild_targets) -target_link_libraries(drivers_arch PRIVATE drivers_board) -target_compile_options(drivers_arch PRIVATE -Wno-cast-align) # TODO: fix and enable diff --git a/src/drivers/kinetis/drv_input_capture.h b/src/drivers/kinetis/drv_input_capture.h deleted file mode 100644 index 968ce831ef..0000000000 --- a/src/drivers/kinetis/drv_input_capture.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012-2016 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file drv_input_capture.h - * - * stm32-specific input capture data. - */ - -#pragma once - -#include diff --git a/src/drivers/kinetis/drv_pwm_servo.h b/src/drivers/kinetis/drv_pwm_servo.h deleted file mode 100644 index e3477183d2..0000000000 --- a/src/drivers/kinetis/drv_pwm_servo.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file drv_pwm_servo.h - * - * stm32-specific PWM output data. - */ - -#pragma once - -#include diff --git a/src/drivers/kinetis/drv_pwm_trigger.h b/src/drivers/kinetis/drv_pwm_trigger.h deleted file mode 100644 index e27902f514..0000000000 --- a/src/drivers/kinetis/drv_pwm_trigger.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2017 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file drv_pwm_trigger.h - * - * stm32-specific PWM output data. - */ - -#pragma once - -#include diff --git a/src/drivers/lights/rgbled_pwm/CMakeLists.txt b/src/drivers/lights/rgbled_pwm/CMakeLists.txt index a5e2ee6914..959864f3a8 100644 --- a/src/drivers/lights/rgbled_pwm/CMakeLists.txt +++ b/src/drivers/lights/rgbled_pwm/CMakeLists.txt @@ -40,5 +40,6 @@ px4_add_module( rgbled_pwm.cpp DEPENDS led + arch_io_pins arch_led_pwm ) diff --git a/src/drivers/px4fmu/CMakeLists.txt b/src/drivers/px4fmu/CMakeLists.txt index 1f04bc13ce..42083f40a2 100644 --- a/src/drivers/px4fmu/CMakeLists.txt +++ b/src/drivers/px4fmu/CMakeLists.txt @@ -38,6 +38,7 @@ px4_add_module( SRCS fmu.cpp DEPENDS + arch_io_pins circuit_breaker mixer pwm_limit diff --git a/src/drivers/px4io/px4io_serial.cpp b/src/drivers/px4io/px4io_serial.cpp index 0dea74ba6d..a46478b929 100644 --- a/src/drivers/px4io/px4io_serial.cpp +++ b/src/drivers/px4io/px4io_serial.cpp @@ -39,7 +39,7 @@ #include "px4io_driver.h" -#include +#include static PX4IO_serial *g_interface; diff --git a/src/drivers/stm32/CMakeLists.txt b/src/drivers/stm32/CMakeLists.txt deleted file mode 100644 index c8eb1e9e83..0000000000 --- a/src/drivers/stm32/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################ -# -# Copyright (c) 2015 PX4 Development Team. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name PX4 nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -add_library(drivers_arch - drv_io_timer.c - drv_pwm_servo.c - drv_pwm_trigger.c - drv_input_capture.c -) -add_dependencies(drivers_arch prebuild_targets) -target_link_libraries(drivers_arch PRIVATE drivers_board) -target_compile_options(drivers_arch PRIVATE -Wno-cast-align) # TODO: fix and enable diff --git a/src/drivers/stm32/drv_input_capture.h b/src/drivers/stm32/drv_input_capture.h deleted file mode 100644 index 968ce831ef..0000000000 --- a/src/drivers/stm32/drv_input_capture.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012-2016 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file drv_input_capture.h - * - * stm32-specific input capture data. - */ - -#pragma once - -#include diff --git a/src/drivers/stm32/drv_pwm_servo.h b/src/drivers/stm32/drv_pwm_servo.h deleted file mode 100644 index ecd42687f6..0000000000 --- a/src/drivers/stm32/drv_pwm_servo.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2012 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file drv_pwm_servo.h - * - * stm32-specific PWM output data. - */ - -#pragma once - -#include - diff --git a/src/drivers/stm32/drv_pwm_trigger.h b/src/drivers/stm32/drv_pwm_trigger.h deleted file mode 100644 index e27902f514..0000000000 --- a/src/drivers/stm32/drv_pwm_trigger.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** - * - * Copyright (C) 2017 PX4 Development Team. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name PX4 nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/** - * @file drv_pwm_trigger.h - * - * stm32-specific PWM output data. - */ - -#pragma once - -#include diff --git a/src/platforms/px4_micro_hal.h b/src/platforms/px4_micro_hal.h index 2423902b40..4bea4d458b 100644 --- a/src/platforms/px4_micro_hal.h +++ b/src/platforms/px4_micro_hal.h @@ -37,5 +37,5 @@ */ // include arch-specific header -#include +#include