AP_HAL: move enabling of AP_NOTIFY_TONEALARM_ENABLED out of AP_Notify…

…_config.h this is looking at chibios-specific defines, which is bad
ArduPilot · Jan 31, 2025 · 57877dd · 57877dd
1 parent 1b90781
commit 57877dd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/libraries/AP_HAL/AP_HAL_Boards.h b/libraries/AP_HAL/AP_HAL_Boards.h
@@ -188,6 +188,10 @@
 #define HAL_REQUIRES_BDSHOT_SUPPORT (defined(HAL_WITH_BIDIR_DSHOT) || HAL_WITH_IO_MCU_BIDIR_DSHOT)
 #endif
 
+#ifndef AP_NOTIFY_TONEALARM_ENABLED
+#define AP_NOTIFY_TONEALARM_ENABLED 0
+#endif
+
 // support for Extended DShot Telemetry v2 is enabled only if any kind of such telemetry
 // can in principle arrive, either from servo outputs or from IOMCU
 

diff --git a/libraries/AP_HAL/board/chibios.h b/libraries/AP_HAL/board/chibios.h
@@ -155,3 +155,7 @@
 #define HAL_INS_RATE_LOOP 0
 #endif
 #endif
+
+#ifndef AP_NOTIFY_TONEALARM_ENABLED
+#define AP_NOTIFY_TONEALARM_ENABLED ((defined(HAL_PWM_ALARM) || HAL_DSHOT_ALARM_ENABLED))
+#endif
diff --git a/libraries/AP_HAL/board/linux.h b/libraries/AP_HAL/board/linux.h
@@ -28,6 +28,9 @@
     #define HAL_INS_DEFAULT HAL_INS_NONE
     #define HAL_BARO_DEFAULT HAL_BARO_NONE
 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBOARD
+    #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF
+    #define AP_NOTIFY_TONEALARM_ENABLED 1
+    #endif
     #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_PXF
       #define HAL_INS_PROBE_LIST PROBE_IMU_SPI(Invensense, "mpu9250", ROTATION_ROLL_180_YAW_270)
     #else

diff --git a/libraries/AP_HAL/board/sitl.h b/libraries/AP_HAL/board/sitl.h
@@ -104,3 +104,7 @@
 #ifndef HAL_INS_RATE_LOOP
 #define HAL_INS_RATE_LOOP 1
 #endif
+
+#ifndef AP_NOTIFY_TONEALARM_ENABLED
+#define AP_NOTIFY_TONEALARM_ENABLED 1
+#endif