Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-10 18:08:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: fixed build errors in logging

Browse Source
This commit is contained in:
Andrew Tridgell 2013-01-27 12:58:50 +11:00
parent 90e264d56a
commit 3caaa27526
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduPlane/ArduPlane.pde
View File

@ -588,7 +588,7 @@ static int32_t perf_mon_timer;
// The maximum main loop execution time recorded in the current performance monitoring interval // The maximum main loop execution time recorded in the current performance monitoring interval
static int16_t G_Dt_max = 0; static int16_t G_Dt_max = 0;
// The number of gps fixes recorded in the current performance monitoring interval // The number of gps fixes recorded in the current performance monitoring interval
static int16_t gps_fix_count = 0; static uint8_t gps_fix_count = 0;
// A variable used by developers to track performanc metrics. // A variable used by developers to track performanc metrics.
// Currently used to record the number of GCS heartbeat messages received // Currently used to record the number of GCS heartbeat messages received
static int16_t pmTest1 = 0; static int16_t pmTest1 = 0;

6
ArduPlane/Log.pde
View File

@ -407,7 +407,7 @@ static void Log_Write_Control_Tuning()
pitch : (int16_t)ahrs.pitch_sensor, pitch : (int16_t)ahrs.pitch_sensor,
throttle_out : (int16_t)g.channel_throttle.servo_out, throttle_out : (int16_t)g.channel_throttle.servo_out,
rudder_out : (int16_t)g.channel_rudder.servo_out, rudder_out : (int16_t)g.channel_rudder.servo_out,
accel_y : (int16_t)accel.y * 10000 accel_y : (int16_t)(accel.y * 10000)
}; };
DataFlash.WriteBlock(&pkt, sizeof(pkt)); DataFlash.WriteBlock(&pkt, sizeof(pkt));
} }
@ -586,8 +586,8 @@ static void Log_Write_Current()
struct log_Current pkt = { struct log_Current pkt = {
LOG_PACKET_HEADER_INIT(LOG_CURRENT_MSG), LOG_PACKET_HEADER_INIT(LOG_CURRENT_MSG),
throttle_in : g.channel_throttle.control_in, throttle_in : g.channel_throttle.control_in,
battery_voltage : (int16_t)battery_voltage1 * 100.0, battery_voltage : (int16_t)(battery_voltage1 * 100.0),
current_amps : (int16_t)current_amps1 * 100.0, current_amps : (int16_t)(current_amps1 * 100.0),
current_total : (int16_t)current_total1 current_total : (int16_t)current_total1
}; };
DataFlash.WriteBlock(&pkt, sizeof(pkt)); DataFlash.WriteBlock(&pkt, sizeof(pkt));