diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm index 4737b843cb..1844ee3d4b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/defaults.parm @@ -1,9 +1,9 @@ # setup for LEDs on chan5 SERVO5_FUNCTION 120 -NTF_LED_TYPES 257 # disable compass COMPASS_USE 0 COMPASS_USE2 0 COMPASS_USE3 0 # setup SERIAL3 for RCIN SERIAL3_BAUD 115 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat index 6d81917701..fc4657dd92 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat @@ -141,3 +141,5 @@ include ../include/save_some_flash.inc # only include ublox GPS driver include ../include/minimal_GPS.inc + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/defaults.parm index 00d56838e0..7e3412817b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/defaults.parm @@ -1,5 +1,5 @@ # setup for LEDs on chan5 SERVO5_FUNCTION 120 -NTF_LED_TYPES 257 # setup SERIAL2 for RCIN SERIAL2_BAUD 115 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat index 6c6b54b60b..2d70af75fd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat @@ -69,3 +69,5 @@ define AP_BATTERY_SMBUS_ENABLED 0 # only include ublox GPS driver include ../include/minimal_GPS.inc + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm index 4737b843cb..1844ee3d4b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/defaults.parm @@ -1,9 +1,9 @@ # setup for LEDs on chan5 SERVO5_FUNCTION 120 -NTF_LED_TYPES 257 # disable compass COMPASS_USE 0 COMPASS_USE2 0 COMPASS_USE3 0 # setup SERIAL3 for RCIN SERIAL3_BAUD 115 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat index 29b9d7bba6..cdad68b72e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat @@ -136,3 +136,5 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/defaults.parm index c70ba4dea4..bc56b0e65d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/defaults.parm @@ -1,3 +1,3 @@ # setup for LEDs on chan5 SERVO5_FUNCTION 120 -NTF_LED_TYPES 257 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat index 7e0811717c..798a76ccbf 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7v2/hwdef.dat @@ -62,3 +62,5 @@ IMU BMI270 SPI:bmi270 ROTATION_ROLL_180_YAW_225 # Some boards have no baro, some have a DPS310 Baro on I2C1 define HAL_BARO_ALLOW_INIT_NO_BARO 1 BARO DPS310 I2C:0:0x76 + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm index 53367d845c..2bda2f0d4b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm @@ -14,6 +14,6 @@ BATT_VOLT_MULT 18.000 BATT_AMP_PERVLT 24.000 # turn on CAN RGB LED -NTF_LED_TYPES 231 EK2_IMU_MASK 7 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/hwdef.dat index 98260d400a..dfc7aaefe4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/hwdef.dat @@ -10,3 +10,5 @@ PH12 TIM5_CH3 TIM5 PWM(3) GPIO(52) BIDIR PD12 TIM4_CH1 TIM4 PWM(5) GPIO(54) BIDIR PD14 TIM4_CH3 TIM4 PWM(7) GPIO(56) BIDIR +define DEFAULT_NTF_LED_TYPES 231 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm index 53367d845c..2bda2f0d4b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/defaults.parm @@ -14,6 +14,6 @@ BATT_VOLT_MULT 18.000 BATT_AMP_PERVLT 24.000 # turn on CAN RGB LED -NTF_LED_TYPES 231 EK2_IMU_MASK 7 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat index a8e21ee470..475124c1d1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora/hwdef.dat @@ -305,3 +305,5 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" DMA_PRIORITY ADC* SPI1* TIM*UP* DMA_NOSHARE SPI1* TIM*UP* + +define DEFAULT_NTF_LED_TYPES 231 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/defaults.parm index ad5a6003be..50ccc33c6e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/defaults.parm @@ -1,6 +1,6 @@ # setup for Neopixel OUT1_FUNCTION 120 -NTF_LED_TYPES 455 NTF_LED_BRIGHT 2 NTF_LED_LEN 8 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat index d4c17abc91..66d4acf272 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV_GPS/hwdef.dat @@ -155,3 +155,5 @@ define HAL_PERIPH_NEOPIXEL_COUNT_WITHOUT_NOTIFY 8 # also enable buzzer define HAL_PERIPH_ENABLE_BUZZER_WITHOUT_NOTIFY 1 + +define DEFAULT_NTF_LED_TYPES 455 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/defaults.parm index 42accacb9b..345a079193 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/defaults.parm @@ -1,6 +1,5 @@ # setup for LEDs on chan9 SERVO5_FUNCTION 120 -NTF_LED_TYPES 257 NTF_LED_LEN 2 # ESC setup MOT_PWM_TYPE 6 @@ -9,3 +8,4 @@ SERVO_BLH_TRATE 0 # RC setup RC_OPTIONS 8704 SERIAL1_PROTOCOL 23 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat index cf601ebd6d..8deb4f27cd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat @@ -145,3 +145,5 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2 define HAL_DEFAULT_INS_FAST_SAMPLE 3 # Motor order implies Betaflight/X for standard ESCs define HAL_FRAME_TYPE_DEFAULT 12 + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/defaults.parm index 4fad765c65..4ea8172db9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/defaults.parm @@ -1,6 +1,5 @@ # setup the four built-in Neopixel LEDs on chan 9 SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 NTF_LED_LEN 4 # setup SERIAL3 for RCIN @@ -10,4 +9,4 @@ SERIAL3_PROTOCOL 23 SERIAL4_PROTOCOL -1 # setup SERIAL6 for GPS -SERIAL6_PROTOCOL 5 \ No newline at end of file +SERIAL6_PROTOCOL 5 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index e38524628a..c42b84ed00 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -178,3 +178,5 @@ define HAL_PARACHUTE_ENABLED 0 include ../include/minimal.inc define HAL_SPRAYER_ENABLED 0 define AP_BATTERY_SMBUS_ENABLED 0 + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm index 4fad765c65..4ea8172db9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm @@ -1,6 +1,5 @@ # setup the four built-in Neopixel LEDs on chan 9 SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 NTF_LED_LEN 4 # setup SERIAL3 for RCIN @@ -10,4 +9,4 @@ SERIAL3_PROTOCOL 23 SERIAL4_PROTOCOL -1 # setup SERIAL6 for GPS -SERIAL6_PROTOCOL 5 \ No newline at end of file +SERIAL6_PROTOCOL 5 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/hwdef.dat index 5a151a1259..4e5a5d7b0c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/hwdef.dat @@ -26,3 +26,5 @@ DMA_PRIORITY USART1* I2C2* TIM1* TIM3* define HAL_I2C_INTERNAL_MASK 1 define HAL_FRAME_TYPE_DEFAULT 12 + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/defaults.parm index b6222b71a5..013f4dcfb2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/defaults.parm @@ -1,4 +1,4 @@ # setup for LEDs on chan5 SERVO5_FUNCTION 120 -NTF_LED_TYPES 256 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat index 38ed45914e..0e097ea4e1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat @@ -152,3 +152,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # minimal drivers to reduce flash usage include ../include/minimal.inc + +define DEFAULT_NTF_LED_TYPES 256 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/defaults.parm index d55728ebf2..186a4e10eb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/defaults.parm @@ -1,6 +1,5 @@ # setup for LEDs on chan5 SERVO5_FUNCTION 120 -NTF_LED_TYPES 257 SERIAL3_BAUD 115 # default Serial1 to FrSky telemetry SERIAL1_PROTOCOL 10 @@ -8,3 +7,4 @@ SERIAL1_OPTIONS 7 # batt monitor defaults BATT_VOLT_SCALE 10.9 BATT_CURR_SCALE 28.5 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat index bfb5b16c1f..368e986c19 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat @@ -45,3 +45,5 @@ define AP_BATTERY_SMBUS_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define HAL_MOUNT_ENABLED 0 + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/defaults.parm index 5f3f95f69a..2333bb4567 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/defaults.parm @@ -1,6 +1,6 @@ # setup for LEDs on chan9 SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 SERIAL7_PROTOCOL 16 # UART1 for DJI Goggles SERIAL1_PROTOCOL 33 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat index 2524d008fe..8d679a4c62 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7/hwdef.dat @@ -160,3 +160,5 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/defaults.parm index 17262d601c..3687d251b5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/defaults.parm @@ -1,7 +1,7 @@ # setup for LEDs on chan9 SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 # Default VTX power to on RELAY_DEFAULT 1 # UART1 for DJI Goggles SERIAL1_PROTOCOL 33 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/hwdef.dat index 98d7f7c038..c7f40c3407 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini-Nand/hwdef.dat @@ -10,3 +10,5 @@ SPIDEV bmi270 SPI4 DEVID1 MPU6000_CS MODE3 1*MHZ 4*MHZ IMU BMI270 SPI:bmi270 ROTATION_PITCH_180_YAW_90 define HAL_LOGGING_DATAFLASH_DRIVER AP_Logger_W25N01GV + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/defaults.parm index 17262d601c..3687d251b5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/defaults.parm @@ -1,7 +1,7 @@ # setup for LEDs on chan9 SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 # Default VTX power to on RELAY_DEFAULT 1 # UART1 for DJI Goggles SERIAL1_PROTOCOL 33 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat index 143de95574..d50bf17743 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7Mini/hwdef.dat @@ -158,3 +158,5 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/defaults.parm index 2b24186419..8775f3bf22 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/defaults.parm @@ -1,6 +1,5 @@ # setup for LEDs on chan9 SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 # Default VTX power to on RELAY_DEFAULT 1 # UART1 for DJI Goggles @@ -8,3 +7,4 @@ SERIAL1_PROTOCOL 33 # UART3 for VTX SERIAL3_PROTOCOL 37 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat index 718eb7675c..3165fb84c1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteH7v2/hwdef.dat @@ -68,3 +68,5 @@ DMA_NOSHARE *UP SPI1* define HAL_FRAME_TYPE_DEFAULT 12 define HAL_LOGGING_DATAFLASH_ENABLED 1 define HAL_LOGGING_DATAFLASH_DRIVER AP_Logger_W25N01GV + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/defaults.parm index 5078224bc5..2244d788d4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/defaults.parm @@ -1,6 +1,5 @@ # setup for LEDs on chan9 SERVO7_FUNCTION 120 -NTF_LED_TYPES 257 # Default VTX power to on RELAY_DEFAULT 1 # UART1 is RX input @@ -15,3 +14,4 @@ OSD_TYPE 1 SERIAL4_PROTOCOL -1 # UART6 is ESC Telem SERIAL6_PROTOCOL 16 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat index a7f9755ec1..a7576a4902 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat @@ -35,3 +35,5 @@ define AP_BARO_SPL06_ENABLED 1 # minimal drivers to reduce flash usage include ../include/minimal.inc + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/defaults.parm index d5fa305db6..48efb2e98b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/defaults.parm @@ -1,5 +1,5 @@ # setup for LEDs on chan9 SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 # Default VTX power to on RELAY_DEFAULT 1 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat index 68dac85eb8..6c7dc69208 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat @@ -192,3 +192,5 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/defaults.parm index 7a1582e3c4..da1c8a36fa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/defaults.parm @@ -1,6 +1,6 @@ # setup for Neopixel SERVO9_FUNCTION 120 -NTF_LED_TYPES 487 NTF_LED_BRIGHT 2 NTF_LED_LEN 8 CAN_P1_DRIVER 1 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat index 404a4257cd..51e3e48c3d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat @@ -177,3 +177,5 @@ define HAL_PARACHUTE_ENABLED 0 define AP_PARAM_MAX_EMBEDDED_PARAM 1024 + +define DEFAULT_NTF_LED_TYPES 487 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/defaults.parm index 1548b68cb7..abce81c984 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/defaults.parm @@ -1,6 +1,6 @@ SERVO13_FUNCTION 120 -NTF_LED_TYPES 487 NTF_LED_BRIGHT 2 NTF_LED_LEN 8 CAN_D1_PROTOCOL 1 CAN_P1_DRIVER 1 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/hwdef.dat index 5db85a952f..5b2adc1505 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-SE/hwdef.dat @@ -25,4 +25,5 @@ IMU Invensensev3 SPI:icm42688 ROTATION_YAW_180 undef HAL_I2C_INTERNAL_MASK -define HAL_I2C_INTERNAL_MASK 0 \ No newline at end of file +define HAL_I2C_INTERNAL_MASK 0 +define DEFAULT_NTF_LED_TYPES 487 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/defaults.parm index 7b610d2326..b8e657dea4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/defaults.parm @@ -1,2 +1,2 @@ SERVO13_FUNCTION 120 -NTF_LED_TYPES 455 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/hwdef.dat index ec6b1ee22d..e61774c3d1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing-bdshot/hwdef.dat @@ -12,3 +12,5 @@ PA0 TIM2_CH1 TIM2 PWM(1) GPIO(50) BIDIR PA1 TIM2_CH2 TIM2 PWM(2) GPIO(51) PA2 TIM5_CH3 TIM5 PWM(3) GPIO(52) BIDIR PA3 TIM5_CH4 TIM5 PWM(4) GPIO(53) + +define DEFAULT_NTF_LED_TYPES 455 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm index 7b610d2326..b8e657dea4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm @@ -1,2 +1,2 @@ SERVO13_FUNCTION 120 -NTF_LED_TYPES 455 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat index 10d90b389b..c0aa7b19c1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat @@ -213,3 +213,5 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" define OSD_ENABLED 1 define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin + +define DEFAULT_NTF_LED_TYPES 455 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/defaults.parm index d30f89aa1c..f7ce5340fa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/defaults.parm @@ -1,6 +1,5 @@ # setup for LEDs on chan5 SERVO11_FUNCTION 120 -NTF_LED_TYPES 257 # setup SERIAL2 for SmartPort SERIAL2_PROTOCOL 10 @@ -8,3 +7,4 @@ SERIAL2_OPTIONS 15 # currently using both IMUs is too CPU intensive INS_ENABLE_MASK 1 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat index b5ba248049..2e10631cf7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SPRacingH7/hwdef.dat @@ -193,3 +193,5 @@ define BOARD_PWM_COUNT_DEFAULT 11 define STM32_PWM_USE_ADVANCED TRUE define HAL_STORAGE_SIZE 16384 + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/defaults.parm index 1f29774df7..1a7ac0e6d5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/defaults.parm @@ -1,4 +1,4 @@ -# setup for Neopixel -OUT3_FUNCTION 120 -OUT4_FUNCTION 121 -NTF_LED_TYPES 455 +# setup for Neopixel +OUT3_FUNCTION 120 +OUT4_FUNCTION 121 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat index 310789d9c3..5f0dfbb6ca 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat @@ -1,130 +1,132 @@ -# hw definition for Sierra-F405 - -# MCU class and specific type -MCU STM32F4xx STM32F405xx - -# bootloader starts firmware at 64k -FLASH_RESERVE_START_KB 64 -FLASH_SIZE_KB 1024 - -# store parameters in pages 2 and 3 -STORAGE_FLASH_PAGE 2 -define HAL_STORAGE_SIZE 15360 - -# board ID for firmware load -APJ_BOARD_ID 1052 - -env AP_PERIPH 1 - -define STM32_ST_USE_TIMER 5 -define CH_CFG_ST_RESOLUTION 32 - -# enable watchdog -define HAL_WATCHDOG_ENABLED_DEFAULT true - -# crystal frequency -OSCILLATOR_HZ 16000000 - -STDOUT_SERIAL SD1 -STDOUT_BAUDRATE 57600 - -define HAL_NO_GPIO_IRQ - -# avoid timer and RCIN threads to save memory -define HAL_NO_RCIN_THREAD - -define HAL_USE_RTC FALSE - -define DMA_RESERVE_SIZE 0 - -define HAL_DISABLE_LOOP_DELAY -define HAL_NO_MONITOR_THREAD -define HAL_NO_LOGGING -define DISABLE_SERIAL_ESC_COMM TRUE - -define HAL_DEVICE_THREAD_STACK 768 - -# we setup a small defaults.parm -define AP_PARAM_MAX_EMBEDDED_PARAM 256 - -# keep ROMFS uncompressed as we don't have enough RAM -# to uncompress the bootloader at runtime -env ROMFS_UNCOMPRESSED True - - -# --------------------- SPI2 RM3100 + DPS310 -------------------- -PA5 SPI1_SCK SPI1 -PA6 SPI1_MISO SPI1 -PA7 SPI1_MOSI SPI1 -PA8 BARO_CS CS -PB12 MAG_CS CS - -# ---------------------- CAN bus ------------------------- -PA11 CAN1_RX CAN1 -PA12 CAN1_TX CAN1 - -CAN_ORDER 1 - -# use DNA for node allocation - -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F405" - -# order of UARTs -SERIAL_ORDER USART1 EMPTY EMPTY USART2 - -# USART1 for debug -PA9 USART1_TX USART1 -PA10 USART1_RX USART1 -define HAL_SERIAL0_BAUD_DEFAULT 57600 - -# USART2 M9N -PA2 USART2_TX USART2 SPEED_HIGH -PA3 USART2_RX USART2 SPEED_HIGH - -# --------------------- CAM Trigger + Feedback ----------------------- -PB8 TIM4_CH3 TIM4 PWM(1) GPIO(50) -PB9 TIM4_CH4 TIM4 PWM(2) GPIO(51) - -# WS2812 LED pin -PA15 TIM2_CH1 TIM2 PWM(3) GPIO(52) -PB4 TIM3_CH1 TIM3 PWM(4) GPIO(53) - -# ----------------------- GPS ---------------------------- -define HAL_PERIPH_ENABLE_GPS -define HAL_PERIPH_GPS_PORT_DEFAULT 3 -define GPS_MAX_RECEIVERS 1 -define GPS_MAX_INSTANCES 1 - -# ---------------------- COMPASS --------------------------- -define HAL_PERIPH_ENABLE_MAG - -SPIDEV rm3100 SPI1 DEVID1 MAG_CS MODE0 1*MHZ 1*MHZ -COMPASS RM3100 SPI:rm3100 false ROTATION_PITCH_180 -define AP_RM3100_REVERSAL_MASK 7 -define HAL_COMPASS_MAX_SENSORS 1 - -# --------------------- DPS310 --------------------------- -define HAL_PERIPH_ENABLE_BARO -SPIDEV dps310 SPI1 DEVID3 BARO_CS MODE3 5*MHZ 5*MHZ -BARO DPS310 SPI:dps310 - -define HAL_USE_ADC TRUE -define STM32_ADC_USE_ADC1 TRUE -#define HAL_DISABLE_ADC_DRIVER TRUE -PA0 VSENSE ADC1 SCALE(2) - -# -------------------- Buzzer+NeoPixels -------------------- -define HAL_PERIPH_ENABLE_RC_OUT -define HAL_PERIPH_ENABLE_NOTIFY - -# Enable the sensor voltage pin -PC13 VDD_3V3_SENSORS_EN OUTPUT HIGH - -#GPS M9N -PC11 M9EXTINT INPUT -PC10 M9RST INPUT -PC8 GPS_PPS_IN INPUT -PC7 M9SB INPUT - -# allow for reboot command for faster development -define HAL_PERIPH_LISTEN_FOR_SERIAL_UART_REBOOT_CMD_PORT 0 +# hw definition for Sierra-F405 + +# MCU class and specific type +MCU STM32F4xx STM32F405xx + +# bootloader starts firmware at 64k +FLASH_RESERVE_START_KB 64 +FLASH_SIZE_KB 1024 + +# store parameters in pages 2 and 3 +STORAGE_FLASH_PAGE 2 +define HAL_STORAGE_SIZE 15360 + +# board ID for firmware load +APJ_BOARD_ID 1052 + +env AP_PERIPH 1 + +define STM32_ST_USE_TIMER 5 +define CH_CFG_ST_RESOLUTION 32 + +# enable watchdog +define HAL_WATCHDOG_ENABLED_DEFAULT true + +# crystal frequency +OSCILLATOR_HZ 16000000 + +STDOUT_SERIAL SD1 +STDOUT_BAUDRATE 57600 + +define HAL_NO_GPIO_IRQ + +# avoid timer and RCIN threads to save memory +define HAL_NO_RCIN_THREAD + +define HAL_USE_RTC FALSE + +define DMA_RESERVE_SIZE 0 + +define HAL_DISABLE_LOOP_DELAY +define HAL_NO_MONITOR_THREAD +define HAL_NO_LOGGING +define DISABLE_SERIAL_ESC_COMM TRUE + +define HAL_DEVICE_THREAD_STACK 768 + +# we setup a small defaults.parm +define AP_PARAM_MAX_EMBEDDED_PARAM 256 + +# keep ROMFS uncompressed as we don't have enough RAM +# to uncompress the bootloader at runtime +env ROMFS_UNCOMPRESSED True + + +# --------------------- SPI2 RM3100 + DPS310 -------------------- +PA5 SPI1_SCK SPI1 +PA6 SPI1_MISO SPI1 +PA7 SPI1_MOSI SPI1 +PA8 BARO_CS CS +PB12 MAG_CS CS + +# ---------------------- CAN bus ------------------------- +PA11 CAN1_RX CAN1 +PA12 CAN1_TX CAN1 + +CAN_ORDER 1 + +# use DNA for node allocation + +define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F405" + +# order of UARTs +SERIAL_ORDER USART1 EMPTY EMPTY USART2 + +# USART1 for debug +PA9 USART1_TX USART1 +PA10 USART1_RX USART1 +define HAL_SERIAL0_BAUD_DEFAULT 57600 + +# USART2 M9N +PA2 USART2_TX USART2 SPEED_HIGH +PA3 USART2_RX USART2 SPEED_HIGH + +# --------------------- CAM Trigger + Feedback ----------------------- +PB8 TIM4_CH3 TIM4 PWM(1) GPIO(50) +PB9 TIM4_CH4 TIM4 PWM(2) GPIO(51) + +# WS2812 LED pin +PA15 TIM2_CH1 TIM2 PWM(3) GPIO(52) +PB4 TIM3_CH1 TIM3 PWM(4) GPIO(53) + +# ----------------------- GPS ---------------------------- +define HAL_PERIPH_ENABLE_GPS +define HAL_PERIPH_GPS_PORT_DEFAULT 3 +define GPS_MAX_RECEIVERS 1 +define GPS_MAX_INSTANCES 1 + +# ---------------------- COMPASS --------------------------- +define HAL_PERIPH_ENABLE_MAG + +SPIDEV rm3100 SPI1 DEVID1 MAG_CS MODE0 1*MHZ 1*MHZ +COMPASS RM3100 SPI:rm3100 false ROTATION_PITCH_180 +define AP_RM3100_REVERSAL_MASK 7 +define HAL_COMPASS_MAX_SENSORS 1 + +# --------------------- DPS310 --------------------------- +define HAL_PERIPH_ENABLE_BARO +SPIDEV dps310 SPI1 DEVID3 BARO_CS MODE3 5*MHZ 5*MHZ +BARO DPS310 SPI:dps310 + +define HAL_USE_ADC TRUE +define STM32_ADC_USE_ADC1 TRUE +#define HAL_DISABLE_ADC_DRIVER TRUE +PA0 VSENSE ADC1 SCALE(2) + +# -------------------- Buzzer+NeoPixels -------------------- +define HAL_PERIPH_ENABLE_RC_OUT +define HAL_PERIPH_ENABLE_NOTIFY + +# Enable the sensor voltage pin +PC13 VDD_3V3_SENSORS_EN OUTPUT HIGH + +#GPS M9N +PC11 M9EXTINT INPUT +PC10 M9RST INPUT +PC8 GPS_PPS_IN INPUT +PC7 M9SB INPUT + +# allow for reboot command for faster development +define HAL_PERIPH_LISTEN_FOR_SERIAL_UART_REBOOT_CMD_PORT 0 + +define DEFAULT_NTF_LED_TYPES 455 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/defaults.parm index 1f29774df7..1a7ac0e6d5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/defaults.parm @@ -1,4 +1,4 @@ -# setup for Neopixel -OUT3_FUNCTION 120 -OUT4_FUNCTION 121 -NTF_LED_TYPES 455 +# setup for Neopixel +OUT3_FUNCTION 120 +OUT4_FUNCTION 121 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat index 94d8009d97..41848ff4f0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat @@ -1,133 +1,135 @@ -# hw definition file for processing by chibios_pins.py - -# Sierra-M9N Firmware - -# MCU class and specific type -MCU STM32F4xx STM32F412Rx - -# bootloader starts firmware at 64k -FLASH_RESERVE_START_KB 64 - -# store parameters in pages 2 and 3 -define STORAGE_FLASH_PAGE 2 -define HAL_STORAGE_SIZE 8192 - -# board ID for firmware load -APJ_BOARD_ID 1055 - -# setup build for a peripheral firmware -env AP_PERIPH 1 - -STM32_ST_USE_TIMER 5 - -# enable watchdog -define HAL_WATCHDOG_ENABLED_DEFAULT true - -# crystal frequency -OSCILLATOR_HZ 16000000 - -define CH_CFG_ST_FREQUENCY 1000000 - -# Flash available -FLASH_SIZE_KB 1024 - -STDOUT_SERIAL SD1 -STDOUT_BAUDRATE 57600 - -# order of UARTs -SERIAL_ORDER USART1 EMPTY EMPTY USART2 - -# USART1 for debug -PA9 USART1_TX USART1 -PA10 USART1_RX USART1 -define HAL_SERIAL0_BAUD_DEFAULT 57600 - -# Enable the sensor voltage pin -PC13 VDD_3V3_SENSORS_EN OUTPUT HIGH - -# USART2 for GPS -PA2 USART2_TX USART2 SPEED_HIGH -PA3 USART2_RX USART2 SPEED_HIGH - -# SWD debugging -PA13 JTMS-SWDIO SWD -PA14 JTCK-SWCLK SWD - -# SPI sensors -PA5 SPI1_SCK SPI1 -PA6 SPI1_MISO SPI1 -PA7 SPI1_MOSI SPI1 - -# SPI CS -PB12 MAG_CS CS -PA8 BARO_CS CS - -# Baro probe -SPIDEV dps310 SPI1 DEVID3 BARO_CS MODE3 5*MHZ 5*MHZ -BARO DPS310 SPI:dps310 - -# Mag probe -SPIDEV rm3100 SPI1 DEVID1 MAG_CS MODE0 1*MHZ 1*MHZ -COMPASS RM3100 SPI:rm3100 false ROTATION_PITCH_180 -define AP_RM3100_REVERSAL_MASK 7 - -# PWM, WS2812 LED -PB8 TIM4_CH3 TIM4 PWM(1) GPIO(50) -PB9 TIM4_CH4 TIM4 PWM(2) GPIO(51) -PA15 TIM2_CH1 TIM2 PWM(3) GPIO(52) -PB4 TIM3_CH1 TIM3 PWM(4) GPIO(53) - -define HAL_USE_ADC TRUE -define STM32_ADC_USE_ADC1 TRUE -#define HAL_DISABLE_ADC_DRIVER TRUE -PA0 VSENSE ADC1 SCALE(2) - -define HAL_NO_GPIO_IRQ - -# avoid RCIN thread to save memory -define HAL_NO_RCIN_THREAD -define HAL_USE_RTC FALSE -define DISABLE_SERIAL_ESC_COMM TRUE -define DMA_RESERVE_SIZE 0 -define PERIPH_FW TRUE -define HAL_DISABLE_LOOP_DELAY - -# enable CAN support -PA11 CAN1_RX CAN1 -PA12 CAN1_TX CAN1 - -# use DNA -define HAL_CAN_DEFAULT_NODE_ID 0 -define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F412" - -define HAL_NO_MONITOR_THREAD -define HAL_BUILD_AP_PERIPH -define HAL_DEVICE_THREAD_STACK 768 - -# disable dual GPS and GPS blending to save flash space -define GPS_MAX_RECEIVERS 1 -define GPS_MAX_INSTANCES 1 -define HAL_COMPASS_MAX_SENSORS 1 - -# GPS+MAG+BARO+Buzzer+NeoPixels -define HAL_PERIPH_ENABLE_GPS -define HAL_PERIPH_GPS_PORT_DEFAULT 3 -define HAL_PERIPH_ENABLE_MAG -define HAL_PERIPH_ENABLE_BARO -define HAL_PERIPH_ENABLE_RC_OUT -define HAL_PERIPH_ENABLE_NOTIFY - -# reserve 256 bytes for comms between app and bootloader -RAM_RESERVE_START 256 - -# allow for reboot command for faster development -define HAL_PERIPH_LISTEN_FOR_SERIAL_UART_REBOOT_CMD_PORT 0 - -# we setup a small defaults.parm -define AP_PARAM_MAX_EMBEDDED_PARAM 256 - -#GPS M9N -PC11 M9EXTINT INPUT -PC10 M9RST INPUT -PC8 GPS_PPS_IN INPUT -PC7 M9SB INPUT +# hw definition file for processing by chibios_pins.py + +# Sierra-M9N Firmware + +# MCU class and specific type +MCU STM32F4xx STM32F412Rx + +# bootloader starts firmware at 64k +FLASH_RESERVE_START_KB 64 + +# store parameters in pages 2 and 3 +define STORAGE_FLASH_PAGE 2 +define HAL_STORAGE_SIZE 8192 + +# board ID for firmware load +APJ_BOARD_ID 1055 + +# setup build for a peripheral firmware +env AP_PERIPH 1 + +STM32_ST_USE_TIMER 5 + +# enable watchdog +define HAL_WATCHDOG_ENABLED_DEFAULT true + +# crystal frequency +OSCILLATOR_HZ 16000000 + +define CH_CFG_ST_FREQUENCY 1000000 + +# Flash available +FLASH_SIZE_KB 1024 + +STDOUT_SERIAL SD1 +STDOUT_BAUDRATE 57600 + +# order of UARTs +SERIAL_ORDER USART1 EMPTY EMPTY USART2 + +# USART1 for debug +PA9 USART1_TX USART1 +PA10 USART1_RX USART1 +define HAL_SERIAL0_BAUD_DEFAULT 57600 + +# Enable the sensor voltage pin +PC13 VDD_3V3_SENSORS_EN OUTPUT HIGH + +# USART2 for GPS +PA2 USART2_TX USART2 SPEED_HIGH +PA3 USART2_RX USART2 SPEED_HIGH + +# SWD debugging +PA13 JTMS-SWDIO SWD +PA14 JTCK-SWCLK SWD + +# SPI sensors +PA5 SPI1_SCK SPI1 +PA6 SPI1_MISO SPI1 +PA7 SPI1_MOSI SPI1 + +# SPI CS +PB12 MAG_CS CS +PA8 BARO_CS CS + +# Baro probe +SPIDEV dps310 SPI1 DEVID3 BARO_CS MODE3 5*MHZ 5*MHZ +BARO DPS310 SPI:dps310 + +# Mag probe +SPIDEV rm3100 SPI1 DEVID1 MAG_CS MODE0 1*MHZ 1*MHZ +COMPASS RM3100 SPI:rm3100 false ROTATION_PITCH_180 +define AP_RM3100_REVERSAL_MASK 7 + +# PWM, WS2812 LED +PB8 TIM4_CH3 TIM4 PWM(1) GPIO(50) +PB9 TIM4_CH4 TIM4 PWM(2) GPIO(51) +PA15 TIM2_CH1 TIM2 PWM(3) GPIO(52) +PB4 TIM3_CH1 TIM3 PWM(4) GPIO(53) + +define HAL_USE_ADC TRUE +define STM32_ADC_USE_ADC1 TRUE +#define HAL_DISABLE_ADC_DRIVER TRUE +PA0 VSENSE ADC1 SCALE(2) + +define HAL_NO_GPIO_IRQ + +# avoid RCIN thread to save memory +define HAL_NO_RCIN_THREAD +define HAL_USE_RTC FALSE +define DISABLE_SERIAL_ESC_COMM TRUE +define DMA_RESERVE_SIZE 0 +define PERIPH_FW TRUE +define HAL_DISABLE_LOOP_DELAY + +# enable CAN support +PA11 CAN1_RX CAN1 +PA12 CAN1_TX CAN1 + +# use DNA +define HAL_CAN_DEFAULT_NODE_ID 0 +define CAN_APP_NODE_NAME "org.ardupilot.Sierra-F412" + +define HAL_NO_MONITOR_THREAD +define HAL_BUILD_AP_PERIPH +define HAL_DEVICE_THREAD_STACK 768 + +# disable dual GPS and GPS blending to save flash space +define GPS_MAX_RECEIVERS 1 +define GPS_MAX_INSTANCES 1 +define HAL_COMPASS_MAX_SENSORS 1 + +# GPS+MAG+BARO+Buzzer+NeoPixels +define HAL_PERIPH_ENABLE_GPS +define HAL_PERIPH_GPS_PORT_DEFAULT 3 +define HAL_PERIPH_ENABLE_MAG +define HAL_PERIPH_ENABLE_BARO +define HAL_PERIPH_ENABLE_RC_OUT +define HAL_PERIPH_ENABLE_NOTIFY + +# reserve 256 bytes for comms between app and bootloader +RAM_RESERVE_START 256 + +# allow for reboot command for faster development +define HAL_PERIPH_LISTEN_FOR_SERIAL_UART_REBOOT_CMD_PORT 0 + +# we setup a small defaults.parm +define AP_PARAM_MAX_EMBEDDED_PARAM 256 + +#GPS M9N +PC11 M9EXTINT INPUT +PC10 M9RST INPUT +PC8 GPS_PPS_IN INPUT +PC7 M9SB INPUT + +define DEFAULT_NTF_LED_TYPES 455 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/defaults.parm index 1812ebbd8e..63b7262cc4 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/defaults.parm @@ -1,8 +1,8 @@ # setup for Neopixel SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 NTF_LED_LEN 1 # Default VTX power to on RELAY_DEFAULT 1 SERIAL3_PROTOCOL 16 RSSI_TYPE 3 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat index 2171618b93..bab17f97a1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat @@ -44,3 +44,5 @@ PB1 TIM3_CH4 TIM3 PWM(2) GPIO(51) PD12 TIM4_CH1 TIM4 PWM(3) GPIO(52) BIDIR PA0 TIM2_CH1 TIM2 PWM(5) GPIO(54) BIDIR PA2 TIM2_CH3 TIM2 PWM(7) GPIO(56) BIDIR + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/defaults.parm index 835e84805f..88645fef64 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/defaults.parm @@ -1,6 +1,5 @@ # setup for Neopixel SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 NTF_LED_LEN 1 # set up Sbus-in @@ -14,3 +13,4 @@ SERIAL1_BAUDRATE 115 RSSI_TYPE 3 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat index 203309dda6..b5bf33b1f5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat @@ -194,3 +194,5 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define STM32_PWM_USE_ADVANCED TRUE + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/defaults.parm index fe1e4e7096..e8db6257d1 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/defaults.parm @@ -1,9 +1,9 @@ # WS2812 LED NTF_LED_LEN,4 -NTF_LED_TYPES 257 SERVO12_FUNCTION,120 #Serial Port defaults SERIAL1_PROTOCOL 23 SERIAL4_PROTOCOL -1 SERIAL6_PROTOCOL 2 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat index 6db262ae94..6dfffe79ba 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat @@ -222,3 +222,5 @@ define AP_GPS_UBLOX_ENABLED 1 define AP_GPS_NMEA_ENABLED 1 define AP_TRAMP_ENABLED 1 + +define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm index 7e43f428f0..e02cfdf1c2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm @@ -1,6 +1,5 @@ # setup for Neopixel OUT7_FUNCTION 120 -NTF_LED_TYPES 455 NTF_LED_BRIGHT 2 NTF_LED_LEN 8 @@ -9,3 +8,4 @@ NTF_LED_LEN 8 #| USART1 | USART2 | USART3 | UART4 | UART5 | GPS_PORT 3 MSP_PORT 4 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat index cf893875b5..4ed9c4e433 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat @@ -226,3 +226,5 @@ define HAL_BATT2_VOLT_SCALE 11.0 # -------------------- Buzzer+NeoPixels --------------d------ define HAL_PERIPH_ENABLE_RC_OUT define HAL_PERIPH_ENABLE_NOTIFY + +define DEFAULT_NTF_LED_TYPES 455 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/defaults.parm index ea0adaf59c..677aaaadfc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/defaults.parm @@ -1,2 +1,2 @@ SERVO9_FUNCTION 120 -NTF_LED_TYPES 257 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat index 96758c499d..87a70e4365 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat @@ -156,3 +156,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # minimal drivers to reduce flash usage include ../include/minimal.inc define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 + +define DEFAULT_NTF_LED_TYPES 257