From 90405ad9edc9cae5e8d48049261b22f21ba92ec1 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 22 Jan 2013 22:00:56 +0000
Subject: [PATCH] Halcyon could not work!!!

---
 src/frsky.cpp  | 4 ++--
 src/logs.cpp   | 4 ++--
 src/myeeprom.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frsky.cpp b/src/frsky.cpp
index e0d89c735..6accb46a5 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -382,7 +382,7 @@ void processFrskyPacket(uint8_t *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)
+        if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON)
           parseTelemHubByte(packet[i]);
 #endif
 #if defined(WS_HOW_HIGH)
@@ -1444,7 +1444,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) {
+      if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON) {
         // 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 1c623a3d5..c1e27ca3b 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)
+    if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON)
       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) {
+      if (g_model.frsky.usrProto == USR_PROTO_FRSKY_HUB || g_model.frsky.usrProto == USR_PROTO_HALCYON) {
         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/myeeprom.h b/src/myeeprom.h
index 73153be23..6da02c4e8 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -502,7 +502,7 @@ enum FrskySource {
 PACK(typedef struct t_FrSkyData {
   FrSkyChannelData channels[2];
   FrSkyRSSIAlarm rssiAlarms[2];
-  uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
   uint8_t voltsSource;
   uint8_t blades;   // How many blades for RPMs, 0=2 blades, 1=3 blades
   uint8_t currentSource;