aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: use HAL_PROXIMITY_ENABLED in place of HAL_PERIPH_ENABLE_PRX

Browse Source 
boolean truth rather than defines, and simplifies code
This commit is contained in:
Peter Barker 2023-06-06 07:43:50 +10:00 committed by Peter Barker
parent 0ec35718d7
commit 5a33f870c0
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/AP_Periph/AP_Periph.cpp
View File

@ -223,7 +223,7 @@ void AP_Periph_FW::init()
} }
#endif #endif
#ifdef HAL_PERIPH_ENABLE_PRX #if HAL_PROXIMITY_ENABLED
if (proximity.get_type(0) != AP_Proximity::Type::None && g.proximity_port >= 0) { if (proximity.get_type(0) != AP_Proximity::Type::None && g.proximity_port >= 0) {
auto *uart = hal.serial(g.proximity_port); auto *uart = hal.serial(g.proximity_port);
if (uart != nullptr) { if (uart != nullptr) {

2
Tools/AP_Periph/AP_Periph.h
View File

@ -209,7 +209,7 @@ public:
uint32_t last_sample_ms; uint32_t last_sample_ms;
#endif #endif
#ifdef HAL_PERIPH_ENABLE_PRX #if HAL_PROXIMITY_ENABLED
AP_Proximity proximity; AP_Proximity proximity;
#endif #endif

4
Tools/AP_Periph/Parameters.cpp
View File

@ -475,7 +475,7 @@ const AP_Param::Info AP_Periph_FW::var_info[] = {
GOBJECT(efi, "EFI", AP_EFI), GOBJECT(efi, "EFI", AP_EFI),
#endif #endif
#ifdef HAL_PERIPH_ENABLE_PRX #if HAL_PROXIMITY_ENABLED
// @Param: PRX_BAUDRATE // @Param: PRX_BAUDRATE
// @DisplayName: Proximity Sensor serial baudrate // @DisplayName: Proximity Sensor serial baudrate
// @Description: Proximity Sensor serial baudrate. // @Description: Proximity Sensor serial baudrate.
@ -507,7 +507,7 @@ const AP_Param::Info AP_Periph_FW::var_info[] = {
// @Group: PRX // @Group: PRX
// @Path: ../libraries/AP_Proximity/AP_Proximity.cpp // @Path: ../libraries/AP_Proximity/AP_Proximity.cpp
GOBJECT(proximity, "PRX", AP_Proximity), GOBJECT(proximity, "PRX", AP_Proximity),
#endif #endif // HAL_PROXIMITY_ENABLED
#if HAL_NMEA_OUTPUT_ENABLED #if HAL_NMEA_OUTPUT_ENABLED
// @Group: NMEA_ // @Group: NMEA_

2
Tools/AP_Periph/Parameters.h
View File

@ -109,7 +109,7 @@ public:
AP_Int16 rangefinder_max_rate; AP_Int16 rangefinder_max_rate;
#endif #endif
#ifdef HAL_PERIPH_ENABLE_PRX #if HAL_PROXIMITY_ENABLED
AP_Int32 proximity_baud; AP_Int32 proximity_baud;
AP_Int8 proximity_port; AP_Int8 proximity_port;
AP_Int16 proximity_max_rate; AP_Int16 proximity_max_rate;

2
Tools/AP_Periph/can.cpp
View File

@ -2392,7 +2392,7 @@ void AP_Periph_FW::can_rangefinder_update(void)
void AP_Periph_FW::can_proximity_update() void AP_Periph_FW::can_proximity_update()
{ {
#ifdef HAL_PERIPH_ENABLE_PRX #if HAL_PROXIMITY_ENABLED
if (proximity.get_type(0) == AP_Proximity::Type::None) { if (proximity.get_type(0) == AP_Proximity::Type::None) {
return; return;
} }

1
Tools/ardupilotwaf/boards.py
View File

@ -833,6 +833,7 @@ class sitl_periph_gps(sitl):
AP_STATS_ENABLED = 0, AP_STATS_ENABLED = 0,
HAL_SUPPORT_RCOUT_SERIAL = 0, HAL_SUPPORT_RCOUT_SERIAL = 0,
AP_CAN_SLCAN_ENABLED = 0, AP_CAN_SLCAN_ENABLED = 0,
HAL_PROXIMITY_ENABLED = 0,
) )