Merge pull request #37 from phdlee/version1.080

add comment

VersionInfo.txt

@@ -10,7 +10,7 @@ I am getting a lot of hints from the group.
 Ian KD8CEC
 kd8cec@gmail.com
 ==================================================================
-Files modified in Version1.075 Beta
+Files modified in Version1.08 Beta
 
 1.Delted Files.
 

ubitx_20/ubitx.h

@@ -24,9 +24,9 @@
 //==============================================================================
 //Depending on the type of LCD mounted on the uBITX, uncomment one of the options below.
 //You must select only one.
-#define UBITX_DISPLAY_LCD1602P      //LCD mounted on unmodified uBITX
+#define UBITX_DISPLAY_LCD1602P        //LCD mounted on unmodified uBITX (Parallel)
 //#define UBITX_DISPLAY_LCD1602I        //I2C type 16 x 02 LCD
-//#define UBITX_DISPLAY_LCD1602I_DUAL
+//#define UBITX_DISPLAY_LCD1602I_DUAL   //I2C type 16 x02 LCD Dual
 //#define UBITX_DISPLAY_LCD2004P        //24 x 04 LCD (Parallel)
 //#define UBITX_DISPLAY_LCD2004I        //I2C type 24 x 04 LCD
 
@@ -90,7 +90,6 @@ extern byte I2C_LCD_SECOND_ADDRESS;         //only using Dual LCD Mode
 #define ANALOG_SPARE  (A7)
 #define ANALOG_SMETER (A7)  //by KD8CEC
 
-
 /** 
  *  The second set of 16 pins on the Raduino's bottom connector are have the three clock outputs and the digital lines to control the rig.
  *  This assignment is as follows :

ubitx_20/ubitx_20.ino

@@ -6,7 +6,7 @@
 //    So I put + in the sense that it was improved one by one based on Original Firmware.
 //    This firmware has been gradually changed based on the original firmware created by Farhan, Jack, Jerry and others.
 
-#define FIRMWARE_VERSION_INFO F("+v1.075")  
+#define FIRMWARE_VERSION_INFO F("+v1.080")  
 #define FIRMWARE_VERSION_NUM 0x03       //1st Complete Project : 1 (Version 1.061), 2st Project : 2
 
 /**

ubitx_20/ubitx_lcd_1602.ino

@@ -1,10 +1,7 @@
 /*************************************************************************
   KD8CEC's uBITX Display Routine for LCD1602 Parrel
   1.This is the display code for the default LCD mounted in uBITX.
-  2.Display related functions of uBITX.  Some functions moved from uBITX_Ui.
-  3.uBITX Idle time Processing
-    Functions that run at times that do not affect TX, CW, and CAT
-    It is called in 1/10 time unit.
+  2.Some functions moved from uBITX_Ui.
 -----------------------------------------------------------------------------
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

ubitx_20/ubitx_lcd_1602Dual.ino

@@ -1,10 +1,7 @@
 /*************************************************************************
-  KD8CEC's uBITX Display Routine for LCD1602 Dual LCD by KD8CEC
-  1.This is the display code for the default LCD mounted in uBITX.
-  2.Display related functions of uBITX.  Some functions moved from uBITX_Ui.
-  3.uBITX Idle time Processing
-    Functions that run at times that do not affect TX, CW, and CAT
-    It is called in 1/10 time unit.
+  KD8CEC's uBITX Display Routine for LCD1602 Dual LCD
+  1.This is the display code for the 16x02 Dual LCD
+  2.Some functions moved from uBITX_Ui.
 -----------------------------------------------------------------------------
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

ubitx_20/ubitx_lcd_2004.ino

@@ -1,10 +1,7 @@
 /*************************************************************************
-  KD8CEC's uBITX Display Routine for LCD2004 Parrel
-  1.This is the display code for the default LCD mounted in uBITX.
-  2.Display related functions of uBITX.  Some functions moved from uBITX_Ui.
-  3.uBITX Idle time Processing
-    Functions that run at times that do not affect TX, CW, and CAT
-    It is called in 1/10 time unit.
+  KD8CEC's uBITX Display Routine for LCD2004 Parrel & I2C
+  1.This is the display code for the 20x04 LCD
+  2.Some functions moved from uBITX_Ui.
 -----------------------------------------------------------------------------
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

ubitx_20/ubitx_menu.ino

@@ -271,8 +271,10 @@ void menuCHMemory(int btn, byte isMemoryToVfo){
       if (isMemoryToVfo == 1)
       {
         if (resultFreq > 3000 && resultFreq < 60000000)
-        setFrequency(resultFreq);
+        {
           byteToMode(loadMode, 1);
+          setFrequency(resultFreq);
+        }
       }
       else
       {

ubitx_20/ubitx_ui.ino

@@ -199,7 +199,7 @@ int getBtnStatus(void){
     readButtonValue = readButtonValue / 4;
     //return FKEY_VFOCHANGE;
     for (int i = 0; i < 16; i++)
-      if (KeyValues[i][0] <= readButtonValue && KeyValues[i][1] >= readButtonValue)
+      if (KeyValues[i][2] != 0 && KeyValues[i][0] <= readButtonValue && KeyValues[i][1] >= readButtonValue)
         return KeyValues[i][2];
         //return i;
   }