aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Torqeedo: correct display system state motor power field type

Browse Source 
No need to store as float
This commit is contained in:
Randy Mackay 2021-10-18 15:39:13 +09:00
parent 90f7e15bcb
commit a09013c656
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Torqeedo/AP_Torqeedo.cpp
View File

@ -510,7 +510,7 @@ void AP_Torqeedo::parse_message()
// @Field: BPct: Battery charge percentage // @Field: BPct: Battery charge percentage
// @Field: BVolt: Battery voltage // @Field: BVolt: Battery voltage
// @Field: BCur: Battery current // @Field: BCur: Battery current
AP::logger().Write("TRST", "TimeUS,F,Err,MVolt,MCur,Pow,RPM,MTemp,BPct,BVolt,BCur", "QHBfffhBBff", AP::logger().Write("TRST", "TimeUS,F,Err,MVolt,MCur,Pow,RPM,MTemp,BPct,BVolt,BCur", "QHBffHhBBff",
AP_HAL::micros64(), AP_HAL::micros64(),
_display_system_state.flags.value, _display_system_state.flags.value,
_display_system_state.master_error_code, _display_system_state.master_error_code,
@ -526,12 +526,12 @@ void AP_Torqeedo::parse_message()
// send to GCS // send to GCS
if ((_options & options::DEBUG_TO_GCS) != 0) { if ((_options & options::DEBUG_TO_GCS) != 0) {
gcs().send_text(MAV_SEVERITY_INFO,"TRST F:%u Err:%u MV:%4.1f MC:%4.1f P:%4.1f MT:%d B%%:%d BV:%4.1f BC:%4.1f", gcs().send_text(MAV_SEVERITY_INFO,"TRST F:%u Err:%u MV:%4.1f MC:%4.1f P:%u MT:%d B%%:%d BV:%4.1f BC:%4.1f",
(unsigned)_display_system_state.flags.value, (unsigned)_display_system_state.flags.value,
(unsigned)_display_system_state.master_error_code, (unsigned)_display_system_state.master_error_code,
(double)_display_system_state.motor_voltage, (double)_display_system_state.motor_voltage,
(double)_display_system_state.motor_current, (double)_display_system_state.motor_current,
(double)_display_system_state.motor_power, (unsigned)_display_system_state.motor_power,
(int)motor_temp, (int)motor_temp,
(unsigned)_display_system_state.batt_charge_pct, (unsigned)_display_system_state.batt_charge_pct,
(double)_display_system_state.batt_voltage, (double)_display_system_state.batt_voltage,

2
libraries/AP_Torqeedo/AP_Torqeedo.h
View File

@ -269,7 +269,7 @@ private:
uint8_t master_error_code; // error code (0=no error) uint8_t master_error_code; // error code (0=no error)
float motor_voltage; // motor voltage in volts float motor_voltage; // motor voltage in volts
float motor_current; // motor current in amps float motor_current; // motor current in amps
float motor_power; // motor power in watts uint16_t motor_power; // motor power in watts
int16_t motor_rpm; // motor speed in rpm int16_t motor_rpm; // motor speed in rpm
uint8_t motor_pcb_temp; // motor pcb temp in C uint8_t motor_pcb_temp; // motor pcb temp in C
uint8_t motor_stator_temp; // motor stator temp in C uint8_t motor_stator_temp; // motor stator temp in C