AP_HAL_ChibiOS: use new AP_PERIPH_SERIAL_OPTIONS_ENABLED define

ArduPilot · Feb 25, 2025 · b4b585f · b4b585f
1 parent 7026372
commit b4b585f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/CubeRedPrimary-PPPGW/hwdef.dat
@@ -19,7 +19,7 @@ env AP_PERIPH 1
 define AP_CAN_SLCAN_ENABLED 0
 
 define AP_PERIPH_NETWORKING_ENABLED 1
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 
 define AP_NETWORKING_BACKEND_PPP 1
 

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Serial/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Serial/hwdef.dat
@@ -1,6 +1,6 @@
 include ../MatekL431/hwdef.inc
 
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 
 # enable serial3 port with DMA
 undef PB10

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X-PPPGW/hwdef.dat
@@ -20,7 +20,7 @@ env AP_PERIPH 1
 define AP_CAN_SLCAN_ENABLED 0
 
 define AP_PERIPH_NETWORKING_ENABLED 1
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 
 define AP_NETWORKING_BACKEND_PPP 1
 

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc b/libraries/AP_HAL_ChibiOS/hwdef/include/network_PPPGW.inc
@@ -3,7 +3,7 @@ define AP_RC_CHANNEL_ENABLED 0
 
 define AP_PERIPH_RTC_ENABLED 1
 
-define HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1
 define AP_NETWORKING_BACKEND_PPP 1
 define AP_NETWORKING_CAN_MCAST_ENABLED 1
 

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h b/libraries/AP_HAL_ChibiOS/hwdef/scripts/defaults_periph.h
@@ -166,6 +166,9 @@
 #ifdef HAL_PERIPH_ENABLE_NOTIFY
 #error "Change 'define HAL_PERIPH_ENABLE_NOTIFY' to 'define AP_PERIPH_NOTIFY_ENABLED 1'"
 #endif
+#ifdef HAL_PERIPH_ENABLE_SERIAL_OPTIONS
+#error "Change 'define HAL_PERIPH_ENABLE_SERIAL_OPTIONS' to 'define AP_PERIPH_SERIAL_OPTIONS_ENABLED 1'"
+#endif
 #ifdef HAL_PERIPH_ENABLE_GPS
 #error "Change 'define HAL_PERIPH_ENABLE_GPS' to 'define AP_PERIPH_GPS_ENABLED 1'"
 #endif
@@ -233,6 +236,9 @@
 #ifndef AP_PERIPH_NOTIFY_ENABLED
 #define AP_PERIPH_NOTIFY_ENABLED 0
 #endif
+#ifndef AP_PERIPH_SERIAL_OPTIONS_ENABLED
+#define AP_PERIPH_SERIAL_OPTIONS_ENABLED 0
+#endif
 #ifndef AP_PERIPH_BATTERY_ENABLED
 #define AP_PERIPH_BATTERY_ENABLED 0
 #endif
@@ -510,7 +516,7 @@
 #endif
 
 #ifndef AP_UART_MONITOR_ENABLED
-#define AP_UART_MONITOR_ENABLED defined(HAL_PERIPH_ENABLE_SERIAL_OPTIONS) || (AP_PERIPH_GPS_ENABLED && (GPS_MOVING_BASELINE || BOARD_FLASH_SIZE>=256))
+#define AP_UART_MONITOR_ENABLED AP_PERIPH_SERIAL_OPTIONS_ENABLED || (AP_PERIPH_GPS_ENABLED && (GPS_MOVING_BASELINE || BOARD_FLASH_SIZE>=256))
 #endif
 
 #ifndef HAL_BOARD_LOG_DIRECTORY