From 0bd08a4a822ad2b2b0e0c270a99f89133996fc8b Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 20 Sep 2022 17:37:47 +1000 Subject: [PATCH] AP_HAL_ChibiOS: add AP_GRIPPER_ENABLED --- libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/ReaperF745v2/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat | 4 +++- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat index 8478b97657..e9c57385a2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat @@ -65,7 +65,7 @@ define HAL_GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 define PRECISION_LANDING 0 define HAL_BARO_WIND_COMP_ENABLED 0 -define GRIPPER_ENABLED 0 +define AP_GRIPPER_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define AP_BATTMON_SMBUS_ENABLE 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 63544dbf84..306357ccf6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -166,7 +166,7 @@ define HAL_GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 define PRECISION_LANDING 0 define HAL_BARO_WIND_COMP_ENABLED 0 -define GRIPPER_ENABLED 0 +define AP_GRIPPER_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat index 9428bb4ccc..f3ed8a90cb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/JHEMCU-GSF405A/hwdef.dat @@ -163,7 +163,7 @@ define HAL_GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 define PRECISION_LANDING 0 define HAL_BARO_WIND_COMP_ENABLED 0 -define GRIPPER_ENABLED 0 +define AP_GRIPPER_ENABLED 0 define HAL_HOTT_TELEM_ENABLED 0 define HAL_NMEA_OUTPUT_ENABLED 0 define HAL_BUTTON_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat index 36b9c2ff6f..5857669628 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat @@ -183,7 +183,7 @@ define HAL_GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 define PRECISION_LANDING 0 define HAL_BARO_WIND_COMP_ENABLED 0 -define GRIPPER_ENABLED 0 +define AP_GRIPPER_ENABLED 0 define HAL_RUNCAM_ENABLED 0 define HAL_HOTT_TELEM_ENABLED 0 define HAL_NMEA_OUTPUT_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 8e93a6e467..af32d0e7b7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -195,6 +195,6 @@ define HAL_GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 define PRECISION_LANDING 0 define HAL_BARO_WIND_COMP_ENABLED 0 -define GRIPPER_ENABLED 0 +define AP_GRIPPER_ENABLED 0 define AP_OPTICALFLOW_ENABLED 0 define AP_ICENGINE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745v2/hwdef.dat index 30aa3ae55c..c3776d5ea5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745v2/hwdef.dat @@ -146,7 +146,7 @@ define HAL_GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 define PRECISION_LANDING 0 define HAL_BARO_WIND_COMP_ENABLED 0 -define GRIPPER_ENABLED 0 +define AP_GRIPPER_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define AP_BATTMON_SMBUS_ENABLE 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat index 9eb2a739fd..8c68ea0a66 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat @@ -35,6 +35,6 @@ define HAL_GENERATOR_ENABLED 0 define AC_OAPATHPLANNER_ENABLED 0 define PRECISION_LANDING 0 define HAL_BARO_WIND_COMP_ENABLED 0 -define GRIPPER_ENABLED 0 +define AP_GRIPPER_ENABLED 0 define AP_OPTICALFLOW_ENABLED 0 define AP_ICENGINE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat index f98c1a53fb..51166300fe 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat @@ -73,7 +73,6 @@ define AP_AIRSPEED_ENABLED 0 define AP_OPTICALFLOW_ENABLED 0 define BEACON_ENABLED 0 define GPS_MOVING_BASELINE 0 -define GRIPPER_ENABLED 0 define HAL_ADSB_SAGETECH_ENABLED 0 define HAL_ADSB_UAVIONIX_MAVLINK_ENABLED 0 define AP_AIS_ENABLED 0 @@ -131,4 +130,7 @@ define AP_RANGEFINDER_MAVLINK_ENABLED 1 # SkyViper doesn't have RPM sensors: define AP_RPM_ENABLED 0 +# SkyViper doesn't have a gripper: +define AP_GRIPPER_ENABLED 0 + AUTOBUILD_TARGETS Copter