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

Copter: added board voltage to current message

Browse Source
This commit is contained in:
Andrew Tridgell 2013-04-20 10:28:59 +10:00
parent 735d60c493
commit 93d075404c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduCopter/Log.pde
View File

@ -166,7 +166,8 @@ struct PACKED log_Current {
uint32_t throttle_integrator;
int16_t battery_voltage;
int16_t current_amps;
int16_t current_total;
uint16_t board_voltage;
float current_total;
};
// Write an Current data packet. Total length : 16 bytes
@ -178,7 +179,8 @@ static void Log_Write_Current()
throttle_integrator : throttle_integrator,
battery_voltage : (int16_t) (battery_voltage1 * 100.0f),
current_amps : (int16_t) (current_amps1 * 100.0f),
current_total : (int16_t) current_total1
board_voltage : board_voltage(),
current_total : current_total1
};
DataFlash.WriteBlock(&pkt, sizeof(pkt));
}
@ -761,7 +763,7 @@ static void Log_Write_WPNAV()
static const struct LogStructure log_structure[] PROGMEM = {
LOG_COMMON_STRUCTURES,
{ LOG_CURRENT_MSG, sizeof(log_Current),
"CURR", "hIhhh", "Thr,ThrInt,Volt,Curr,CurrTot" },
"CURR", "hIhhhf", "Thr,ThrInt,Volt,Curr,Vcc,CurrTot" },
#if FRAME_CONFIG == OCTA_FRAME || FRAME_CONFIG == OCTA_QUAD_FRAME
{ LOG_MOTORS_MSG, sizeof(log_Motors),