From 0b1bdc540e67c9dc68e759e1d14f9c45b62f94c7 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 27 Jan 2013 16:35:31 +0000
Subject: [PATCH] Halcyon protocol removed. Halcyon vario added instead.

---
 src/frsky.cpp         | 16 +++++++++-------
 src/logs.cpp          |  4 ++--
 src/model_menus.cpp   |  2 +-
 src/myeeprom.h        | 15 +++++----------
 src/translations/cz.h |  4 ++--
 src/translations/de.h |  8 ++++----
 src/translations/en.h |  6 +++---
 src/translations/es.h |  4 ++--
 src/translations/fr.h |  4 ++--
 src/translations/it.h |  4 ++--
 src/translations/pt.h |  4 ++--
 src/translations/se.h |  4 ++--
 12 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/src/frsky.cpp b/src/frsky.cpp
index 6accb46a5..a8693fb31 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -258,7 +258,7 @@ void parseTelemHubByte(uint8_t byte)
       // First received barometer altitude => Altitude offset
       if (!frskyData.hub.baroAltitudeOffset)
         frskyData.hub.baroAltitudeOffset = -frskyData.hub.baroAltitude_bp;
-      if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB && g_model.frsky.varioSource == VARIO_SOURCE_DATA) {
+      if (g_model.frsky.varioSource == VARIO_SOURCE_DATA) {
         evalVario(frskyData.hub.baroAltitude_bp, 0);
       }
       frskyData.hub.baroAltitude_bp += frskyData.hub.baroAltitudeOffset;
@@ -266,7 +266,7 @@ void parseTelemHubByte(uint8_t byte)
       break;
 
     case offsetof(FrskyHubData, baroAltitude_ap):
-      if (g_model.frsky.usrProto == USR_PROTO_HALCYON && g_model.frsky.varioSource == VARIO_SOURCE_DATA) {
+      if (g_model.frsky.varioSource == VARIO_SOURCE_HALCYON) {
         evalVario(frskyData.hub.baroAltitude_bp-frskyData.hub.baroAltitudeOffset, frskyData.hub.baroAltitude_ap);
       }
       break;
@@ -367,22 +367,24 @@ void processFrskyPacket(uint8_t *packet)
   switch (packet[0])
   {
     case LINKPKT: // A1/A2/RSSI values
+    {
       link_counter += 32;
       frskyData.analog[0].set(packet[1], g_model.frsky.channels[0].type);
       frskyData.analog[1].set(packet[2], g_model.frsky.channels[1].type);
       frskyData.rssi[0].set(packet[3]);
       frskyData.rssi[1].set(packet[4] / 2);
       frskyStreaming = FRSKY_TIMEOUT10ms; // reset counter only if valid frsky packets are being detected
-      if (g_model.frsky.varioSource >= VARIO_SOURCE_A1) {
-        frskyData.varioSpeed = applyChannelRatio(g_model.frsky.varioSource - VARIO_SOURCE_A1, frskyData.analog[g_model.frsky.varioSource - VARIO_SOURCE_A1].value);
-      }
+      uint8_t varioSource = g_model.frsky.varioSource - VARIO_SOURCE_A1;
+      if (varioSource < 2)
+        frskyData.varioSpeed = applyChannelRatio(varioSource, frskyData.analog[varioSource].value);
       break;
+    }
 #if defined(FRSKY_HUB) || defined (WS_HOW_HIGH)
     case USRPKT: // User Data packet
       uint8_t numBytes = 3 + (packet[1] & 0x07); // sanitize in case of data corruption leading to buffer overflow
       for (uint8_t i=3; i<numBytes; i++) {
 #if defined(FRSKY_HUB)
-        if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON)
+        if (g_model.frsky.usrProto == USR_PROTO_FRSKY)
           parseTelemHubByte(packet[i]);
 #endif
 #if defined(WS_HOW_HIGH)
@@ -1444,7 +1446,7 @@ void menuTelemetryFrsky(uint8_t event)
 #if defined(FRSKY_HUB)
     else if (s_frsky_view == e_frsky_after_flight) {
       uint8_t line=1*FH+1;
-      if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON) {
+      if (g_model.frsky.usrProto == USR_PROTO_FRSKY) {
         // Latitude
         lcd_putsLeft(line, STR_LATITUDE);
         displayGpsCoord(line, frskyData.hub.gpsLatitudeNS, frskyData.hub.gpsLatitude_bp, frskyData.hub.gpsLatitude_ap);
diff --git a/src/logs.cpp b/src/logs.cpp
index c1e27ca3b..e932eb8ed 100644
--- a/src/logs.cpp
+++ b/src/logs.cpp
@@ -102,7 +102,7 @@ const pm_char * openLogs()
 #endif
 
 #if defined(FRSKY_HUB)
-    if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON)
+    if (g_model.frsky.usrProto == USR_PROTO_FRSKY)
       f_puts("GPS Date,GPS Time,Long,Lat,Course,GPS Speed,GPS Alt,Baro Alt,Temp1,Temp2,RPM,Fuel,Volts,AccelX,AccelY,AccelZ,", &g_oLogFile);
 #endif
 
@@ -171,7 +171,7 @@ void writeLogs()
 #endif
 
 #if defined(FRSKY_HUB)
-      if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON) {
+      if (g_model.frsky.usrProto == USR_PROTO_FRSKY) {
         f_printf(&g_oLogFile, "%4d-%02d-%02d,", frskyData.hub.year+2000, frskyData.hub.month, frskyData.hub.day);
         f_printf(&g_oLogFile, "%02d:%02d:%02d,", frskyData.hub.hour, frskyData.hub.min, frskyData.hub.sec);
         f_printf(&g_oLogFile, "%03d.%04d%c,", frskyData.hub.gpsLongitude_bp, frskyData.hub.gpsLongitude_ap,
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index d3151b251..30fc077ab 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -3337,7 +3337,7 @@ void menuModelTelemetry(uint8_t event)
       case ITEM_TELEMETRY_USR_PROTO:
         lcd_putsLeft(y, STR_PROTO);
         lcd_putsiAtt(TELEM_COL2, y, STR_VTELPROTO, g_model.frsky.usrProto, attr);
-        if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.usrProto, 0, 3);
+        if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.usrProto, 0, USR_PROTO_LAST);
         break;
 
       case ITEM_TELEMETRY_USR_BLADES:
diff --git a/src/myeeprom.h b/src/myeeprom.h
index 6e8477ab2..b981ebe64 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -122,12 +122,6 @@ enum BeeperMode {
   int8_t   speakerVolume
 #endif
 
-enum AdcInput {
-  e_adc_single,
-  e_adc_osmp,
-  e_adc_filtered
-};
-
 enum BacklightMode {
   e_backlight_mode_off = 0,
   e_backlight_mode_keys,
@@ -172,7 +166,7 @@ PACK(typedef struct t_EEGeneral {
   uint8_t   preBeep:1;
   SPLASH_MODE; /* 3bits */
   int8_t    hapticMode:2;    // -2=quiet, -1=only alarms, 0=no keys, 1=all
-  uint8_t   filterInput;
+  uint8_t   spare3;
   uint8_t   lightAutoOff;
   uint8_t   templateSetup;  //RETA order according to chout_ar array 
   int8_t    PPM_Multiplier;
@@ -458,7 +452,8 @@ enum VarioSource {
   VARIO_SOURCE_DATA = VARIO_SOURCE_FIRST,
   VARIO_SOURCE_A1,
   VARIO_SOURCE_A2,
-  VARIO_SOURCE_LAST = VARIO_SOURCE_A2,
+  VARIO_SOURCE_HALCYON,
+  VARIO_SOURCE_LAST = VARIO_SOURCE_HALCYON,
 };
 
 PACK(typedef struct t_FrSkyBarData {
@@ -478,9 +473,9 @@ typedef union t_FrSkyScreenData {
 
 enum FrskyUsrProtocols {
   USR_PROTO_NONE,
-  USR_PROTO_FRSKY_HUB,
+  USR_PROTO_FRSKY,
   USR_PROTO_WS_HOW_HIGH,
-  USR_PROTO_HALCYON,
+  USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
 };
 
 enum FrskySource {
diff --git a/src/translations/cz.h b/src/translations/cz.h
index 5afaebb0e..d8bacefd7 100644
--- a/src/translations/cz.h
+++ b/src/translations/cz.h
@@ -172,8 +172,8 @@
 #define LEN_VOLTSRC            "\003"
 #define TR_VOLTSRC             "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC           "\004"
-#define TR_VARIOSRC            "Data""A1\0 ""A2\0"
+#define LEN_VARIOSRC           "\005"
+#define TR_VARIOSRC            "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
 #define LEN_VSCREEN            "\010"
 #define TR_VSCREEN             "Hodnota ""Ukazatel"
diff --git a/src/translations/de.h b/src/translations/de.h
index 958341e89..7bfb30227 100644
--- a/src/translations/de.h
+++ b/src/translations/de.h
@@ -173,11 +173,11 @@
 #define LEN_VOLTSRC                     "\003"
 #define TR_VOLTSRC                      "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC                    "\005"
-#define TR_VARIOSRC                     "Daten""A1\0  ""A2\0  "
+#define LEN_VARIOSRC                    "\007"
+#define TR_VARIOSRC                     "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
-#define LEN_VSCREEN      								"\004"
-#define TR_VSCREEN       								"Wert""Str."
+#define LEN_VSCREEN  			"\004"
+#define TR_VSCREEN   			"Wert""Str."
 
 #define LEN_GPSFORMAT                   "\004"
 #define TR_GPSFORMAT                    "HMS NMEA"
diff --git a/src/translations/en.h b/src/translations/en.h
index 7ada1f6aa..4ef18fa86 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -182,13 +182,13 @@
 #define TR_VALARMFN      "<>"
 
 #define LEN_VTELPROTO    "\007"
-#define TR_VTELPROTO     "None\0  ""Hub\0   ""WSHHigh""Halcyon"
+#define TR_VTELPROTO     "None\0  ""Hub\0   ""WSHHigh"
 
 #define LEN_VOLTSRC      "\003"
 #define TR_VOLTSRC       "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "Data""A1\0 ""A2\0"
+#define LEN_VARIOSRC     "\007"
+#define TR_VARIOSRC      "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
 #define LEN_VSCREEN      "\004"
 #define TR_VSCREEN       "Nums""Bars"
diff --git a/src/translations/es.h b/src/translations/es.h
index 7469146c7..cf803a7d2 100644
--- a/src/translations/es.h
+++ b/src/translations/es.h
@@ -165,8 +165,8 @@
 #define LEN_VOLTSRC      "\003"
 #define TR_VOLTSRC       "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "Data""A1\0 ""A2\0"
+#define LEN_VARIOSRC     "\007"
+#define TR_VARIOSRC      "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
 #define LEN_VSCREEN      "\004"
 #define TR_VSCREEN       "Nums""Bars"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index e8c7a577e..025318921 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -173,8 +173,8 @@
 #define LEN_VOLTSRC      "\003"
 #define TR_VOLTSRC       "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "Data""A1\0 ""A2\0"
+#define LEN_VARIOSRC     "\007"
+#define TR_VARIOSRC      "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
 #define LEN_VSCREEN      "\004"
 #define TR_VSCREEN       "Val.""Bars"
diff --git a/src/translations/it.h b/src/translations/it.h
index 9c56cb047..9615c7c85 100644
--- a/src/translations/it.h
+++ b/src/translations/it.h
@@ -171,8 +171,8 @@
 #define LEN_VOLTSRC      "\003"
 #define TR_VOLTSRC       "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "Data""A1\0 ""A2\0"
+#define LEN_VARIOSRC     "\007"
+#define TR_VARIOSRC      "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
 #define LEN_VSCREEN      "\004"
 #define TR_VSCREEN       "Nums""Bars"
diff --git a/src/translations/pt.h b/src/translations/pt.h
index 1850fdb02..25b4f05d6 100644
--- a/src/translations/pt.h
+++ b/src/translations/pt.h
@@ -173,8 +173,8 @@
 #define LEN_VOLTSRC      "\003"
 #define TR_VOLTSRC       "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC     "\004"
-#define TR_VARIOSRC      "Data""A1\0 ""A2\0"
+#define LEN_VARIOSRC     "\007"
+#define TR_VARIOSRC      "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
 #define LEN_VSCREEN      "\004"
 #define TR_VSCREEN       "Nums""Bars"
diff --git a/src/translations/se.h b/src/translations/se.h
index ea4c07a92..55570ae29 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -173,8 +173,8 @@
 #define LEN_VOLTSRC            "\003"
 #define TR_VOLTSRC             "---""A1\0""A2\0""FAS""Cel"
 
-#define LEN_VARIOSRC           "\004"
-#define TR_VARIOSRC            "Data""A1\0 ""A2\0"
+#define LEN_VARIOSRC           "\007"
+#define TR_VARIOSRC            "FrSky\0 ""A1\0    ""A2\0    ""Halcyon"
 
 #define LEN_VSCREEN            "\004"
 #define TR_VSCREEN             "Nums""Bars"