zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_Logger: ESC logging includes motor temperature

zr-v5.1
Randy Mackay 5 years ago committed by Andrew Tridgell
parent
ecb60955ff
commit
94d641d3d5
3 changed files with 11 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libraries/AP_Logger/AP_Logger.h
  2. 7
      libraries/AP_Logger/LogFile.cpp
  3. 11
      libraries/AP_Logger/LogStructure.h

2
libraries/AP_Logger/AP_Logger.h
Unescape View File

@ -257,7 +257,7 @@ public:
void Write_CameraInfo(enum LogMessages msg, const Location &current_loc, uint64_t timestamp_us=0); void Write_CameraInfo(enum LogMessages msg, const Location &current_loc, uint64_t timestamp_us=0);
void Write_Camera(const Location &current_loc, uint64_t timestamp_us=0); void Write_Camera(const Location &current_loc, uint64_t timestamp_us=0);
void Write_Trigger(const Location &current_loc); void Write_Trigger(const Location &current_loc);
void Write_ESC(uint8_t id, uint64_t time_us, int32_t rpm, uint16_t voltage, uint16_t current, int16_t temperature, uint16_t current_tot); void Write_ESC(uint8_t id, uint64_t time_us, int32_t rpm, uint16_t voltage, uint16_t current, int16_t esc_temp, uint16_t current_tot, int16_t motor_temp);
void Write_Attitude(const Vector3f &targets); void Write_Attitude(const Vector3f &targets);
void Write_AttitudeView(AP_AHRS_View &ahrs, const Vector3f &targets); void Write_AttitudeView(AP_AHRS_View &ahrs, const Vector3f &targets);
void Write_Current(); void Write_Current();

7
libraries/AP_Logger/LogFile.cpp
Unescape View File

@ -780,7 +780,7 @@ bool AP_Logger_Backend::Write_Mode(uint8_t mode, const ModeReason reason)
// current is in centi-amps // current is in centi-amps
// temperature is in centi-degrees Celsius // temperature is in centi-degrees Celsius
// current_tot is in centi-amp hours // current_tot is in centi-amp hours
void AP_Logger::Write_ESC(uint8_t id, uint64_t time_us, int32_t rpm, uint16_t voltage, uint16_t current, int16_t temperature, uint16_t current_tot) void AP_Logger::Write_ESC(uint8_t id, uint64_t time_us, int32_t rpm, uint16_t voltage, uint16_t current, int16_t esc_temp, uint16_t current_tot, int16_t motor_temp)
{ {
// sanity check id // sanity check id
if (id >= 8) { if (id >= 8) {
@ -792,8 +792,9 @@ void AP_Logger::Write_ESC(uint8_t id, uint64_t time_us, int32_t rpm, uint16_t vo
rpm : rpm, rpm : rpm,
voltage : voltage, voltage : voltage,
current : current, current : current,
temperature : temperature, esc_temp : esc_temp,
current_tot : current_tot current_tot : current_tot,
motor_temp : motor_temp
}; };
WriteBlock(&pkt, sizeof(pkt)); WriteBlock(&pkt, sizeof(pkt));
} }

11
libraries/AP_Logger/LogStructure.h
Unescape View File

@ -937,8 +937,9 @@ struct PACKED log_Esc {
int32_t rpm; int32_t rpm;
uint16_t voltage; uint16_t voltage;
uint16_t current; uint16_t current;
int16_t temperature; int16_t esc_temp;
uint16_t current_tot; uint16_t current_tot;
int16_t motor_temp;
}; };
struct PACKED log_AIRSPEED { struct PACKED log_AIRSPEED {
@ -1219,10 +1220,10 @@ struct PACKED log_Arm_Disarm {
#define BARO_UNITS "smPOnsmO-" #define BARO_UNITS "smPOnsmO-"
#define BARO_MULTS "F00B0C?0-" #define BARO_MULTS "F00B0C?0-"
#define ESC_LABELS "TimeUS,RPM,Volt,Curr,Temp,CTot" #define ESC_LABELS "TimeUS,RPM,Volt,Curr,Temp,CTot,MotTemp"
#define ESC_FMT "QeCCcH" #define ESC_FMT "QeCCcHc"
#define ESC_UNITS "sqvAO-" #define ESC_UNITS "sqvAO-O"
#define ESC_MULTS "FBBBB-" #define ESC_MULTS "FBBBB-B"
#define GPA_LABELS "TimeUS,VDop,HAcc,VAcc,SAcc,YAcc,VV,SMS,Delta" #define GPA_LABELS "TimeUS,VDop,HAcc,VAcc,SAcc,YAcc,VV,SMS,Delta"
#define GPA_FMT "QCCCCfBIH" #define GPA_FMT "QCCCCfBIH"

Write Preview
Loading…
Cancel
Save