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

Updates to be compatible with iopcomm.h/iopcomm.cpp, and with the new

Browse Source 
two-tone test mode.
This commit is contained in:
Rob French
2020-05-16 23:51:46 -05:00
parent c8b2110052
commit 681e01d019
4 changed files with 81 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ubitx_20/ubitx_menu.ino
View File

@@ -149,6 +149,7 @@ byte modeToByte(){
//autoSetModebyFreq : 0
//autoSetModebyFreq : 1, if (modValue is not set, set mode by frequency)
void byteToMode(byte modeValue, byte autoSetModebyFreq){
isTest = false; // test never settable from EEPROM
isUSB = false;
cwMode = 0;
digiMode = 0;
@@ -181,6 +182,15 @@ void byteToMode(byte modeValue, byte autoSetModebyFreq){
isUSB = true;
digiMode = 1;
break;
/*
case 8: // TTL
isUSB = false;
break;
case 9: // TTU
isUSB = true;
break;
*/
}
}
/* if (modeValue == 4) {
@@ -973,7 +983,7 @@ void menuSelectMode(int btn){
}
else
{
//LSB, USB, CWL, CWU, DGL, DGU
//LSB, USB, CWL, CWU, DGL, DGU, TTL, TTU
if (cwMode == 0) {
if (isUSB == 0) {
selectModeType = 0; // LSB
@@ -983,6 +993,10 @@ void menuSelectMode(int btn){
// modify if digital mode is set
if (digiMode > 0) {
selectModeType += (3 + digiMode);
// modify if two-tone test mode is set
} else if (isTest > 0) {
selectModeType += 5;
}
} else if (cwMode == 1) {
selectModeType = 2; // CWL
@@ -999,29 +1013,30 @@ void menuSelectMode(int btn){
selectModeType = 3;*/
beforeMode = selectModeType;
selectModeType = getValueByKnob(11, selectModeType, 0, 5, 1, " LSB USB CWL CWU DGL DGU ", 4); //3 : Select Mode, targetValue, minKnobValue, maxKnobValue, stepSize
selectModeType = getValueByKnob(11, selectModeType, 0, 7, 1, " LSB USB CWL CWU DGL DGU TTL TTU", 4); //3 : Select Mode, targetValue, minKnobValue, maxKnobValue, stepSize
if (beforeMode != selectModeType)
{
//printLineF1(F("Changed Mode"));
if (selectModeType == 0) {
cwMode = 0; isUSB = 0; digiMode = 0;
}
else if (selectModeType == 1) {
cwMode = 0; isUSB = 1; digiMode = 0;
}
else if (selectModeType == 2) {
cwMode = 1; digiMode = 0;
}
else if (selectModeType == 3) {
cwMode = 2; digiMode = 0;
cwMode = 0; isUSB = 0; digiMode = 0; isTest = 0;
} else if (selectModeType == 1) {
cwMode = 0; isUSB = 1; digiMode = 0; isTest = 0;
} else if (selectModeType == 2) {
cwMode = 1; digiMode = 0; isTest = 0;
} else if (selectModeType == 3) {
cwMode = 2; digiMode = 0; isTest = 0;
} else if (selectModeType == 4) {
cwMode = 0; isUSB = 0; digiMode = 1;
cwMode = 0; isUSB = 0; digiMode = 1; isTest = 0;
} else if (selectModeType == 5) {
cwMode = 0; isUSB = 1; digiMode = 1;
cwMode = 0; isUSB = 1; digiMode = 1; isTest = 0;
} else if (selectModeType == 6) {
cwMode = 0; isUSB = 0; digiMode = 0; isTest = 1;
} else if (selectModeType == 7) {
cwMode = 0; isUSB = 1; digiMode = 0; isTest = 1;
}
// KC4UPR: sending mode to IOP
iopSendMode(cwMode, isUSB, digiMode);
iopSendMode(cwMode, isUSB, digiMode, isTest);
FrequencyToVFO(1);
}