Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-05 23:43:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: create persist_streamrates() callback to indicate persistence

Browse Source 
Removes the catching of the message in each vehicle separately.
This commit is contained in:
Peter Barker 2018-05-21 22:34:22 +10:00 committed by Andrew Tridgell
parent 879f250fac
commit d8871078ff
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/GCS_MAVLink/GCS.h
View File

@ -278,7 +278,8 @@ protected:
// saveable rate of each stream // saveable rate of each stream
AP_Int16 streamRates[NUM_STREAMS]; AP_Int16 streamRates[NUM_STREAMS];
void handle_request_data_stream(mavlink_message_t *msg, bool save); virtual bool persist_streamrates() const { return false; }
void handle_request_data_stream(mavlink_message_t *msg);
virtual void handle_command_ack(const mavlink_message_t* msg); virtual void handle_command_ack(const mavlink_message_t* msg);
void handle_set_mode(mavlink_message_t* msg); void handle_set_mode(mavlink_message_t* msg);

4
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -2349,6 +2349,10 @@ void GCS_MAVLINK::handle_common_message(mavlink_message_t *msg)
handle_common_rally_message(msg); handle_common_rally_message(msg);
break; break;
case MAVLINK_MSG_ID_REQUEST_DATA_STREAM:
handle_request_data_stream(msg);
break;
case MAVLINK_MSG_ID_DATA96: case MAVLINK_MSG_ID_DATA96:
handle_data_packet(msg); handle_data_packet(msg);
break; break;

6
libraries/GCS_MAVLink/GCS_Param.cpp
View File

@ -124,7 +124,7 @@ bool GCS_MAVLINK::have_flow_control(void)
save==false so we don't want the save to happen when the user connects the save==false so we don't want the save to happen when the user connects the
ground station. ground station.
*/ */
void GCS_MAVLINK::handle_request_data_stream(mavlink_message_t *msg, bool save) void GCS_MAVLINK::handle_request_data_stream(mavlink_message_t *msg)
{ {
mavlink_request_data_stream_t packet; mavlink_request_data_stream_t packet;
mavlink_msg_request_data_stream_decode(msg, &packet); mavlink_msg_request_data_stream_decode(msg, &packet);
@ -143,7 +143,7 @@ void GCS_MAVLINK::handle_request_data_stream(mavlink_message_t *msg, bool save)
case MAV_DATA_STREAM_ALL: case MAV_DATA_STREAM_ALL:
// note that we don't set STREAM_PARAMS - that is internal only // note that we don't set STREAM_PARAMS - that is internal only
for (uint8_t i=0; i<STREAM_PARAMS; i++) { for (uint8_t i=0; i<STREAM_PARAMS; i++) {
if (save) { if (persist_streamrates()) {
streamRates[i].set_and_save_ifchanged(freq); streamRates[i].set_and_save_ifchanged(freq);
} else { } else {
streamRates[i].set(freq); streamRates[i].set(freq);
@ -177,7 +177,7 @@ void GCS_MAVLINK::handle_request_data_stream(mavlink_message_t *msg, bool save)
} }
if (rate != nullptr) { if (rate != nullptr) {
if (save) { if (persist_streamrates()) {
rate->set_and_save_ifchanged(freq); rate->set_and_save_ifchanged(freq);
} else { } else {
rate->set(freq); rate->set(freq);