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

GCS_MAVLink: Don't retain a FrSky instance if we aren't using it 

Saves 96 bytes of RAM
This commit is contained in:
Michael du Breuil 2019-06-18 00:32:48 -07:00 committed by Andrew Tridgell
parent 59e62ca2fc
commit f955a4e4d5
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/GCS_MAVLink/GCS.h
View File

@ -976,7 +976,7 @@ public:
bool out_of_time() const;
// frsky backend
AP_Frsky_Telem frsky;
AP_Frsky_Telem *frsky;
// Devo backend
AP_DEVO_Telem devo_telemetry;

13
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -2134,8 +2134,9 @@ void GCS::send_statustext(MAV_SEVERITY severity, uint8_t dest_bitmask, const cha
logger->Write_Message(text);
}
// add statustext message to FrSky lib queue
frsky.queue_message(severity, text);
if (frsky != nullptr) {
frsky->queue_message(severity, text);
}
AP_Notify *notify = AP_Notify::get_singleton();
if (notify) {
@ -2277,7 +2278,13 @@ void GCS::setup_uarts()
chan(i).setup_uart(i);
}
frsky.init();
if (frsky == nullptr) {
frsky = new AP_Frsky_Telem();
if (frsky == nullptr || !frsky->init()) {
delete frsky;
frsky = nullptr;
}
}
devo_telemetry.init();
}