Conversion of °C->°F on HDG

Altitude stored as feet in logs when imperial mode chosen

radio/src/gui/menu_general.cpp

@@ -477,7 +477,7 @@ void menuGeneralSetup(uint8_t event)
 #if defined(PCBSKY9X)
       case ITEM_SETUP_TEMPERATURE_WARNING:
         lcd_putsLeft(y, STR_TEMPWARNING);
-        putsTelemetryValue(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.temperatureWarn, UNIT_DEGREES, attr|LEFT) ;
+        putsTelemetryValue(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.temperatureWarn, UNIT_TEMPERATURE, attr|LEFT) ;
         if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureWarn, 0, 120); // 0 means no alarm
         break;
 #endif
@@ -1187,7 +1187,7 @@ void menuGeneralDiagAna(uint8_t event)
 
 #if defined(PCBSKY9X)
   lcd_putsLeft(7*FH+1, STR_TEMP_CALIB);
-  putsTelemetryValue(LEN_CALIB_FIELDS*FW+4*FW, 7*FH+1, getTemperature(), UNIT_DEGREES, (m_posVert==3 ? INVERS : 0)) ;
+  putsTelemetryValue(LEN_CALIB_FIELDS*FW+4*FW, 7*FH+1, getTemperature(), UNIT_TEMPERATURE, (m_posVert==3 ? INVERS : 0)) ;
   if (m_posVert==3) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureCalib, -100, 100);
 #endif
 }

radio/src/gui/view_main.cpp

@@ -406,7 +406,7 @@ void displayBattVoltage()
 void displayVoltageOrAlarm()
 {
   if (g_vbat100mV > g_eeGeneral.vBatWarn && g_eeGeneral.temperatureWarn && getTemperature() >= g_eeGeneral.temperatureWarn) {
-    putsTelemetryValue(6*FW-1, 3*FH, getTemperature(), UNIT_DEGREES, BLINK|INVERS|DBLSIZE);
+    putsTelemetryValue(6*FW-1, 3*FH, getTemperature(), UNIT_TEMPERATURE, BLINK|INVERS|DBLSIZE);
   }
   else if (g_vbat100mV > g_eeGeneral.vBatWarn && g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.currentCalib)/8192/36) / 500 >= g_eeGeneral.mAhWarn) {
     putsTelemetryValue(7*FW-1, 3*FH, (g_eeGeneral.mAhUsed + Current_used*(488 + g_eeGeneral.currentCalib)/8192/36)/10, UNIT_MAH, BLINK|INVERS|DBLSIZE);

radio/src/gui/view_statistics.cpp

@@ -152,8 +152,8 @@ void menuStatisticsDebug(uint8_t event)
 
 #if defined(PCBSKY9X)
   lcd_putsLeft(3*FH, STR_CPU_TEMP);
-  putsTelemetryValue(MENU_DEBUG_COL_OFS, 3*FH, getTemperature(), UNIT_DEGREES, 0);
+  putsTelemetryValue(MENU_DEBUG_COL_OFS, 3*FH, getTemperature(), UNIT_TEMPERATURE, 0);
-  putsTelemetryValue(20*FW+2, 3*FH, maxTemperature+g_eeGeneral.temperatureCalib, UNIT_DEGREES, 0);
+  putsTelemetryValue(20*FW+2, 3*FH, maxTemperature+g_eeGeneral.temperatureCalib, UNIT_TEMPERATURE, 0);
 #endif
 
 #if defined(PCBSKY9X)
@@ -169,8 +169,8 @@ void menuStatisticsDebug(uint8_t event)
     lcd_putsAtt(9*FW+2, 4*FH, PSTR("Upgr.TinyApp"),INVERS);
   }
   else {
-    putsTelemetryValue(MENU_DEBUG_COL_OFS, 4*FH, Coproc_temp, UNIT_DEGREES, 0);
+    putsTelemetryValue(MENU_DEBUG_COL_OFS, 4*FH, Coproc_temp, UNIT_TEMPERATURE, 0);
-    putsTelemetryValue(20*FW+2, 4*FH, Coproc_maxtemp, UNIT_DEGREES, 0);
+    putsTelemetryValue(20*FW+2, 4*FH, Coproc_maxtemp, UNIT_TEMPERATURE, 0);
   }
 #elif defined(PCBTARANIS) && !defined(SIMU)
   lcd_putsLeft(4*FH, "Free Mem");

radio/src/lcd.cpp

@@ -1180,16 +1180,17 @@ void putsTelemetryValue(xcoord_t x, uint8_t y, lcdint_t val, uint8_t unit, uint8
 {
   convertUnit(val, unit);
   lcd_outdezAtt(x, y, val, att & (~NO_UNIT));
-  if (!(att & NO_UNIT) && unit != UNIT_RAW)
+  if (!(att & NO_UNIT) && unit != UNIT_RAW) {
     lcd_putsiAtt(lcdLastPos/*+1*/, y, STR_VTELEMUNIT, unit, 0);
+  }
 }
 
 const pm_uint8_t bchunit_ar[] PROGMEM = {
   UNIT_DIST,    // Alt
   UNIT_RAW,     // Rpm
   UNIT_PERCENT, // Fuel
-  UNIT_DEGREES, // T1
+  UNIT_TEMPERATURE, // T1
-  UNIT_DEGREES, // T2
+  UNIT_TEMPERATURE, // T2
   UNIT_KTS,     // Speed
   UNIT_DIST,    // Dist
   UNIT_DIST,    // GPS Alt
@@ -1299,7 +1300,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
       if (channel >= TELEM_MIN_ALT-1 && channel <= TELEM_MAX_ALT-1)
         unit = 0;
       if (channel == TELEM_HDG-1)
-        unit = 3;
+        unit = UNIT_HDG;
       putsTelemetryValue(x, y, val, pgm_read_byte(bchunit_ar+unit), att);
       break;
     }

radio/src/logs.cpp

@@ -140,7 +140,9 @@ const pm_char * openLogs()
     if (IS_USR_PROTO_FRSKY_HUB()) {
       f_puts("GPS Date,GPS Time,Long,Lat,Course,GPS Speed(", &g_oLogFile);
       f_puts(TELEMETRY_GPS_SPEED_UNIT, &g_oLogFile);
-      f_puts("),GPS Alt,Baro Alt,Vertical Speed,Temp1,Temp2,RPM,Fuel,Cell volts,Cell 1,Cell 2,Cell 3,Cell 4,Cell 5,Cell 6,Current,Consumption,Vfas,AccelX,AccelY,AccelZ,", &g_oLogFile);
+      f_puts("),GPS Alt,Baro Alt(", &g_oLogFile);
+      f_puts(TELEMETRY_BARO_ALT_UNIT, &g_oLogFile);
+      f_puts("),Vertical Speed,Temp1,Temp2,RPM,Fuel,Cell volts,Cell 1,Cell 2,Cell 3,Cell 4,Cell 5,Cell 6,Current,Consumption,Vfas,AccelX,AccelY,AccelZ,", &g_oLogFile);
     }
 #endif
 
@@ -223,6 +225,8 @@ void writeLogs()
 #endif
 
 #if defined(FRSKY_HUB)
+      TELEMETRY_BARO_ALT_PREPARE();
+
       if (IS_USR_PROTO_FRSKY_HUB()) {
         f_printf(&g_oLogFile, "%4d-%02d-%02d,%02d:%02d:%02d,%03d.%04d%c,%03d.%04d%c,%03d.%02d," TELEMETRY_GPS_SPEED_FORMAT TELEMETRY_GPS_ALT_FORMAT TELEMETRY_BARO_ALT_FORMAT TELEMETRY_VSPEED_FORMAT "%d,%d,%d,%d," TELEMETRY_CELLS_FORMAT TELEMETRY_CURRENT_FORMAT "%d," TELEMETRY_VFAS_FORMAT "%d,%d,%d,",
             frskyData.hub.year+2000,

radio/src/myeeprom.h

@@ -910,7 +910,7 @@ enum TelemetryUnit {
   UNIT_RAW,
   UNIT_SPEED,
   UNIT_DIST,
-  UNIT_DEGREES,
+  UNIT_TEMPERATURE,
   UNIT_PERCENT,
   UNIT_MILLIAMPS,
   UNIT_A1A2_MAX = UNIT_MILLIAMPS,
@@ -924,6 +924,7 @@ enum TelemetryUnit {
   UNIT_SECONDS,
   UNIT_RPMS,
   UNIT_G,
+  UNIT_HDG,
 };
 
 #if defined(CPUARM)

radio/src/opentx.cpp

@@ -2127,7 +2127,7 @@ getvalue_t convertCswTelemValue(LogicalSwitchData * cs)
 FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit)
 {
   if (IS_IMPERIAL_ENABLE()) {
-    if (unit == UNIT_DEGREES) {
+    if (unit == UNIT_TEMPERATURE) {
       val += 18;
       val *= 115;
       val >>= 6;
@@ -2152,6 +2152,10 @@ FORCEINLINE void convertUnit(getvalue_t & val, uint8_t & unit)
       val = (val * 50) / 27;
     }
   }
+
+  if (unit == UNIT_HDG) {
+    unit = UNIT_TEMPERATURE;
+  }
 }
 #endif
 
@@ -3295,7 +3299,7 @@ PLAY_FUNCTION(playValue, uint8_t idx)
       break;
 
     case MIXSRC_FIRST_TELEM+TELEM_HDG-1:
-      PLAY_NUMBER(val, 1+UNIT_DEGREES, 0);
+      PLAY_NUMBER(val, 1+UNIT_HDG, 0);
       break;
 
     default:

radio/src/telemetry/frsky.h

@@ -227,6 +227,7 @@ void resetTelemetry();
 #define TELEMETRY_MIN_CELL_VOLTAGE  (frskyData.hub.minCellVolts * 2)
 
 #define TELEMETRY_BARO_ALT_AVAILABLE()          (frskyData.hub.baroAltitudeOffset)
+#define TELEMETRY_BARO_ALT_UNIT                 (IS_IMPERIAL_ENABLE() ? LENGTH_UNIT_IMP : LENGTH_UNIT_METR)
 
 #define TELEMETRY_RELATIVE_BARO_ALT_BP          frskyData.hub.baroAltitude_bp
 #define TELEMETRY_RELATIVE_BARO_ALT_AP          frskyData.hub.baroAltitude_ap

radio/src/telemetry/frsky_sport.h

@@ -184,6 +184,7 @@ void resetTelemetry();
 #define TELEMETRY_MIN_CELL_VOLTAGE      frskyData.hub.minCellVolts
 
 #define TELEMETRY_BARO_ALT_AVAILABLE()  (frskyData.hub.baroAltitudeOffset)
+#define TELEMETRY_BARO_ALT_UNIT         (IS_IMPERIAL_ENABLE() ? LENGTH_UNIT_IMP : LENGTH_UNIT_METR)
 
 #define TELEMETRY_GPS_SPEED_BP          frskyData.hub.gpsSpeed_bp
 #define TELEMETRY_GPS_SPEED_AP          frskyData.hub.gpsSpeed_ap
@@ -195,8 +196,9 @@ void resetTelemetry();
 #define TELEMETRY_RELATIVE_BARO_ALT_BP  (frskyData.hub.baroAltitude / 100)
 #define TELEMETRY_RELATIVE_BARO_ALT_AP  (frskyData.hub.baroAltitude % 100)
 
+#define TELEMETRY_BARO_ALT_PREPARE()    div_t baroAltitudeDivision = div(getConvertedTelemetryValue(frskyData.hub.baroAltitude, UNIT_DIST), 100)
 #define TELEMETRY_BARO_ALT_FORMAT       "%c%d.%02d,"
-#define TELEMETRY_BARO_ALT_ARGS         frskyData.hub.baroAltitude < 0 ? '-' : ' ', abs(frskyData.hub.baroAltitude / 100), abs(frskyData.hub.baroAltitude % 100),
+#define TELEMETRY_BARO_ALT_ARGS         frskyData.hub.baroAltitude < 0 ? '-' : ' ', abs(baroAltitudeDivision.quot), abs(baroAltitudeDivision.rem),
 #define TELEMETRY_GPS_ALT_FORMAT        "%c%d.%02d,"
 #define TELEMETRY_GPS_ALT_ARGS          frskyData.hub.gpsAltitude < 0 ? '-' : ' ', abs(frskyData.hub.gpsAltitude / 100), abs(frskyData.hub.gpsAltitude % 100),
 #define TELEMETRY_GPS_SPEED_UNIT        (IS_IMPERIAL_ENABLE() ? SPEED_UNIT_IMP : SPEED_UNIT_METR)

radio/src/translations/tts_cz.cpp

@@ -43,7 +43,7 @@ enum CzechPrompts {
   CZ_PROMPT_SPARE1 = CZ_PROMPT_UNITS_BASE+(UNIT_RAW*4),
   CZ_PROMPT_KMH = CZ_PROMPT_UNITS_BASE+(UNIT_SPEED*4),
   CZ_PROMPT_METERS = CZ_PROMPT_UNITS_BASE+(UNIT_DIST*4),
-  CZ_PROMPT_DEGREES = CZ_PROMPT_UNITS_BASE+(UNIT_DEGREES*4),
+  CZ_PROMPT_DEGREES = CZ_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*4),
   CZ_PROMPT_PERCENT = CZ_PROMPT_UNITS_BASE+(UNIT_PERCENT*4),
   CZ_PROMPT_MILLIAMPS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4),
   CZ_PROMPT_MAH = CZ_PROMPT_UNITS_BASE+(UNIT_MAH*4),

radio/src/translations/tts_de.cpp

@@ -45,7 +45,7 @@ enum GermanPrompts {
   DE_PROMPT_SPARE1 = DE_PROMPT_UNITS_BASE+UNIT_RAW,
   DE_PROMPT_KMH = DE_PROMPT_UNITS_BASE+UNIT_SPEED,
   DE_PROMPT_METERS = DE_PROMPT_UNITS_BASE+UNIT_DIST,
-  DE_PROMPT_DEGREES = DE_PROMPT_UNITS_BASE+UNIT_DEGREES,
+  DE_PROMPT_DEGREES = DE_PROMPT_UNITS_BASE+UNIT_TEMPERATURE,
   DE_PROMPT_PERCENT = DE_PROMPT_UNITS_BASE+UNIT_PERCENT,
   DE_PROMPT_MILLIAMPS = DE_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
   DE_PROMPT_MAH = DE_PROMPT_UNITS_BASE+UNIT_MAH,

radio/src/translations/tts_en.cpp

@@ -52,7 +52,7 @@ enum EnglishPrompts {
   EN_PROMPT_SPARE1 = EN_PROMPT_UNITS_BASE+(UNIT_RAW*2),
   EN_PROMPT_KMH = EN_PROMPT_UNITS_BASE+(UNIT_SPEED*2),
   EN_PROMPT_METERS = EN_PROMPT_UNITS_BASE+(UNIT_DIST*2),
-  EN_PROMPT_DEGREES = EN_PROMPT_UNITS_BASE+(UNIT_DEGREES*2),
+  EN_PROMPT_DEGREES = EN_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*2),
   EN_PROMPT_PERCENT = EN_PROMPT_UNITS_BASE+(UNIT_PERCENT*2),
   EN_PROMPT_MILLIAMPS = EN_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2),
   EN_PROMPT_MAH = EN_PROMPT_UNITS_BASE+(UNIT_MAH*2),

radio/src/translations/tts_es.cpp

@@ -69,7 +69,7 @@ enum SpanishPrompts {
   ES_PROMPT_SPARE1 = ES_PROMPT_UNITS_BASE+UNIT_RAW,
   ES_PROMPT_KMH = ES_PROMPT_UNITS_BASE+UNIT_SPEED,
   ES_PROMPT_METERS = ES_PROMPT_UNITS_BASE+UNIT_DIST,
-  ES_PROMPT_DEGREES = ES_PROMPT_UNITS_BASE+UNIT_DEGREES,
+  ES_PROMPT_DEGREES = ES_PROMPT_UNITS_BASE+UNIT_TEMPERATURE,
   ES_PROMPT_PERCENT = ES_PROMPT_UNITS_BASE+UNIT_PERCENT,
   ES_PROMPT_MILLIAMPS = ES_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
   ES_PROMPT_MAH = ES_PROMPT_UNITS_BASE+UNIT_MAH,

radio/src/translations/tts_fr.cpp

@@ -50,7 +50,7 @@ enum FrenchPrompts {
   FR_PROMPT_SPARE1 = FR_PROMPT_UNITS_BASE+UNIT_RAW,
   FR_PROMPT_KMH = FR_PROMPT_UNITS_BASE+UNIT_SPEED,
   FR_PROMPT_METERS = FR_PROMPT_UNITS_BASE+UNIT_DIST,
-  FR_PROMPT_DEGREES = FR_PROMPT_UNITS_BASE+UNIT_DEGREES,
+  FR_PROMPT_DEGREES = FR_PROMPT_UNITS_BASE+UNIT_TEMPERATURE,
   FR_PROMPT_PERCENT = FR_PROMPT_UNITS_BASE+UNIT_PERCENT,
   FR_PROMPT_MILLIAMPS = FR_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
   FR_PROMPT_MAH = FR_PROMPT_UNITS_BASE+UNIT_MAH,

radio/src/translations/tts_it.cpp

@@ -46,7 +46,7 @@ enum ItalianPrompts {
   IT_PROMPT_SPARE1 = IT_PROMPT_UNITS_BASE+UNIT_RAW,
   IT_PROMPT_KMH = IT_PROMPT_UNITS_BASE+UNIT_SPEED,
   IT_PROMPT_METERS = IT_PROMPT_UNITS_BASE+UNIT_DIST,
-  IT_PROMPT_DEGREES = IT_PROMPT_UNITS_BASE+UNIT_DEGREES,
+  IT_PROMPT_DEGREES = IT_PROMPT_UNITS_BASE+UNIT_TEMPERATURE,
   IT_PROMPT_PERCENT = IT_PROMPT_UNITS_BASE+UNIT_PERCENT,
   IT_PROMPT_MILLIAMPS = IT_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
   IT_PROMPT_MAH = IT_PROMPT_UNITS_BASE+UNIT_MAH,

radio/src/translations/tts_pl.cpp

@@ -44,7 +44,7 @@ enum PolishPrompts {
   PL_PROMPT_SPARE1 = PL_PROMPT_UNITS_BASE+(UNIT_RAW*4),
   PL_PROMPT_KMH = PL_PROMPT_UNITS_BASE+(UNIT_SPEED*4),
   PL_PROMPT_METERS = PL_PROMPT_UNITS_BASE+(UNIT_DIST*4),
-  PL_PROMPT_DEGREES = PL_PROMPT_UNITS_BASE+(UNIT_DEGREES*4),
+  PL_PROMPT_DEGREES = PL_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*4),
   PL_PROMPT_PERCENT = PL_PROMPT_UNITS_BASE+(UNIT_PERCENT*4),
   PL_PROMPT_MILLIAMPS = PL_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4),
   PL_PROMPT_MAH = PL_PROMPT_UNITS_BASE+(UNIT_MAH*4),

radio/src/translations/tts_pt.cpp

@@ -69,7 +69,7 @@ enum PortuguesePrompts {
   PT_PROMPT_SPARE1 = PT_PROMPT_UNITS_BASE+UNIT_RAW,
   PT_PROMPT_KMH = PT_PROMPT_UNITS_BASE+UNIT_SPEED,
   PT_PROMPT_METERS = PT_PROMPT_UNITS_BASE+UNIT_DIST,
-  PT_PROMPT_DEGREES = PT_PROMPT_UNITS_BASE+UNIT_DEGREES,
+  PT_PROMPT_DEGREES = PT_PROMPT_UNITS_BASE+UNIT_TEMPERATURE,
   PT_PROMPT_PERCENT = PT_PROMPT_UNITS_BASE+UNIT_PERCENT,
   PT_PROMPT_MILLIAMPS = PT_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
   PT_PROMPT_MAH = PT_PROMPT_UNITS_BASE+UNIT_MAH,

radio/src/translations/tts_se.cpp

@@ -53,7 +53,7 @@ enum SwedishPrompts {
   SE_PROMPT_SPARE1 = SE_PROMPT_UNITS_BASE+(UNIT_RAW*2),
   SE_PROMPT_KMH = SE_PROMPT_UNITS_BASE+(UNIT_SPEED*2),
   SE_PROMPT_METERS = SE_PROMPT_UNITS_BASE+(UNIT_DIST*2),
-  SE_PROMPT_DEGREES = SE_PROMPT_UNITS_BASE+(UNIT_DEGREES*2),
+  SE_PROMPT_DEGREES = SE_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*2),
   SE_PROMPT_PERCENT = SE_PROMPT_UNITS_BASE+(UNIT_PERCENT*2),
   SE_PROMPT_MILLIAMPS = SE_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2),
   SE_PROMPT_MAH = SE_PROMPT_UNITS_BASE+(UNIT_MAH*2),

radio/src/translations/tts_sk.cpp

@@ -58,7 +58,7 @@ enum SlovakPrompts {
   SK_PROMPT_SPARE1 = SK_PROMPT_UNITS_BASE+(UNIT_RAW*4),
   SK_PROMPT_KMH = SK_PROMPT_UNITS_BASE+(UNIT_SPEED*4),
   SK_PROMPT_METERS = SK_PROMPT_UNITS_BASE+(UNIT_DIST*4),
-  SK_PROMPT_DEGREES = SK_PROMPT_UNITS_BASE+(UNIT_DEGREES*4),
+  SK_PROMPT_DEGREES = SK_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*4),
   SK_PROMPT_PERCENT = SK_PROMPT_UNITS_BASE+(UNIT_PERCENT*4),
   SK_PROMPT_MILLIAMPS = SK_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4),
   SK_PROMPT_MAH = SK_PROMPT_UNITS_BASE+(UNIT_MAH*4),