mirror
/
ubitx4
kopia lustrzana https://github.com/afarhan/ubitx4
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Ian's code fixes, mostly on the UI changes

master
Farhan 2018-05-22 20:09:28 +05:30
rodzic 353a50899b
commit c8b1c015d4
2 zmienionych plików z 38 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

60
ubitx_menu.ino
Wyświetl plik

@ -196,19 +196,25 @@ void menuSidebandToggle(int btn){
printLine2("LSB \x7E USB"); printLine2("LSB \x7E USB");
} }
else { else {
if (isUSB == true){ if (isUSB == true){
isUSB = false; isUSB = false;
printLine2("LSB Selected"); printLine2("LSB Selected");
active_delay(500); active_delay(500);
printLine2(""); printLine2("");
} }
else { else {
isUSB = true; isUSB = true;
printLine2("USB Selected"); printLine2("USB Selected");
active_delay(500); active_delay(500);
printLine2(""); printLine2("");
} }
//Added by KD8CEC
if (vfoActive == VFO_B){
isUsbVfoB = isUSB;
}
else {
isUsbVfoB = isUSB;
}
updateDisplay(); updateDisplay();
menuOn = 0; menuOn = 0;
} }
@ -224,17 +230,18 @@ void menuSplitToggle(int btn){
printLine2("Split On \x7E Off"); printLine2("Split On \x7E Off");
} }
else { else {
if (splitOn == 1){ if (splitOn == 1){
splitOn = 0; splitOn = 0;
printLine2("Split ON"); printLine2("Split ON");
} }
else { else {
splitOn = 1; splitOn = 1;
if (ritOn == 1) if (ritOn == 1)
ritOn = 0; ritOn = 0;
printLine2("Split Off"); printLine2("Split Off");
} }
active_delay(500); active_delay(500);
printLine2("");
updateDisplay(); updateDisplay();
menuOn = 0; menuOn = 0;
} }
@ -506,7 +513,7 @@ void menuSetupCwTone(int btn){
tone(CW_TONE, sideTone); tone(CW_TONE, sideTone);
//disable all clock 1 and clock 2 //disable all clock 1 and clock 2
while (digitalRead(PTT) == HIGH || !btnDown()) while (digitalRead(PTT) == HIGH && !btnDown())
{ {
knob = enc_read(); knob = enc_read();
@ -616,6 +623,11 @@ void menuSetupKeyer(int btn){
printLine1("Keyer Set!"); printLine1("Keyer Set!");
active_delay(600); active_delay(600);
printLine1(""); printLine1("");
//Added KD8CEC
printLine2("");
updateDisplay();
menuOn = 0;
} }
void menuReadADC(int btn){ void menuReadADC(int btn){

4
ubitx_v4.3_code.ino
Wyświetl plik

@ -1,4 +1,4 @@
/** /**
* This source file is under General Public License version 3. * This source file is under General Public License version 3.
* *
* This verision uses a built-in Si5351 library * This verision uses a built-in Si5351 library
@ -337,7 +337,7 @@ void startTx(byte txMode){
else if (vfoActive == VFO_A){ else if (vfoActive == VFO_A){
vfoActive = VFO_B; vfoActive = VFO_B;
frequency = vfoB; frequency = vfoB;
isUSB = isUsbVfoA; isUSB = isUsbVfoB;
} }
} }
setFrequency(frequency); setFrequency(frequency);