[all] Telemetry display bug fixes

This commit is contained in:
bsongis
2012-11-02 16:17:13 +00:00
parent abcc80b266
commit 1080514bd9
3 changed files with 10 additions and 3 deletions
+1 -1
View File
@@ -953,7 +953,7 @@ int16_t convertTelemValue(uint8_t channel, uint8_t value)
case TELEM_GPSALT:
case TELEM_MAX_ALT:
case TELEM_MIN_ALT:
result = value * 4;
result = value * 8 - 500;
break;
case TELEM_RPM:
case TELEM_MAX_RPM:
+6 -2
View File
@@ -2024,9 +2024,11 @@ void menuModelExpoMix(uint8_t expo, uint8_t _event)
#if defined(PCBSKY9X)
if (ed->name[0]) {
putsSwitches(11*FW, y, ed->swtch, 0);
lcd_putsnAtt(15*FW+2, y, ed->name, sizeof(ed->name), ZCHAR | (isExpoActive(i) ? BOLD : 0));
lcd_putsnAtt(DISPLAY_W-sizeof(ed->name)*FW-MENUS_SCROLLBAR_WIDTH, y, ed->name, sizeof(ed->name), ZCHAR | (isExpoActive(i) ? BOLD : 0));
}
#if !defined(PCBX9D)
else
#endif
#endif
{
putsSwitches(EXPO_LINE_SWITCH_POS, y, ed->swtch, 0); // normal switches
@@ -2043,9 +2045,11 @@ void menuModelExpoMix(uint8_t expo, uint8_t _event)
#if defined(PCBSKY9X)
if (md->name[0]) {
lcd_putsnAtt(15*FW+2, y, md->name, sizeof(md->name), ZCHAR | (isMixActive(i) ? BOLD : 0));
lcd_putsnAtt(DISPLAY_W-sizeof(md->name)*FW-MENUS_SCROLLBAR_WIDTH, y, md->name, sizeof(md->name), ZCHAR | (isMixActive(i) ? BOLD : 0));
}
#if !defined(PCBX9D)
else
#endif
#endif
{
if (md->curveParam) {
+3
View File
@@ -1002,6 +1002,9 @@ void putsTelemetryValue(uint8_t x, uint8_t y, int16_t val, uint8_t unit, uint8_t
if (unit == UNIT_FEET) {
unit = UNIT_METERS;
}
if (unit == UNIT_KTS) {
unit = UNIT_KMH;
}
#else
if (unit == UNIT_KTS) {
// kts to km/h