Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-04 23:18:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_OSD: added SI and Aviation units

Browse Source
This commit is contained in:
Andrew Tridgell 2018-07-10 08:54:21 +10:00
parent 3292abaa19
commit 33653b6734
3 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_OSD/AP_OSD.cpp
View File

@ -124,7 +124,7 @@ const AP_Param::GroupInfo AP_OSD::var_info[] = {
// @Param: _UNITS // @Param: _UNITS
// @DisplayName: Display Units // @DisplayName: Display Units
// @Description: Sets the units to use in displaying items // @Description: Sets the units to use in displaying items
// @Values: 0:Metric,1:Imperial // @Values: 0:Metric,1:Imperial,2:SI,3:Aviation
// @User: Standard // @User: Standard
AP_GROUPINFO("_UNITS", 15, AP_OSD, units, 0), AP_GROUPINFO("_UNITS", 15, AP_OSD, units, 0),

4
libraries/AP_OSD/AP_OSD.h
View File

@ -197,7 +197,9 @@ public:
enum { enum {
UNITS_METRIC=0, UNITS_METRIC=0,
UNITS_IMPERIAL=1, UNITS_IMPERIAL=1,
UNITS_LAST=2, UNITS_SI=2,
UNITS_AVIATION=3,
UNITS_LAST=4,
}; };
AP_Int8 units; AP_Int8 units;

70
libraries/AP_OSD/AP_OSD_Screen.cpp
View File

@ -251,9 +251,27 @@ char AP_OSD_Screen::u_icon(enum unit_type unit)
(char)SYM_MI, //DISTANCE_LONG (char)SYM_MI, //DISTANCE_LONG
(char)SYM_DEGREES_F //TEMPERATURE (char)SYM_DEGREES_F //TEMPERATURE
}; };
static const char icons_SI[UNIT_TYPE_LAST] {
(char)SYM_ALT_M, //ALTITUDE
(char)SYM_MS, //SPEED
(char)SYM_MS, //VSPEED
(char)SYM_M, //DISTANCE
(char)SYM_KM, //DISTANCE_LONG
(char)SYM_DEGREES_C //TEMPERATURE
};
static const char icons_aviation[UNIT_TYPE_LAST] {
(char)SYM_ALT_FT, //ALTITUDE Ft
(char)SYM_KN, //SPEED Knots
(char)SYM_FS, //VSPEED
(char)SYM_FT, //DISTANCE
(char)SYM_NM, //DISTANCE_LONG Nm
(char)SYM_DEGREES_C //TEMPERATURE
};
static const char *icons[AP_OSD::UNITS_LAST] = { static const char *icons[AP_OSD::UNITS_LAST] = {
icons_metric, icons_metric,
icons_imperial icons_imperial,
icons_SI,
icons_aviation,
}; };
return icons[constrain_int16(osd->units, 0, AP_OSD::UNITS_LAST-1)][unit]; return icons[constrain_int16(osd->units, 0, AP_OSD::UNITS_LAST-1)][unit];
} }
@ -264,20 +282,20 @@ char AP_OSD_Screen::u_icon(enum unit_type unit)
float AP_OSD_Screen::u_scale(enum unit_type unit, float value) float AP_OSD_Screen::u_scale(enum unit_type unit, float value)
{ {
static const float scale_metric[UNIT_TYPE_LAST] = { static const float scale_metric[UNIT_TYPE_LAST] = {
1.0, //ALTITUDE 1.0, //ALTITUDE m
3.6, //SPEED 3.6, //SPEED km/hr
1.0, //VSPEED 1.0, //VSPEED m/s
1.0, //DISTANCE 1.0, //DISTANCE m
1.0/1000, //DISTANCE_LONG 1.0/1000, //DISTANCE_LONG km
1.0, //TEMPERATURE 1.0, //TEMPERATURE C
}; };
static const float scale_imperial[UNIT_TYPE_LAST] = { static const float scale_imperial[UNIT_TYPE_LAST] = {
3.28084, //ALTITUDE 3.28084, //ALTITUDE ft
2.23694, //SPEED 2.23694, //SPEED mph
3.28084, //VSPEED 3.28084, //VSPEED ft/s
3.28084, //DISTANCE 3.28084, //DISTANCE ft
1.0/1609.34, //DISTANCE_LONG 1.0/1609.34, //DISTANCE_LONG miles
1.8, //TEMPERATURE 1.8, //TEMPERATURE F
}; };
static const float offset_imperial[UNIT_TYPE_LAST] = { static const float offset_imperial[UNIT_TYPE_LAST] = {
0.0, //ALTITUDE 0.0, //ALTITUDE
@ -285,15 +303,35 @@ float AP_OSD_Screen::u_scale(enum unit_type unit, float value)
0.0, //VSPEED 0.0, //VSPEED
0.0, //DISTANCE 0.0, //DISTANCE
0.0, //DISTANCE_LONG 0.0, //DISTANCE_LONG
32.0, //TEMPERATURE 32.0, //TEMPERATURE F
};
static const float scale_SI[UNIT_TYPE_LAST] = {
1.0, //ALTITUDE m
1.0, //SPEED m/s
1.0, //VSPEED m/s
1.0, //DISTANCE m
1.0/1000, //DISTANCE_LONG km
1.0, //TEMPERATURE C
};
static const float scale_aviation[UNIT_TYPE_LAST] = {
3.28084, //ALTITUDE Ft
1.94384, //SPEED Knots
196.85, //VSPEED ft/min
3.28084, //DISTANCE ft
0.000539957, //DISTANCE_LONG Nm
1.0, //TEMPERATURE C
}; };
static const float *scale[AP_OSD::UNITS_LAST] = { static const float *scale[AP_OSD::UNITS_LAST] = {
scale_metric, scale_metric,
scale_imperial scale_imperial,
scale_SI,
scale_aviation
}; };
static const float *offsets[AP_OSD::UNITS_LAST] = { static const float *offsets[AP_OSD::UNITS_LAST] = {
nullptr, nullptr,
offset_imperial offset_imperial,
nullptr,
nullptr
}; };
uint8_t units = constrain_int16(osd->units, 0, AP_OSD::UNITS_LAST-1); uint8_t units = constrain_int16(osd->units, 0, AP_OSD::UNITS_LAST-1);
return value * scale[units][unit] + (offsets[units]?offsets[units][unit]:0); return value * scale[units][unit] + (offsets[units]?offsets[units][unit]:0);