fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-02 05:04:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

respected reviewer comments

Browse Source
This commit is contained in:
David Jablonski 2020-03-28 09:30:44 +01:00 committed by Julian Oes
parent 12687f7d8f
commit d303b73bc3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/mavlink/mavlink_messages.cpp
View File

@ -399,9 +399,9 @@ private:
MavlinkStreamStatustext &operator = (const MavlinkStreamStatustext &) = delete;
protected:
int id;
int _id{0};
explicit MavlinkStreamStatustext(Mavlink *mavlink) : MavlinkStream(mavlink), id(0)
explicit MavlinkStreamStatustext(Mavlink *mavlink) : MavlinkStream(mavlink)
{}
bool send(const hrt_abstime t) override
@ -417,16 +417,16 @@ protected:
constexpr unsigned max_chunk_size = sizeof(msg.text);
msg.severity = mavlink_log.severity;
msg.chunk_seq = 0;
msg.id = id++;
msg.id = _id++;
unsigned text_size;
while ((text_size = strlen(text)) > 0) {
unsigned chunk_size = math::min(text_size, max_chunk_size);
if (chunk_size < max_chunk_size) {
memcpy(&msg.text[0], &text[0], chunk_size + 1);
memcpy(&msg.text[0], &text[0], chunk_size);
// pad with zeros
memset(&msg.text + chunk_size, 0, max_chunk_size - chunk_size);
memset(&msg.text[0] + chunk_size, 0, max_chunk_size - chunk_size);
} else {
memcpy(&msg.text[0], &text[0], chunk_size);