scrape
/
ubitx-upr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change delaytimes via cat

This commit is contained in:
phdlee 2018-01-17 14:05:20 +09:00
parent 924db221f4
commit 587d4854c3
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ubitx_20/cat_libs.ino
View File

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

9
ubitx_20/ubitx_menu.ino
View File

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