AP_Proximity: reduce ignore areas to 4 per backend

This commit is contained in:
Randy Mackay 2022-07-05 16:38:28 +09:00 committed by Andrew Tridgell
parent 5fbaa4f136
commit b6d133e285
2 changed files with 1 additions and 33 deletions

View File

@ -92,38 +92,6 @@ const AP_Param::GroupInfo AP_Proximity_Params::var_info[] = {
// @User: Standard // @User: Standard
AP_GROUPINFO("_IGN_WID4", 11, AP_Proximity_Params, ignore_width_deg[3], 0), AP_GROUPINFO("_IGN_WID4", 11, AP_Proximity_Params, ignore_width_deg[3], 0),
// @Param: _IGN_ANG5
// @DisplayName: Proximity sensor ignore angle 5
// @Description: Proximity sensor ignore angle 5
// @Units: deg
// @Range: 0 360
// @User: Standard
AP_GROUPINFO("_IGN_ANG5", 12, AP_Proximity_Params, ignore_angle_deg[4], 0),
// @Param: _IGN_WID5
// @DisplayName: Proximity sensor ignore width 5
// @Description: Proximity sensor ignore width 5
// @Units: deg
// @Range: 0 127
// @User: Standard
AP_GROUPINFO("_IGN_WID5", 13, AP_Proximity_Params, ignore_width_deg[4], 0),
// @Param: _IGN_ANG6
// @DisplayName: Proximity sensor ignore angle 6
// @Description: Proximity sensor ignore angle 6
// @Units: deg
// @Range: 0 360
// @User: Standard
AP_GROUPINFO("_IGN_ANG6", 14, AP_Proximity_Params, ignore_angle_deg[5], 0),
// @Param: _IGN_WID6
// @DisplayName: Proximity sensor ignore width 6
// @Description: Proximity sensor ignore width 6
// @Units: deg
// @Range: 0 127
// @User: Standard
AP_GROUPINFO("_IGN_WID6", 15, AP_Proximity_Params, ignore_width_deg[5], 0),
// @Param: _MIN // @Param: _MIN
// @DisplayName: Proximity minimum range // @DisplayName: Proximity minimum range
// @Description: Minimum expected range for Proximity Sensor. Setting this to 0 will set value to manufacturer reported range. // @Description: Minimum expected range for Proximity Sensor. Setting this to 0 will set value to manufacturer reported range.

View File

@ -3,7 +3,7 @@
#include <AP_Param/AP_Param.h> #include <AP_Param/AP_Param.h>
#include <AP_Math/AP_Math.h> #include <AP_Math/AP_Math.h>
#define PROXIMITY_MAX_IGNORE 6 // up to six areas can be ignored #define PROXIMITY_MAX_IGNORE 4 // up to six areas can be ignored
class AP_Proximity_Params { class AP_Proximity_Params {