From 96ee586eaa3f78d92dbc8c114c08c483aa11fca5 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 9 Mar 2024 13:35:25 +1100 Subject: [PATCH] AP_HAL_ChibiOS: move AC_Avoidance defines into libraries --- libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/include/minimize_common.inc | 2 +- libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 6470d4b28e..8fcd90e9b9 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -162,7 +162,7 @@ define STM32_PWM_USE_ADVANCED TRUE # FFT option (disabled by default) # define HAL_GYROFFT_ENABLED 1 -# define AC_OAPATHPLANNER_ENABLED 0 +# define AP_OAPATHPLANNER_ENABLED 0 # EK2 options (disabled by default) # define HAL_NAVEKF2_AVAILABLE 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat index d1e3894302..6da0d984d8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat @@ -157,7 +157,7 @@ define AP_BATT_MONITOR_MAX_INSTANCES 1 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define HAL_GENERATOR_ENABLED 0 -define AC_OAPATHPLANNER_ENABLED 0 +define AP_OAPATHPLANNER_ENABLED 0 define AC_PRECLAND_ENABLED 0 define HAL_BARO_WIND_COMP_ENABLED 0 define AP_GRIPPER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/include/minimize_common.inc b/libraries/AP_HAL_ChibiOS/hwdef/include/minimize_common.inc index 5b3ea0e7c2..8047ea538c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/include/minimize_common.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/include/minimize_common.inc @@ -109,7 +109,7 @@ define QAUTOTUNE_ENABLED 0 define MODE_FLOWHOLD_ENABLED 0 define MODE_ZIGZAG_ENABLED 0 define AC_NAV_GUIDED 0 -define AC_OAPATHPLANNER_ENABLED 0 +define AP_OAPATHPLANNER_ENABLED 0 define MODE_FOLLOW_ENABLED 0 define MODE_GUIDED_NOGPS_ENABLED 0 define MODE_SYSTEMID_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc b/libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc index b2720a6449..00294b4d85 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc +++ b/libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc @@ -1,5 +1,5 @@ # save some flash -define AC_OAPATHPLANNER_ENABLED 0 +define AP_OAPATHPLANNER_ENABLED 0 define AC_PRECLAND_ENABLED 0 define AP_ICENGINE_ENABLED 0 define AP_OPTICALFLOW_ENABLED 0