Browse Source

Plane: update for AP_TECS API change

master
Andrew Tridgell 9 years ago
parent
commit
574ba71ef3
  1. 3
      ArduPlane/ArduPlane.cpp
  2. 8
      ArduPlane/Log.cpp
  3. 1
      ArduPlane/Plane.h
  4. 1
      ArduPlane/defines.h

3
ArduPlane/ArduPlane.cpp

@ -914,9 +914,6 @@ void Plane::update_alt()
throttle_nudge, throttle_nudge,
tecs_hgt_afe(), tecs_hgt_afe(),
aerodynamic_load_factor); aerodynamic_load_factor);
if (should_log(MASK_LOG_TECS)) {
Log_Write_TECS_Tuning();
}
} }
} }

8
ArduPlane/Log.cpp

@ -272,12 +272,6 @@ void Plane::Log_Write_Control_Tuning()
DataFlash.WriteBlock(&pkt, sizeof(pkt)); DataFlash.WriteBlock(&pkt, sizeof(pkt));
} }
// Write a TECS tuning packet
void Plane::Log_Write_TECS_Tuning(void)
{
SpdHgt_Controller->log_data(DataFlash, LOG_TECS_MSG);
}
struct PACKED log_Nav_Tuning { struct PACKED log_Nav_Tuning {
LOG_PACKET_HEADER; LOG_PACKET_HEADER;
uint64_t time_us; uint64_t time_us;
@ -513,7 +507,6 @@ const struct LogStructure Plane::log_structure[] = {
{ LOG_OPTFLOW_MSG, sizeof(log_Optflow), { LOG_OPTFLOW_MSG, sizeof(log_Optflow),
"OF", "QBffff", "TimeUS,Qual,flowX,flowY,bodyX,bodyY" }, "OF", "QBffff", "TimeUS,Qual,flowX,flowY,bodyX,bodyY" },
#endif #endif
TECS_LOG_FORMAT(LOG_TECS_MSG)
}; };
#if CLI_ENABLED == ENABLED #if CLI_ENABLED == ENABLED
@ -586,7 +579,6 @@ void Plane::Log_Write_Attitude(void) {}
void Plane::Log_Write_Performance() {} void Plane::Log_Write_Performance() {}
void Plane::Log_Write_Startup(uint8_t type) {} void Plane::Log_Write_Startup(uint8_t type) {}
void Plane::Log_Write_Control_Tuning() {} void Plane::Log_Write_Control_Tuning() {}
void Plane::Log_Write_TECS_Tuning(void) {}
void Plane::Log_Write_Nav_Tuning() {} void Plane::Log_Write_Nav_Tuning() {}
void Plane::Log_Write_Status() {} void Plane::Log_Write_Status() {}
void Plane::Log_Write_Sonar() {} void Plane::Log_Write_Sonar() {}

1
ArduPlane/Plane.h

@ -787,7 +787,6 @@ private:
void Log_Write_Performance(); void Log_Write_Performance();
void Log_Write_Startup(uint8_t type); void Log_Write_Startup(uint8_t type);
void Log_Write_Control_Tuning(); void Log_Write_Control_Tuning();
void Log_Write_TECS_Tuning(void);
void Log_Write_Nav_Tuning(); void Log_Write_Nav_Tuning();
void Log_Write_Status(); void Log_Write_Status();
void Log_Write_Sonar(); void Log_Write_Sonar();

1
ArduPlane/defines.h

@ -112,7 +112,6 @@ enum log_messages {
LOG_STARTUP_MSG, LOG_STARTUP_MSG,
TYPE_AIRSTART_MSG, TYPE_AIRSTART_MSG,
TYPE_GROUNDSTART_MSG, TYPE_GROUNDSTART_MSG,
LOG_TECS_MSG,
LOG_RC_MSG, LOG_RC_MSG,
LOG_SONAR_MSG, LOG_SONAR_MSG,
LOG_ARM_DISARM_MSG, LOG_ARM_DISARM_MSG,

Loading…
Cancel
Save