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

PM restored to normal output

Browse Source
This commit is contained in:
Jason Short 2011-11-17 10:37:01 -08:00
parent 8d6701f072
commit 366806359d
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ArduCopter/Log.pde
View File

@ -738,15 +738,14 @@ static void Log_Write_Performance()
//DataFlash.WriteByte( loop_step); //DataFlash.WriteByte( loop_step);
//*
//DataFlash.WriteLong( millis()- perf_mon_timer);
//DataFlash.WriteByte( dcm.gyro_sat_count); //2
//DataFlash.WriteByte( imu.adc_constraints); //3
//DataFlash.WriteByte( dcm.renorm_sqrt_count); //4
//DataFlash.WriteByte( dcm.renorm_blowup_count); //5
//DataFlash.WriteByte( gps_fix_count); //6
DataFlash.WriteLong( millis()- perf_mon_timer); //1
DataFlash.WriteByte( dcm.gyro_sat_count); //2
DataFlash.WriteByte( imu.adc_constraints); //3
DataFlash.WriteByte( dcm.renorm_sqrt_count); //4
DataFlash.WriteByte( dcm.renorm_blowup_count); //5
DataFlash.WriteByte( gps_fix_count); //6
DataFlash.WriteByte(END_BYTE);
//DataFlash.WriteInt ( (int)(dcm.get_health() * 1000)); //7 //DataFlash.WriteInt ( (int)(dcm.get_health() * 1000)); //7
@ -754,6 +753,7 @@ static void Log_Write_Performance()
// control_mode // control_mode
/*
DataFlash.WriteByte(control_mode); //1 DataFlash.WriteByte(control_mode); //1
DataFlash.WriteByte(yaw_mode); //2 DataFlash.WriteByte(yaw_mode); //2
DataFlash.WriteByte(roll_pitch_mode); //3 DataFlash.WriteByte(roll_pitch_mode); //3
@ -761,20 +761,22 @@ static void Log_Write_Performance()
DataFlash.WriteInt(g.throttle_cruise.get()); //5 DataFlash.WriteInt(g.throttle_cruise.get()); //5
DataFlash.WriteLong(throttle_integrator); //6 DataFlash.WriteLong(throttle_integrator); //6
DataFlash.WriteByte(END_BYTE); DataFlash.WriteByte(END_BYTE);
*/
} }
// Read a performance packet // Read a performance packet
static void Log_Read_Performance() static void Log_Read_Performance()
{ {
int8_t temp1 = DataFlash.ReadByte(); int32_t temp1 = DataFlash.ReadLong();
int8_t temp2 = DataFlash.ReadByte(); int8_t temp2 = DataFlash.ReadByte();
int8_t temp3 = DataFlash.ReadByte(); int8_t temp3 = DataFlash.ReadByte();
int8_t temp4 = DataFlash.ReadByte(); int8_t temp4 = DataFlash.ReadByte();
int16_t temp5 = DataFlash.ReadInt(); int8_t temp5 = DataFlash.ReadByte();
int32_t temp6 = DataFlash.ReadLong(); int8_t temp6 = DataFlash.ReadByte();
//1 2 3 4 5 6 //1 2 3 4 5 6
Serial.printf_P(PSTR("PM, %d, %d, %d, %d, %d, %ld\n"), Serial.printf_P(PSTR("PM, %ld, %d, %d, %d, %d, %d\n"),
temp1, temp1,
temp2, temp2,
temp3, temp3,