From d125e408f21245bba1ff8c4b8c13b5d1c6310089 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Tue, 3 Dec 2013 22:29:22 +0100
Subject: [PATCH] FAS offset now an option for M64 only

---
 radio/src/Makefile            |  8 ++++++++
 radio/src/gui/menu_model.cpp  | 16 +++++++++++++---
 radio/src/telemetry/frsky.cpp |  2 ++
 radio/src/translations.cpp    |  3 +++
 radio/src/translations.h      |  3 +++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/radio/src/Makefile b/radio/src/Makefile
index 73515c551..75cfb9045 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -159,6 +159,10 @@ PPM_UNIT = PERCENT_PREC1
 # Values = YES, NO
 FRSKY_HUB = YES
 
+# FrSky FAS current sensor offset compensation
+# Values = YES, NO
+FAS_OFFSET = NO
+
 # WS HowHigh 
 # Values = YES, NO
 WS_HOW_HIGH = YES
@@ -332,6 +336,10 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
   ifeq ($(SP22), YES)
    CPPDEFS += -DSP22
   endif
+  
+  ifeq ($(FAS_OFFSET), YES)
+   CPPDEFS += -DFAS_OFFSET
+  endif
 endif
 
 ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128))
diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp
index 855e3d0e0..68778873a 100644
--- a/radio/src/gui/menu_model.cpp
+++ b/radio/src/gui/menu_model.cpp
@@ -5167,7 +5167,9 @@ enum menuModelTelemetryItems {
 #endif
   ITEM_TELEMETRY_USR_VOLTAGE_SOURCE,
   ITEM_TELEMETRY_USR_CURRENT_SOURCE,
+#if defined(FAS_OFFSET) || !defined(CPUM64)
   ITEM_TELEMETRY_FAS_OFFSET,
+#endif
 #if defined(CPUARM)
   ITEM_TELEMTETRY_PERSISTENT_MAH,
 #endif
@@ -5248,9 +5250,15 @@ enum menuModelTelemetryItems {
   #define VARIO_RANGE_ROWS 3
 #endif
 
+#if defined(FAS_OFFSET) || !defined(CPUM64)
+  #define IF_FAS_OFFSET(x) x,
+#else
+  #define IF_FAS_OFFSET(x) 
+#endif
+
 void menuModelTelemetry(uint8_t event)
 {
-  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, 0, IF_CPUARM(0) IF_VARIO(LABEL(Vario)) IF_VARIO(0) IF_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, IF_CPUARM(SCREEN_TYPE_ROWS) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) });
+  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, IF_FAS_OFFSET(0) IF_CPUARM(0) IF_VARIO(LABEL(Vario)) IF_VARIO(0) IF_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, IF_CPUARM(SCREEN_TYPE_ROWS) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) });
 
   uint8_t sub = m_posVert - 1;
 
@@ -5420,7 +5428,8 @@ void menuModelTelemetry(uint8_t event)
         lcd_putsiAtt(TELEM_COL2, y, STR_VOLTSRC, g_model.frsky.currentSource, attr);
         if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, g_model.frsky.currentSource, 3);
         break;
-
+        
+#if defined(FAS_OFFSET) || !defined(CPUM64)
       case ITEM_TELEMETRY_FAS_OFFSET:
       	lcd_putsLeft(y, STR_FAS_OFFSET);
       	lcd_outdezAtt(TELEM_COL2, y, g_model.frsky.fasOffset, attr|LEFT|PREC1);
@@ -5428,7 +5437,8 @@ void menuModelTelemetry(uint8_t event)
         lcd_putc(TELEM_COL2+8*FW, y, 'A');
       	if (attr) g_model.frsky.fasOffset = checkIncDec(event, g_model.frsky.fasOffset, -15, 15, EE_MODEL);
         break;
-        
+#endif
+
 #if defined(CPUARM)
       case ITEM_TELEMTETRY_PERSISTENT_MAH:
         g_model.frsky.mAhPersistent = onoffMenuItem(g_model.frsky.mAhPersistent, TELEM_COL2, y, STR_PERSISTENT_MAH, attr, event);
diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 892e75056..8e2a4bda2 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -191,10 +191,12 @@ void parseTelemHubByte(uint8_t byte)
       break;
 
     case offsetof(FrskySerialData, current):
+#if defined(FAS_OFFSET) || !defined(CPUM64)
       if(((int16_t)frskyData.hub.current + g_model.frsky.fasOffset)>0)
         frskyData.hub.current += g_model.frsky.fasOffset;
       else
         frskyData.hub.current = 0;
+#endif
       if (frskyData.hub.current > frskyData.hub.maxCurrent)
         frskyData.hub.maxCurrent = frskyData.hub.current;
       break;
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 6749c8d2f..1c5c07f2a 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -266,7 +266,10 @@ const pm_char STR_EEPROMFORMATTING[] PROGMEM = TR_EEPROMFORMATTING;
 const pm_char STR_EEPROMOVERFLOW[] PROGMEM = TR_EEPROMOVERFLOW;
 const pm_char STR_TRIMS2OFFSETS[] PROGMEM = TR_TRIMS2OFFSETS;
 const pm_char STR_MENURADIOSETUP[] PROGMEM = TR_MENURADIOSETUP;
+
+#if defined(FAS_OFFSET) || !defined(CPUM64)
 const pm_char STR_FAS_OFFSET[] PROGMEM = TR_FAS_OFFSET;
+#endif
 
 #if defined(CPUM2560) || defined(CPUARM)
 const pm_char STR_MENUDATEANDTIME[] PROGMEM = TR_MENUDATEANDTIME;
diff --git a/radio/src/translations.h b/radio/src/translations.h
index 7f93d1e4d..09f83bd54 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -447,7 +447,10 @@ extern const pm_char STR_MENUGLOBALVARS[];
 extern const pm_char STR_INVERT_THR[];
 extern const pm_char STR_AND_SWITCH[];
 extern const pm_char STR_CF[];
+
+#if defined(FAS_OFFSET) || !defined(CPUM64)
 extern const pm_char STR_FAS_OFFSET[];
+#endif
 
 #if defined(DSM2) || defined(PXX)
 extern const pm_char STR_RXNUM[];