change delaytimes via cat

README.md

@@ -1,67 +1,11 @@
-#IMPORTANT INFORMATION
-----------------------------------------------------------------------------
-- Beta 0.26 and Beta 0.261, Beta 0.262, Beta 0.27 is complete test
-- You can download and use it.
-
-#NOTICE
-----------------------------------------------------------------------------
-I received uBITX a month ago and found that many features are required, and began coding with the idea of implementing minimal functionality as a general hf transceiver rather than an experimental device.
-
-- fixed bugs...
-- Diallock for uBITX's sensitive encoders
-- built in softare Memory keyer and cw options control for CW communication
-- Implementation of CAT communication protocol for Digital Communication (as FT8, JT65, etc)
-- Delay Options for external Linear.
-- and more...
-
-Most of the basic functions of the HF transceiver I thought were implemented.
-The minimum basic specification for uBITX to operate as a radio, I think it is finished.
-So I will release the 0.27 version and if I do not see the bug anymore, I will try to change the version name to 1.0.
-Now uBITX is an HF radio and will be able to join you in your happy hams life.
-Based on this source, you can use it by adding functions.
-
-I am going to do a new project based on this source, linking with WSPR, WSJT-X and so on.
-Of course, this repository is still running. If you have any bugs or ideas, please feel free to email me.
-
-http://www.hamskey.com
-
-DE KD8CEC
-kd8cec@gmail.com
-
 #uBITX
 uBITX firmware, written for the Raduino/Arduino control of uBITX transceivers
 This project is based on https://github.com/afarhan/ubitx and all copyright is inherited.
 The copyright information of the original is below.
 
 KD8CEC
-----------------------------------------------------------------------------
-Prepared or finished tasks for the next version
-  - Most of them are implemented and included in version 0.27.
-  - User Interface on LCD -> Option by user (not need)
-  - Include WSPR Beacone function - (implement other new repository)
-    complete experiment
-    need solve : Big code size (over 100%, then remove some functions for experment)
-                 need replace Si5351 Library (increase risk and need more beta tester)
-                 W3PM sent me his wonderful source - using BITX, GPS 
-                  
 ----------------------------------------------------------------------------
 ## REVISION RECORD
-0.27 
-   (First alpha test version, This will be renamed to the major version 1.0)
- - Dual VFO Dial Lock (vfoA Dial lock)
- - Support Ham band on uBITX
-   default Hamband is regeion1 but customize by uBITX Manager Software
- - Advanced ham band options (Tx control) for use in all countries. You can adjust it yourself.   
- - Convenience of band movement
-
-0.26
-  - only Beta tester released & source code share
-  - find a bug on none initial eeprom uBITX - Fixed (Check -> initialized & compatible original source code)
-  - change the version number 0.26 -> 0.27
-  - Prevent overflow bugs
-  - bug with linux based Hamlib (raspberry pi), It was perfect for the 0.224 version, but there was a problem for the 0.25 version.  
-    On Windows, ham deluxe, wsjt-x, jt65-hf, and fldigi were successfully run. Problem with Raspberry pi.
-
 0.25
   - Beta Version Released
     http://www.hamskey.com/2018/01/release-beta-version-of-cat-support.html

ubitx_20/cat_libs.ino

@@ -181,7 +181,7 @@ void CatSetPTT(boolean isPTTOn, byte fromType)
 void CatVFOToggle(boolean isSendACK, byte fromType)
 {
   if (fromType != 2 && fromType != 3) {
-    menuVfoToggle(1);
+    menuVfoToggle(1, 0);
   }  
 
   if (isSendACK)
@@ -470,8 +470,8 @@ void WriteEEPRom_FT817(byte fromType)
         sideTone = (sideTonePitch * 50 + 300) + sideToneSub;
         printLineF2(F("Sidetone set! CAT"));
         EEPROM.put(CW_SIDETONE, sideTone);
-        delay(500);
-        printLine2("");
+        delay(300);                       //If timeout errors occur in the calling software, remove them
+        printLine2("");                   //Ham radio deluxe is the only one that supports this feature yet. and ham radio deluxe has wait time as greater than 500ms
       }
       break;
 
@@ -482,8 +482,8 @@ void WriteEEPRom_FT817(byte fromType)
         sideTone = (sideTonePitch * 50 + 300) + sideToneSub;
         printLineF2(F("Sidetone set! CAT"));
         EEPROM.put(CW_SIDETONE, sideTone);
-        delay(500);
-        printLine2("");
+        delay(300);                   //If timeout errors occur in the calling software, remove them
+        printLine2("");               //Ham radio deluxe is the only one that supports this feature yet. and ham radio deluxe has wait time as greater than 500ms
       }
       break;
 
@@ -502,7 +502,7 @@ void WriteEEPRom_FT817(byte fromType)
       cwDelayTime = CAT_BUFF[2];
       printLineF2(F("CW Speed set!"));
       EEPROM.put(CW_DELAY, cwDelayTime);
-      delay(500);
+      delay(300);
       printLine2("");
       break;
     case 0x62 : //
@@ -511,7 +511,7 @@ void WriteEEPRom_FT817(byte fromType)
       cwSpeed = 1200 / ((CAT_BUFF[2] & 0x3F) + 4);
       printLineF2(F("CW Speed set!"));
       EEPROM.put(CW_SPEED, cwSpeed);
-      delay(500);
+      delay(300);
       printLine2("");
 
       break;
@@ -629,7 +629,6 @@ void Check_Cat(byte fromType)
   }
   else if (Serial.available() < 5)
   {
-    /*
     //First Arrived
     if (rxBufferCheckCount == 0)
     {
@@ -649,8 +648,6 @@ void Check_Cat(byte fromType)
       rxBufferCheckCount = Serial.available();
       rxBufferArriveTime = millis() + CAT_RECEIVE_TIMEOUT;  //Set time for timeout
     }
-    */
-    
     return;
   }
 

ubitx_20/ubitx_20.ino

@@ -344,7 +344,7 @@ unsigned long delayBeforeTime = 0;
 byte delay_background(unsigned delayTime, byte fromType){ //fromType : 4 autoCWKey -> Check Paddle
   delayBeforeTime = millis();
 
-  while (millis() - delayBeforeTime <= delayTime) {
+  while (millis() <= delayBeforeTime + delayTime) {
 
     if (fromType == 4)
     {

ubitx_20/ubitx_menu.ino

@@ -155,7 +155,7 @@ void byteWithFreqToMode(byte modeValue){
     isUSB = 0;
 }
 
-void menuVfoToggle(int btn)
+void menuVfoToggle(int btn, char isUseDelayTime)
 {
   if (!btn){
     if (vfoActive == VFO_A)
@@ -189,8 +189,9 @@ void menuVfoToggle(int btn)
 
       ritDisable();
 
-      //updateDisplay();
-      delay_background(500, 0);
+      if (isUseDelayTime == 1)        //Found Issue in wsjt-x Linux 32bit 
+        delay_background(500, 0);
+        
       printLine2ClearAndUpdate();
       //exit the menu
       menuOn = 0;
@@ -803,7 +804,7 @@ void doMenu(){
     else if (select < 20)
       menuRitToggle(btnState);
     else if (select < 30)
-      menuVfoToggle(btnState);
+      menuVfoToggle(btnState, 1);
     else if (select < 40)
       menuSidebandToggle(btnState);
     else if (select < 50)