Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Motors: tidy frame description strings 

Before: AP: Frame: TRI/
After: AP: Frame: TRI
This commit is contained in:
Peter Barker 2021-06-20 09:54:22 +10:00 committed by Andrew Tridgell
parent 32a174c453
commit b7c2b56a66
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_Motors/AP_Motors_Class.cpp
View File

@ -48,6 +48,17 @@ AP_Motors::AP_Motors(uint16_t loop_rate, uint16_t speed_hz) :
_thrust_balanced = true; _thrust_balanced = true;
}; };
void AP_Motors::get_frame_and_type_string(char *buffer, uint8_t buflen) const
{
const char *frame_str = get_frame_string();
const char *type_str = get_type_string();
if (type_str != nullptr && strlen(type_str)) {
hal.util->snprintf(buffer, buflen, "Frame: %s/%s", frame_str, type_str);
} else {
hal.util->snprintf(buffer, buflen, "Frame: %s", frame_str);
}
}
void AP_Motors::armed(bool arm) void AP_Motors::armed(bool arm)
{ {
if (_armed != arm) { if (_armed != arm) {

3
libraries/AP_Motors/AP_Motors_Class.h
View File

@ -74,6 +74,9 @@ public:
// return string corresponding to frame_type // return string corresponding to frame_type
virtual const char* get_type_string() const { return ""; } virtual const char* get_type_string() const { return ""; }
// returns a formatted string into buffer, e.g. "QUAD/X"
void get_frame_and_type_string(char *buffer, uint8_t buflen) const;
// Constructor // Constructor
AP_Motors(uint16_t loop_rate, uint16_t speed_hz = AP_MOTORS_SPEED_DEFAULT); AP_Motors(uint16_t loop_rate, uint16_t speed_hz = AP_MOTORS_SPEED_DEFAULT);