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

Copter: CMD dataflash logs use uint16 for total and num

Browse Source
This commit is contained in:
Randy Mackay 2014-03-10 17:18:38 +09:00
parent af186fba05
commit 0fc36fd244
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduCopter/Log.pde
View File

@ -424,8 +424,8 @@ static void Log_Write_Performance()
struct PACKED log_Cmd { struct PACKED log_Cmd {
LOG_PACKET_HEADER; LOG_PACKET_HEADER;
uint8_t command_total; uint16_t command_total;
uint8_t command_number; uint16_t command_number;
uint8_t waypoint_id; uint8_t waypoint_id;
uint8_t waypoint_options; uint8_t waypoint_options;
uint8_t waypoint_param1; uint8_t waypoint_param1;
@ -439,7 +439,7 @@ static void Log_Write_Cmd(const AP_Mission::Mission_Command& cmd)
{ {
struct log_Cmd pkt = { struct log_Cmd pkt = {
LOG_PACKET_HEADER_INIT(LOG_CMD_MSG), LOG_PACKET_HEADER_INIT(LOG_CMD_MSG),
command_total : (uint8_t)mission.num_commands(), command_total : mission.num_commands(),
command_number : cmd.index, command_number : cmd.index,
waypoint_id : cmd.id, waypoint_id : cmd.id,
waypoint_options : cmd.content.location.options, waypoint_options : cmd.content.location.options,
@ -706,7 +706,7 @@ static const struct LogStructure log_structure[] PROGMEM = {
{ LOG_PERFORMANCE_MSG, sizeof(log_Performance), { LOG_PERFORMANCE_MSG, sizeof(log_Performance),
"PM", "HHIhBHB", "NLon,NLoop,MaxT,PMT,I2CErr,INSErr,INAVErr" }, "PM", "HHIhBHB", "NLon,NLoop,MaxT,PMT,I2CErr,INSErr,INAVErr" },
{ LOG_CMD_MSG, sizeof(log_Cmd), { LOG_CMD_MSG, sizeof(log_Cmd),
"CMD", "BBBBBeLL", "CTot,CNum,CId,COpt,Prm1,Alt,Lat,Lng" }, "CMD", "HHBBBeLL", "CTot,CNum,CId,COpt,Prm1,Alt,Lat,Lng" },
{ LOG_ATTITUDE_MSG, sizeof(log_Attitude), { LOG_ATTITUDE_MSG, sizeof(log_Attitude),
"ATT", "IccccCC", "TimeMS,DesRoll,Roll,DesPitch,Pitch,DesYaw,Yaw" }, "ATT", "IccccCC", "TimeMS,DesRoll,Roll,DesPitch,Pitch,DesYaw,Yaw" },
{ LOG_MODE_MSG, sizeof(log_Mode), { LOG_MODE_MSG, sizeof(log_Mode),