aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Logger: Write_VER keep g++ 7.5 happy by removeing non-trivial designated initializers

Browse Source
This commit is contained in:
Iampete1 2024-03-28 14:59:31 +00:00 committed by Andrew Tridgell
parent afe257a8db
commit b08034373f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_Logger/AP_Logger_Backend.cpp
View File

@ -575,7 +575,6 @@ bool AP_Logger_Backend::Write_VER()
patch: fwver.patch, patch: fwver.patch,
fw_type: fwver.fw_type, fw_type: fwver.fw_type,
git_hash: fwver.fw_hash, git_hash: fwver.fw_hash,
filter_version: AP_FILTER_VERSION,
}; };
strncpy(pkt.fw_string, fwver.fw_string, ARRAY_SIZE(pkt.fw_string)-1); strncpy(pkt.fw_string, fwver.fw_string, ARRAY_SIZE(pkt.fw_string)-1);
@ -583,6 +582,8 @@ bool AP_Logger_Backend::Write_VER()
pkt._APJ_BOARD_ID = APJ_BOARD_ID; pkt._APJ_BOARD_ID = APJ_BOARD_ID;
#endif #endif
pkt.build_type = fwver.vehicle_type; pkt.build_type = fwver.vehicle_type;
pkt.filter_version = AP_FILTER_VERSION;
return WriteCriticalBlock(&pkt, sizeof(pkt)); return WriteCriticalBlock(&pkt, sizeof(pkt));
} }