Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArduCopter: correct compilation with AP_RRSI_ENABLED false 

Co-authored-by: David Buzz <davidbuzz@gmail.com>
This commit is contained in:
Peter Barker 2024-07-23 20:51:07 +10:00 committed by Peter Barker
parent cc190f537f
commit 6dac230ccb
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/Copter.cpp
View File

@ -583,9 +583,11 @@ void Copter::ten_hz_logging_loop()
} }
if (should_log(MASK_LOG_RCIN)) { if (should_log(MASK_LOG_RCIN)) {
logger.Write_RCIN(); logger.Write_RCIN();
#if AP_RSSI_ENABLED
if (rssi.enabled()) { if (rssi.enabled()) {
logger.Write_RSSI(); logger.Write_RSSI();
} }
#endif
} }
if (should_log(MASK_LOG_RCOUT)) { if (should_log(MASK_LOG_RCOUT)) {
logger.Write_RCOUT(); logger.Write_RCOUT();

4
ArduCopter/Parameters.cpp
View File

@ -634,10 +634,12 @@ const AP_Param::Info Copter::var_info[] = {
GOBJECTN(mode_auto.mission, mission, "MIS_", AP_Mission), GOBJECTN(mode_auto.mission, mission, "MIS_", AP_Mission),
#endif #endif
#if AP_RSSI_ENABLED
// @Group: RSSI_ // @Group: RSSI_
// @Path: ../libraries/AP_RSSI/AP_RSSI.cpp // @Path: ../libraries/AP_RSSI/AP_RSSI.cpp
GOBJECT(rssi, "RSSI_", AP_RSSI), GOBJECT(rssi, "RSSI_", AP_RSSI),
#endif
#if AP_RANGEFINDER_ENABLED #if AP_RANGEFINDER_ENABLED
// @Group: RNGFND // @Group: RNGFND
// @Path: ../libraries/AP_RangeFinder/AP_RangeFinder.cpp // @Path: ../libraries/AP_RangeFinder/AP_RangeFinder.cpp

4
ArduCopter/system.cpp
View File

@ -27,9 +27,11 @@ void Copter::init_ardupilot()
// initialise battery monitor // initialise battery monitor
battery.init(); battery.init();
#if AP_RSSI_ENABLED
// Init RSSI // Init RSSI
rssi.init(); rssi.init();
#endif
barometer.init(); barometer.init();
// setup telem slots with serial ports // setup telem slots with serial ports