Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 01:33:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_GPS: Fix max/min bug on SBP buffering. Log messages whether SBP driver recognizes the msg_type or not.

Browse Source
This commit is contained in:
dzollo 2015-07-02 10:32:19 -07:00 committed by Andrew Tridgell
parent efec7723ff
commit 5d5d9dc137
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_GPS/AP_GPS_SBP.cpp
View File

@ -229,8 +229,9 @@ AP_GPS_SBP::_sbp_process_message() {
}
default:
// Break out of any logging if it's an unsupported message
return;
// log anyway if it's an unsupported message.
// The log mask will be used to adjust or suppress logging
break;
}
logging_log_raw_sbp(parser_state.msg_type, parser_state.sender_id, parser_state.msg_len, parser_state.msg_buff);
@ -501,7 +502,7 @@ AP_GPS_SBP::logging_log_raw_sbp(uint16_t msg_type,
sender_id : sender_id,
msg_len : msg_len,
};
memcpy(pkt.data1, msg_buff, max(msg_len,64));
memcpy(pkt.data1, msg_buff, min(msg_len,64));
gps._DataFlash->WriteBlock(&pkt, sizeof(pkt));
if (msg_len > 64) {