From 31a7f795692501624882b9ad5005aa35b24d7c1f Mon Sep 17 00:00:00 2001
From: phdlee <kd8cec@gmail.com>
Date: Tue, 20 Mar 2018 21:41:24 +0900
Subject: [PATCH] ifshift store, cw mode shift change

---
 ubitx_20/ubitx_20.ino   | 45 +++++++++++++++++++++++++++++------------
 ubitx_20/ubitx_menu.ino |  8 +++++---
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/ubitx_20/ubitx_20.ino b/ubitx_20/ubitx_20.ino
index 258240d..0e61328 100644
--- a/ubitx_20/ubitx_20.ino
+++ b/ubitx_20/ubitx_20.ino
@@ -181,6 +181,12 @@ int count = 0;          //to generally count ticks, loops, etc
                               //(7:Enable / Disable //0: enable, 1:disable, (default is applied shift)
                               //6 : 0 : Adjust Pulus, 1 : Adjust Minus
                               //0~5: Adjust Value : * 10 = Adjust Value (0~300)
+#define COMMON_OPTION0  360  //0: Confirm : CW Frequency Shift
+                              //1 : IF Shift Save
+                              //
+                              //
+                              //
+#define IF_SHIFTVALUE   363                                
 
 #define DISPLAY_OPTION1  361   //Display Option1
 #define DISPLAY_OPTION2  362   //Display Option2
@@ -273,6 +279,7 @@ byte isTxType = 0;    //000000[0 - isSplit] [0 - isTXStop]
 long arTuneStep[5];
 byte tuneStepIndex; //default Value 0, start Offset is 0 because of check new user
 
+byte commonOption0 = 0;
 byte displayOption1 = 0;
 byte displayOption2 = 0;
 
@@ -331,7 +338,7 @@ byte line2DisplayStatus = 0;  //0:Clear, 1 : menu, 1: DisplayFrom Idle,
 char lcdMeter[17];
 
 byte isIFShift = 0;     //1 = ifShift, 2 extend
-long ifShiftValue = 0;  //
+int ifShiftValue = 0;  //
                               
 /**
  * Below are the basic functions that control the uBitx. Understanding the functions before 
@@ -896,6 +903,7 @@ void initSettings(){
   }
     
 
+  EEPROM.get(COMMON_OPTION0, commonOption0);
   EEPROM.get(DISPLAY_OPTION1, displayOption1);
   EEPROM.get(DISPLAY_OPTION2, displayOption2);
 
@@ -983,18 +991,29 @@ void initSettings(){
   //Display Type for CW mode
   isShiftDisplayCWFreq = EEPROM.read(CW_DISPLAY_SHIFT);
 
-  //Adjust CW Mode Freq
-  shiftDisplayAdjustVal = (isShiftDisplayCWFreq & 0x3F) * 10;
+  //Enable / Diable Check for CW Display Cofiguration Group 
+  if ((commonOption0 & 0x80) != 0x00)
+  {
+    //Adjust CW Mode Freq
+    shiftDisplayAdjustVal = (isShiftDisplayCWFreq & 0x3F) * 10;
+  
+    //check Minus
+    if ((isShiftDisplayCWFreq & 0x40) == 0x40)
+      shiftDisplayAdjustVal = shiftDisplayAdjustVal * -1;
+  
+   //Shift Display Check (Default : 0)
+    if ((isShiftDisplayCWFreq & 0x80) == 0)  //Enabled
+      isShiftDisplayCWFreq = 1;
+    else    //Disabled
+      isShiftDisplayCWFreq = 0;
+  }
 
-  //check Minus
-  if ((isShiftDisplayCWFreq & 0x40) == 0x40)
-    shiftDisplayAdjustVal = shiftDisplayAdjustVal * -1;
-
- //Shift Display Check (Default : 0)
-  if ((isShiftDisplayCWFreq & 0x80) == 0)  //Enabled
-    isShiftDisplayCWFreq = 1;
-  else    //Disabled
-    isShiftDisplayCWFreq = 0;
+   //Stored IF Shift Option
+  if ((commonOption0 & 0x40) != 0x00)
+  {
+    EEPROM.get(IF_SHIFTVALUE, ifShiftValue);
+    isIFShift = ifShiftValue != 0;
+  }
 
   //default Value (for original hardware)
   if (cwAdcSTFrom >= cwAdcSTTo)
@@ -1120,7 +1139,7 @@ void setup()
   //Serial.begin(9600);
   lcd.begin(16, 2);
   //printLineF(1, F("CECBT v1.05")); 
-  printLineF(1, F("CE v1.059W")); 
+  printLineF(1, F("CE v1.06")); 
 
   Init_Cat(38400, SERIAL_8N1);
   initMeter(); //not used in this build
diff --git a/ubitx_20/ubitx_menu.ino b/ubitx_20/ubitx_menu.ino
index fc15625..fece070 100644
--- a/ubitx_20/ubitx_menu.ino
+++ b/ubitx_20/ubitx_menu.ino
@@ -209,7 +209,7 @@ void menuIFSSetup(int btn){
         knob = enc_read();
         if (knob != 0){
           if (knob < 0)
-            ifShiftValue -= 50l;
+            ifShiftValue -= 50;
           else if (knob > 0)
             ifShiftValue += 50;
 
@@ -222,6 +222,7 @@ void menuIFSSetup(int btn){
       if (btnDown() || ifShiftValue == 0)
       {
         isIFShift = 0;
+        ifShiftValue = 0;
         //printLineF2(F("IF Shift is OFF"));
         //printLineF2(F("OFF"));
         //clearLine2();
@@ -229,9 +230,10 @@ void menuIFSSetup(int btn){
         SetCarrierFreq();
         //delay_background(1500, 0);
       }
+
+      //Store IF Shiift
+      EEPROM.put(IF_SHIFTVALUE, ifShiftValue);
       
-      //menuOn = 0;
-      //printLine2ClearAndUpdate();
       menuClearExit(0);
   }
 }