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

GCS_MAVLink: rename dataflash to logger

This commit is contained in:
Tom Pittenger 2019-02-11 00:34:50 -08:00 committed by Peter Barker
parent 0a95785ff0
commit 8845cc2053
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -1531,7 +1531,7 @@ GCS_MAVLINK::update_receive(uint32_t max_time_us)
} }
} }
// consider logging mavlink stats to dataflash: // consider logging mavlink stats:
if (is_active() || is_streaming()) { if (is_active() || is_streaming()) {
if (tnow - last_mavlink_stats_logged > 1000) { if (tnow - last_mavlink_stats_logged > 1000) {
log_mavlink_stats(); log_mavlink_stats();
@ -1623,7 +1623,7 @@ GCS_MAVLINK::update_receive(uint32_t max_time_us)
} }
/* /*
record stats about this link to dataflash record stats about this link to logger
*/ */
void GCS_MAVLINK::log_mavlink_stats() void GCS_MAVLINK::log_mavlink_stats()
{ {
@ -1894,9 +1894,9 @@ void GCS_MAVLINK::send_ahrs()
*/ */
void GCS::send_statustext(MAV_SEVERITY severity, uint8_t dest_bitmask, const char *text) void GCS::send_statustext(MAV_SEVERITY severity, uint8_t dest_bitmask, const char *text)
{ {
AP_Logger *dataflash = AP_Logger::get_singleton(); AP_Logger *logger = AP_Logger::get_singleton();
if (dataflash != nullptr) { if (logger != nullptr) {
dataflash->Write_Message(text); logger->Write_Message(text);
} }
// add statustext message to FrSky lib queue // add statustext message to FrSky lib queue
@ -2641,8 +2641,8 @@ void GCS_MAVLINK::handle_timesync(mavlink_message_t *msg)
msg->sysid, msg->sysid,
round_trip_time_us*0.001f); round_trip_time_us*0.001f);
#endif #endif
AP_Logger *df = AP_Logger::get_singleton(); AP_Logger *logger = AP_Logger::get_singleton();
if (df != nullptr) { if (logger != nullptr) {
AP::logger().Write( AP::logger().Write(
"TSYN", "TSYN",
"TimeUS,SysID,RTT", "TimeUS,SysID,RTT",
@ -2692,8 +2692,8 @@ void GCS_MAVLINK::send_timesync()
void GCS_MAVLINK::handle_statustext(mavlink_message_t *msg) void GCS_MAVLINK::handle_statustext(mavlink_message_t *msg)
{ {
AP_Logger *df = AP_Logger::get_singleton(); AP_Logger *logger = AP_Logger::get_singleton();
if (df == nullptr) { if (logger == nullptr) {
return; return;
} }
@ -2714,7 +2714,7 @@ void GCS_MAVLINK::handle_statustext(mavlink_message_t *msg)
memcpy(&text[offset], packet.text, MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN); memcpy(&text[offset], packet.text, MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN);
df->Write_Message(text); logger->Write_Message(text);
} }
@ -2787,7 +2787,6 @@ void GCS_MAVLINK::set_ekf_origin(const Location& loc)
return; return;
} }
// log ahrs home and ekf origin dataflash
ahrs.Log_Write_Home_And_Origin(); ahrs.Log_Write_Home_And_Origin();
// send ekf origin to GCS // send ekf origin to GCS

12
libraries/GCS_MAVLink/GCS_Param.cpp
View File

@ -292,9 +292,9 @@ void GCS_MAVLINK::handle_param_set(mavlink_message_t *msg)
// save the change // save the change
vp->save(force_save); vp->save(force_save);
AP_Logger *AP_Logger = AP_Logger::get_singleton(); AP_Logger *logger = AP_Logger::get_singleton();
if (AP_Logger != nullptr) { if (logger != nullptr) {
AP_Logger->Write_Parameter(key, vp->cast_to_float(var_type)); logger->Write_Parameter(key, vp->cast_to_float(var_type));
} }
} }
@ -319,9 +319,9 @@ void GCS::send_parameter_value(const char *param_name, ap_var_type param_type, f
} }
} }
// also log to AP_Logger // also log to AP_Logger
AP_Logger *dataflash = AP_Logger::get_singleton(); AP_Logger *logger = AP_Logger::get_singleton();
if (dataflash != nullptr) { if (logger != nullptr) {
dataflash->Write_Parameter(param_name, param_value); logger->Write_Parameter(param_name, param_value);
} }
} }