AP_HAL_ChibiOS: use new AP_PERIPH_RC_OUT_ENABLED define

shiv-tyagi · peterbarker · commit 11e42a94d06a · 2025-02-22T18:26:07.000+11:00
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_CANNODE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_CANNODE/hwdef.dat
@@ -113,7 +113,7 @@ define HAL_COMPASS_MAX_SENSORS 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 define CAN_APP_NODE_NAME "org.ardupilot.ARK_CANNODE"
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_GPS/hwdef.dat
@@ -114,7 +114,7 @@ define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
 define HAL_PERIPH_ENABLE_BUZZER
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # GPS on 2nd port
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_RTK_GPS/hwdef.dat
@@ -127,7 +127,7 @@ define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
 define HAL_PERIPH_ENABLE_BUZZER
 define AP_PERIPH_NOTIFY_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 # GPS on 2nd port
 define HAL_PERIPH_GPS_PORT_DEFAULT 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-GNSS_F9P/hwdef.dat
@@ -94,7 +94,7 @@ define HAL_USE_ADC FALSE
 define HAL_NO_TIMER_THREAD
 
 # enable LED
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 #GPIO LED
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AeroFox-PMU/hwdef.dat
@@ -41,7 +41,7 @@ PA3   TIM2_CH4  TIM2 PWM(7) GPIO(56)
 PA1   TIM2_CH2  TIM2 PWM(8) GPIO(57)
 PA6   TIM16_CH1 TIM16  PWM(9)  GPIO(58) NODMA
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # enable ESC control
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BirdCANdy/hwdef.dat
@@ -99,7 +99,7 @@ define GPS_MAX_INSTANCES 1
 define HAL_COMPASS_MAX_SENSORS 1
 
 # RCOU+GPS+MAG+BARO+Buzzer+NeoPixels
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixF405/hwdef.dat
@@ -114,7 +114,7 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 512
 
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 # enable ESC control
 define HAL_SERIAL_ESC_COMM_ENABLED 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CarbonixL496/hwdef.dat
@@ -117,7 +117,7 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 512
 
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 # enable ESC control
 define HAL_SERIAL_ESC_COMM_ENABLED 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeBlack-periph/hwdef.dat
@@ -27,7 +27,7 @@ env AP_PERIPH 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 
 # single GPS and compass for peripherals
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph-heavy/hwdef.dat
@@ -20,7 +20,7 @@ define AP_PERIPH_BATTERY_ENABLED 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 define AP_PERIPH_IMU_ENABLED 1
 define HAL_LOGGING_ENABLED TRUE
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrange-periph/hwdef.dat
@@ -20,7 +20,7 @@ define AP_PERIPH_BATTERY_ENABLED 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 define AP_PERIPH_IMU_ENABLED 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FreeflyRTK/hwdef.dat
@@ -125,7 +125,7 @@ define HAL_COMPASS_MAX_SENSORS 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # use NCP5623 RGB LED on I2C1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/G4-ESC/hwdef.dat
@@ -123,7 +123,7 @@ PA8 TIM1_CH1 TIM1 PWM(1) GPIO(50)
 # LED on timer
 PA15 TIM2_CH1 TIM2 PWM(2) GPIO(51)
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 define HAL_UART_MIN_TX_SIZE 256
 define HAL_UART_MIN_RX_SIZE 128
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Here4AP/hwdef.dat
@@ -129,7 +129,7 @@ define HAL_PERIPH_GPS_PORT_DEFAULT 3
 # PD13 GPS_ENABLE OUTPUT HIGH GPIO(20)
 
 # for ProfiLed we need RC out and notify
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 define AP_SERIALLED_ENABLED 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroG4_GPS/hwdef.dat
@@ -145,7 +145,7 @@ define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 # GPS on 2nd port
 define HAL_PERIPH_GPS_PORT_DEFAULT 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HolybroGPS/hwdef.dat
@@ -141,7 +141,7 @@ define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 # GPS on 2nd port
 define HAL_PERIPH_GPS_PORT_DEFAULT 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekG474-DShot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekG474-DShot/hwdef.dat
@@ -13,7 +13,7 @@ PC6  TIM8_CH1  TIM8 PWM(9)  GPIO(58)
 PB9  TIM8_CH3  TIM8 PWM(10) GPIO(59)
 PB2  TIM5_CH1  TIM5 PWM(11) GPIO(60)
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # enable ESC control
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekH743-periph/hwdef.dat
@@ -22,7 +22,7 @@ define AP_PERIPH_BARO_ENABLED 1
 define AP_PERIPH_AIRSPEED_ENABLED 1
 define AP_PERIPH_ADSB_ENABLED 1
 define AP_PERIPH_RANGEFINDER_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_BATTERY_ENABLED 1
 
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-APDTelem/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-APDTelem/hwdef.dat
@@ -9,7 +9,7 @@ PA10  TIM1_CH3  TIM1 PWM(3) GPIO(52)
 PA11  TIM1_CH4  TIM1 PWM(4) GPIO(53)
 PA15  TIM2_CH1  TIM2 PWM(5) GPIO(54)
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 # enable APD telemetry on rx1
 define HAL_PERIPH_ENABLE_ESC_APD
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-DShot/hwdef.dat
@@ -25,7 +25,7 @@ PA1   TIM2_CH2  TIM2 PWM(8) GPIO(57)
 # "beeper" pin -- PWM9
 PA6   TIM16_CH1 TIM16  PWM(9)  GPIO(58) NODMA
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # enable ESC control
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat
@@ -78,7 +78,7 @@ PB0 BATT2_VOLTAGE_SENS ADC1 SCALE(1)
 PB1 BATT2_CURRENT_SENS ADC1 SCALE(1)
 
 # -------------------- Buzzer+NeoPixels --------------d------
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-RC/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-RC/hwdef.dat
@@ -19,7 +19,7 @@ PA9   TIM1_CH2  TIM1 PWM(2) GPIO(51)
 PA10  TIM1_CH3  TIM1 PWM(3) GPIO(52)
 PA11  TIM1_CH4  TIM1 PWM(4) GPIO(53)
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # enable ESC control
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-bdshot/hwdef.dat
@@ -27,7 +27,7 @@ PA1   TIM2_CH2  TIM2 PWM(8) GPIO(57)
 # "beeper" pin -- PWM9
 PA6   TIM16_CH1 TIM16  PWM(9)  GPIO(58) NODMA
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # enable ESC control
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixracer-periph/hwdef.dat
@@ -71,7 +71,7 @@ define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
 
 define AP_PERIPH_BATTERY_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 define AP_PERIPH_RANGEFINDER_ENABLED 1
 define AP_PERIPH_RANGEFINDER_PORT_DEFAULT 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F405/hwdef.dat
@@ -101,7 +101,7 @@ define STM32_ADC_USE_ADC1 TRUE
 PA0 VSENSE ADC1 SCALE(2)
 
 # -------------------- Buzzer+NeoPixels --------------------
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # Enable the sensor voltage pin
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F412/hwdef.dat
@@ -104,7 +104,7 @@ define AP_PERIPH_GPS_ENABLED 1
 define HAL_PERIPH_GPS_PORT_DEFAULT 3
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # reserve 256 bytes for comms between app and bootloader
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-F9P/hwdef.dat
@@ -115,7 +115,7 @@ define HAL_COMPASS_MAX_SENSORS 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 define CONFIGURE_PPS_PIN TRUE
 define GPS_MOVING_BASELINE 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-PrecisionPoint/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-PrecisionPoint/hwdef.dat
@@ -111,7 +111,7 @@ define HAL_COMPASS_MAX_SENSORS 1
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # PB5  GPS_PPS INPUT FLOATING GPIO(6)
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Sierra-TrueNavPro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Sierra-TrueNavPro/hwdef.dat
@@ -89,7 +89,7 @@ env ROMFS_UNCOMPRESSED True
 define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 # disable dual GPS and GPS blending to save flash space
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-PWM/hwdef.dat
@@ -26,5 +26,5 @@ PB14 TIM1_CH2N TIM1 PWM(3) GPIO(52)
 PB15 TIM1_CH3N TIM1 PWM(4) GPIO(53)
 
 # enable PWM
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f303-TempSensor/hwdef.dat
@@ -15,7 +15,7 @@ undef PB0
 PB0 TIM3_CH3 TIM3 PWM(1) GPIO(2)
 PB1 TIM3_CH4 TIM3 PWM(2) GPIO(3)
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 
 define AP_PERIPH_BATTERY_ENABLED 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat
@@ -211,7 +211,7 @@ define HAL_BATT2_VOLT_SCALE 11.0
 
 
 # -------------------- Buzzer+NeoPixels --------------d------
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
 
 define DEFAULT_NTF_LED_TYPES 455
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/mRoCANPWM-M10126/hwdef.dat
@@ -81,7 +81,7 @@ PA7     TIM3_CH2    TIM3    PWM(10) GPIO(59)
 PB0     TIM3_CH3    TIM3    PWM(11) GPIO(60)
 PB1     TIM3_CH4    TIM3    PWM(12) GPIO(61)
 
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 #define AP_PERIPH_NOTIFY_ENABLED 1
 
 # enable ESC control
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/rGNSS/hwdef.dat
@@ -118,7 +118,7 @@ define AP_PERIPH_GPS_ENABLED 1
 define AP_PERIPH_MAG_ENABLED 1
 define AP_PERIPH_BARO_ENABLED 1
 define AP_PERIPH_NOTIFY_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 # single baro
 define BARO_MAX_INSTANCES 1
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
@@ -181,6 +181,9 @@
 #ifdef HAL_PERIPH_ENABLE_BARO
 #error "Change 'define HAL_PERIPH_ENABLE_BARO' to 'define AP_PERIPH_BARO_ENABLED 1'"
 #endif
+#ifdef HAL_PERIPH_ENABLE_RC_OUT
+#error "Change 'define HAL_PERIPH_ENABLE_RC_OUT' to 'define AP_PERIPH_RC_OUT_ENABLED 1'"
+#endif
 #ifdef HAL_PERIPH_ENABLE_RANGEFINDER
 #error "Change 'define HAL_PERIPH_ENABLE_RANGEFINDER' to 'define AP_PERIPH_RANGEFINDER_ENABLED 1'"
 #endif
@@ -248,6 +251,9 @@
 #ifndef AP_PERIPH_IMU_ENABLED
 #define AP_PERIPH_IMU_ENABLED 0
 #endif
+#ifndef AP_PERIPH_RC_OUT_ENABLED
+#define AP_PERIPH_RC_OUT_ENABLED 0
+#endif
 #ifndef AP_PERIPH_EFI_ENABLED
 #define AP_PERIPH_EFI_ENABLED 0
 #endif
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-boom-f407/hwdef.dat
@@ -62,7 +62,7 @@ define APD_ESC_SERIAL_0 1
 define APD_ESC_SERIAL_1 2
 
 # pwm
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 PE9   TIM1_CH1  TIM1 PWM(1) GPIO(51) # esc front
 PE11  TIM1_CH2  TIM1 PWM(2) GPIO(52) # esc rear
 PB11  TIM2_CH4  TIM2 PWM(4) GPIO(54) # aux 3
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-nav-f405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-nav-f405/hwdef.dat
@@ -64,7 +64,7 @@ define HAL_COMPASS_MAX_SENSORS 1
 
 # notify led
 define AP_PERIPH_NOTIFY_ENABLED 1
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 
 define DEFAULT_NTF_LED_TYPES 131072 # discrete rgb led (1 << 17)
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sw-spar-f407/hwdef.dat
@@ -58,7 +58,7 @@ PB10  USART3_TX USART3 SPEED_HIGH DMA
 PB11  USART3_RX USART3 SPEED_HIGH DMA
 
 # throttle pwm
-define HAL_PERIPH_ENABLE_RC_OUT
+define AP_PERIPH_RC_OUT_ENABLED 1
 PA15  TIM2_CH1  TIM2 PWM(1)
 
 # i2c
