Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Blimp: remove motbatt logging

Browse Source
This commit is contained in:
Iampete1 2021-12-21 20:42:00 +00:00 committed by Andrew Tridgell
parent c1c329e2b4
commit c241bf6479
4 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Blimp/Blimp.cpp
View File

@ -182,9 +182,6 @@ void Blimp::ten_hz_logging_loop()
if (should_log(MASK_LOG_ATTITUDE_MED) || should_log(MASK_LOG_ATTITUDE_FAST)) { if (should_log(MASK_LOG_ATTITUDE_MED) || should_log(MASK_LOG_ATTITUDE_FAST)) {
Log_Write_EKF_POS(); Log_Write_EKF_POS();
} }
if (should_log(MASK_LOG_MOTBATT)) {
Log_Write_MotBatt();
}
if (should_log(MASK_LOG_RCIN)) { if (should_log(MASK_LOG_RCIN)) {
logger.Write_RCIN(); logger.Write_RCIN();
if (rssi.enabled()) { if (rssi.enabled()) {

1
Blimp/Blimp.h
View File

@ -361,7 +361,6 @@ private:
void Log_Write_Attitude(); void Log_Write_Attitude();
void Log_Write_PIDs(); void Log_Write_PIDs();
void Log_Write_EKF_POS(); void Log_Write_EKF_POS();
void Log_Write_MotBatt();
void Log_Write_Data(LogDataID id, int32_t value); void Log_Write_Data(LogDataID id, int32_t value);
void Log_Write_Data(LogDataID id, uint32_t value); void Log_Write_Data(LogDataID id, uint32_t value);
void Log_Write_Data(LogDataID id, int16_t value); void Log_Write_Data(LogDataID id, int16_t value);

28
Blimp/Log.cpp
View File

@ -106,21 +106,6 @@ void Blimp::Log_Write_EKF_POS()
ahrs.Write_POS(); ahrs.Write_POS();
} }
struct PACKED log_MotBatt {
LOG_PACKET_HEADER;
uint64_t time_us;
float lift_max;
float bat_volt;
float bat_res;
float th_limit;
};
// Write an rate packet
void Blimp::Log_Write_MotBatt()
{
}
struct PACKED log_Data_Int16t { struct PACKED log_Data_Int16t {
LOG_PACKET_HEADER; LOG_PACKET_HEADER;
uint64_t time_us; uint64_t time_us;
@ -458,18 +443,6 @@ const struct LogStructure Blimp::log_structure[] = {
"CTUN", "Qffffffefffhh", "TimeUS,ThI,ABst,ThO,ThH,DAlt,Alt,BAlt,DSAlt,SAlt,TAlt,DCRt,CRt", "s----mmmmmmnn", "F----00B000BB" "CTUN", "Qffffffefffhh", "TimeUS,ThI,ABst,ThO,ThH,DAlt,Alt,BAlt,DSAlt,SAlt,TAlt,DCRt,CRt", "s----mmmmmmnn", "F----00B000BB"
}, },
// @LoggerMessage: MOTB
// @Description: Battery information
// @Field: TimeUS: Time since system startup
// @Field: LiftMax: Maximum motor compensation gain
// @Field: BatVolt: Ratio betwen detected battery voltage and maximum battery voltage
// @Field: BatRes: Estimated battery resistance
// @Field: ThLimit: Throttle limit set due to battery current limitations
{
LOG_MOTBATT_MSG, sizeof(log_MotBatt),
"MOTB", "Qffff", "TimeUS,LiftMax,BatVolt,BatRes,ThLimit", "s-vw-", "F-00-"
},
{ {
LOG_DATA_INT16_MSG, sizeof(log_Data_Int16t), LOG_DATA_INT16_MSG, sizeof(log_Data_Int16t),
"D16", "QBh", "TimeUS,Id,Value", "s--", "F--" "D16", "QBh", "TimeUS,Id,Value", "s--", "F--"
@ -547,7 +520,6 @@ void Blimp::Log_Write_Performance() {}
void Blimp::Log_Write_Attitude(void) {} void Blimp::Log_Write_Attitude(void) {}
void Blimp::Log_Write_PIDs(void) {} void Blimp::Log_Write_PIDs(void) {}
void Blimp::Log_Write_EKF_POS() {} void Blimp::Log_Write_EKF_POS() {}
void Blimp::Log_Write_MotBatt() {}
void Blimp::Log_Write_Data(LogDataID id, int32_t value) {} void Blimp::Log_Write_Data(LogDataID id, int32_t value) {}
void Blimp::Log_Write_Data(LogDataID id, uint32_t value) {} void Blimp::Log_Write_Data(LogDataID id, uint32_t value) {}
void Blimp::Log_Write_Data(LogDataID id, int16_t value) {} void Blimp::Log_Write_Data(LogDataID id, int16_t value) {}

1
Blimp/defines.h
View File

@ -132,7 +132,6 @@ enum LoggingParameters {
LOG_DATA_INT32_MSG, LOG_DATA_INT32_MSG,
LOG_DATA_UINT32_MSG, LOG_DATA_UINT32_MSG,
LOG_DATA_FLOAT_MSG, LOG_DATA_FLOAT_MSG,
LOG_MOTBATT_MSG,
LOG_PARAMTUNE_MSG, LOG_PARAMTUNE_MSG,
LOG_HELI_MSG, LOG_HELI_MSG,
LOG_GUIDEDTARGET_MSG, LOG_GUIDEDTARGET_MSG,