cleanup

OpenI6X · Dec 4, 2024 · 0fde774 · 0fde774
1 parent 60baf50
commit 0fde774
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 56 deletions.
diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
@@ -510,7 +510,7 @@ void menuRadioSetup(event_t event)
 #endif
 
 #if defined(TELEMETRY_FRSKY) && defined(GPS)
-#if !defined(PCBI6X)
+#if defined(RTCLOCK)
       case ITEM_SETUP_TIMEZONE:
         lcdDrawTextAlignedLeft(y, STR_TIMEZONE);
         lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT);

diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
@@ -249,42 +249,6 @@ enum TelemetrySensorFormula {
   TELEM_FORMULA_LAST = TELEM_FORMULA_DIST
 };
 
-enum VarioSource {
-  VARIO_SOURCE_VSPEED,
-  VARIO_SOURCE_A1,
-  VARIO_SOURCE_A2,
-  VARIO_SOURCE_DTE,
-  VARIO_SOURCE_COUNT,
-  VARIO_SOURCE_LAST = VARIO_SOURCE_COUNT - 1
-};
-
-enum FrskyUsrProtocols {
-  USR_PROTO_NONE,
-  USR_PROTO_FRSKY,
-  USR_PROTO_WS_HOW_HIGH,
-  USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
-};
-
-enum FrskyCurrentSource {
-  FRSKY_CURRENT_SOURCE_NONE,
-  FRSKY_CURRENT_SOURCE_A1,
-  FRSKY_CURRENT_SOURCE_A2,
-  FRSKY_CURRENT_SOURCE_A3,
-  FRSKY_CURRENT_SOURCE_A4,
-  FRSKY_CURRENT_SOURCE_FAS,
-  FRSKY_CURRENT_SOURCE_LAST = FRSKY_CURRENT_SOURCE_FAS
-};
-
-enum FrskyVoltsSource {
-  FRSKY_VOLTS_SOURCE_A1,
-  FRSKY_VOLTS_SOURCE_A2,
-  FRSKY_VOLTS_SOURCE_A3,
-  FRSKY_VOLTS_SOURCE_A4,
-  FRSKY_VOLTS_SOURCE_FAS,
-  FRSKY_VOLTS_SOURCE_CELLS,
-  FRSKY_VOLTS_SOURCE_LAST = FRSKY_VOLTS_SOURCE_CELLS
-};
-
 enum SwashType {
   SWASH_TYPE_NONE,
   SWASH_TYPE_120,

diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
@@ -196,12 +196,6 @@ void telemetryInterrupt10ms()
 
   }
 
-#if defined(WS_HOW_HIGH)
-  if (wshhStreaming > 0) {
-    wshhStreaming--;
-  }
-#endif
-
   if (telemetryStreaming > 0) {
     telemetryStreaming--;
   }

diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h
@@ -85,14 +85,10 @@ struct TelemetryData {
   uint16_t xjtVersion;
   bool varioHighPrecision;
 };
-extern uint8_t telemetryProtocol;
+
 extern TelemetryData telemetryData;
 extern uint8_t telemetryStreaming; // >0 (true) == data is streaming in. 0 = no data detected for some time
 
-#if defined(WS_HOW_HIGH)
-extern uint8_t wshhStreaming;
-#endif
-
 enum TelemetryStates {
   TELEMETRY_INIT,
   TELEMETRY_OK,

diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp
@@ -309,10 +309,6 @@ TEST(FrSkySPORT, frskySetCellVoltage)
 
   //display test
   lcdClear();
-
-#if !defined(COLORLCD)
-  g_model.frsky.voltsSource = FRSKY_VOLTS_SOURCE_A1;
-#endif
 }
 
 TEST(FrSkySPORT, StrangeCellsBug)
@@ -389,10 +385,6 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors)
 
   //display test
   lcdClear();
-
-#if !defined(COLORLCD)
-  g_model.frsky.voltsSource = FRSKY_VOLTS_SOURCE_A1;
-#endif
 }
 
 void generateSportFasVoltagePacket(uint8_t * packet, uint32_t voltage)