Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACM : Logging.pde formatting

This commit is contained in:
Jason Short 2012-11-11 18:06:50 -08:00
parent ee9ac7ab2c
commit add51f110d
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ArduCopter/Log.pde
View File

@ -251,16 +251,16 @@ static void Log_Write_GPS()
DataFlash.WriteByte(HEAD_BYTE2); DataFlash.WriteByte(HEAD_BYTE2);
DataFlash.WriteByte(LOG_GPS_MSG); DataFlash.WriteByte(LOG_GPS_MSG);
DataFlash.WriteLong(g_gps->time); // 1 DataFlash.WriteLong(g_gps->time); // 1
DataFlash.WriteByte(g_gps->num_sats); // 2 DataFlash.WriteByte(g_gps->num_sats); // 2
DataFlash.WriteLong(current_loc.lat); // 3 DataFlash.WriteLong(current_loc.lat); // 3
DataFlash.WriteLong(current_loc.lng); // 4 DataFlash.WriteLong(current_loc.lng); // 4
DataFlash.WriteLong(current_loc.alt); // 5 DataFlash.WriteLong(current_loc.alt); // 5
DataFlash.WriteLong(g_gps->altitude); // 6 DataFlash.WriteLong(g_gps->altitude); // 6
DataFlash.WriteInt(g_gps->ground_speed); // 7 DataFlash.WriteInt(g_gps->ground_speed); // 7
DataFlash.WriteLong(g_gps->ground_course); // 8 DataFlash.WriteLong(g_gps->ground_course); // 8
DataFlash.WriteByte(END_BYTE); DataFlash.WriteByte(END_BYTE);
} }
@ -268,27 +268,27 @@ static void Log_Write_GPS()
// Read a GPS packet // Read a GPS packet
static void Log_Read_GPS() static void Log_Read_GPS()
{ {
int32_t temp1 = DataFlash.ReadLong(); // 1 time int32_t temp1 = DataFlash.ReadLong(); // 1 time
int8_t temp2 = DataFlash.ReadByte(); // 2 sats int8_t temp2 = DataFlash.ReadByte(); // 2 sats
int32_t temp3 = DataFlash.ReadLong(); // 3 lat int32_t temp3 = DataFlash.ReadLong(); // 3 lat
int32_t temp4 = DataFlash.ReadLong(); // 4 lon int32_t temp4 = DataFlash.ReadLong(); // 4 lon
float temp5 = DataFlash.ReadLong() / 100.0; // 5 sensor alt float temp5 = DataFlash.ReadLong() / 100.0; // 5 sensor alt
float temp6 = DataFlash.ReadLong() / 100.0; // 6 gps alt float temp6 = DataFlash.ReadLong() / 100.0; // 6 gps alt
int16_t temp7 = DataFlash.ReadInt(); // 7 ground speed int16_t temp7 = DataFlash.ReadInt(); // 7 ground speed
int32_t temp8 = DataFlash.ReadLong(); // 8 ground course int32_t temp8 = DataFlash.ReadLong(); // 8 ground course
// 1 2 3 4 5 6 7 8 // 1 2 3 4 5 6 7 8
Serial.printf_P(PSTR("GPS, %ld, %d, "), Serial.printf_P(PSTR("GPS, %ld, %d, "),
(long)temp1, // 1 time (long)temp1, // 1 time
(int)temp2); // 2 sats (int)temp2); // 2 sats
print_latlon(&Serial, temp3); print_latlon(&Serial, temp3);
Serial.print_P(PSTR(", ")); Serial.print_P(PSTR(", "));
print_latlon(&Serial, temp4); print_latlon(&Serial, temp4);
Serial.printf_P(PSTR(", %4.4f, %4.4f, %d, %ld\n"), Serial.printf_P(PSTR(", %4.4f, %4.4f, %d, %ld\n"),
temp5, // 5 gps alt temp5, // 5 gps alt
temp6, // 6 sensor alt temp6, // 6 sensor alt
(int)temp7, // 7 ground speed (int)temp7, // 7 ground speed
(long)temp8); // 8 ground course (long)temp8); // 8 ground course
} }
static void Log_Write_Raw() static void Log_Write_Raw()
@ -606,6 +606,8 @@ static void Log_Write_Control_Tuning()
DataFlash.WriteInt(angle_boost); // 6 DataFlash.WriteInt(angle_boost); // 6
DataFlash.WriteInt(climb_rate_actual); // 7 DataFlash.WriteInt(climb_rate_actual); // 7
DataFlash.WriteInt(g.rc_3.servo_out); // 8 DataFlash.WriteInt(g.rc_3.servo_out); // 8
DataFlash.WriteInt(desired_climb_rate); // 9
DataFlash.WriteByte(END_BYTE); DataFlash.WriteByte(END_BYTE);
} }
@ -617,11 +619,11 @@ static void Log_Read_Control_Tuning()
Serial.printf_P(PSTR("CTUN, ")); Serial.printf_P(PSTR("CTUN, "));
for(uint8_t i = 1; i < 8; i++ ) { for(uint8_t i = 1; i < 9; i++ ) {
temp = DataFlash.ReadInt(); temp = DataFlash.ReadInt();
Serial.printf_P(PSTR("%d, "), (int)temp); Serial.printf_P(PSTR("%d, "), (int)temp);
} }
// read 8 // read 9
temp = DataFlash.ReadInt(); temp = DataFlash.ReadInt();
Serial.printf_P(PSTR("%d\n"), (int)temp); Serial.printf_P(PSTR("%d\n"), (int)temp);
} }