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

Fix gain for agc off. Add distinction between button long-press and continued press.

pull/41/head
guido 2020-11-09 17:47:05 +01:00
rodzic 1cf21631dd
commit ec5d75e8bb
1 zmienionych plików z 16 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

26
QCX-SSB.ino
Wyświetl plik

@ -2247,11 +2247,11 @@ inline int16_t slow_dsp(int16_t ac)
ac = process_agc(ac); ac = process_agc(ac);
ac = ac >> (16-volume); ac = ac >> (16-volume);
} else { } else {
ac = ac >> (16-volume); //ac = ac >> (16-volume);
/* if(volume <= 9) // if no AGC allow volume control to boost weak signals if(volume <= 13) // if no AGC allow volume control to boost weak signals
ac = ac >> (9-volume); ac = ac >> (13-volume);
else else
ac = ac << (volume-9); */ ac = ac << (volume-13);
} }
if(nr) ac = process_nr(ac); if(nr) ac = process_nr(ac);
@ -4223,9 +4223,9 @@ void loop()
#endif //KEYER #endif //KEYER
if((semi_qsk_timeout) && (millis() > semi_qsk_timeout)){ switch_rxtx(0); } // delayed QSK RX if((semi_qsk_timeout) && (millis() > semi_qsk_timeout)){ switch_rxtx(0); } // delayed QSK RX
enum event_t { BL=0x10, BR=0x20, BE=0x30, SC=0x01, DC=0x02, PL=0x04, PT=0x0C }; // button-left, button-right and button-encoder; single-click, double-click, push-long, push-and-turn enum event_t { BL=0x10, BR=0x20, BE=0x30, SC=0x01, DC=0x02, PL=0x04, PLC=0x05, PT=0x0C }; // button-left, button-right and button-encoder; single-click, double-click, push-long, push-and-turn
if(inv ^ digitalRead(BUTTONS)){ // Left-/Right-/Rotary-button (while not already pressed) if(inv ^ digitalRead(BUTTONS)){ // Left-/Right-/Rotary-button (while not already pressed)
if(!(event & PL)){ // hack: if there was long-push before, then fast forward if(!((event & PL) || (event & PLC))){ // hack: if there was long-push before, then fast forward
uint16_t v = analogSafeRead(BUTTONS); uint16_t v = analogSafeRead(BUTTONS);
event = SC; event = SC;
int32_t t0 = millis(); int32_t t0 = millis();
@ -4244,10 +4244,11 @@ void loop()
} // Max. voltages at ADC3 for buttons L,R,E: 3.76V;4.55V;5V, thresholds are in center } // Max. voltages at ADC3 for buttons L,R,E: 3.76V;4.55V;5V, thresholds are in center
event |= (v < (4.2 * 1024.0 / 5.0)) ? BL : (v < (4.8 * 1024.0 / 5.0)) ? BR : BE; // determine which button pressed based on threshold levels event |= (v < (4.2 * 1024.0 / 5.0)) ? BL : (v < (4.8 * 1024.0 / 5.0)) ? BR : BE; // determine which button pressed based on threshold levels
} else { // hack: fast forward handling } else { // hack: fast forward handling
event = (event&0xf0) | ((encoder_val) ? PT : PL); // only alternate bewteen push-long/turn when applicable event = (event&0xf0) | ((encoder_val) ? PT : PLC/*PL*/); // only alternate bewteen push-long/turn when applicable
} }
switch(event){ switch(event){
case BL|PL: // Called when menu button released case BL|PL: // Called when menu button pressed
case BL|PLC: // or kept pressed
menumode = 2; menumode = 2;
break; break;
case BL|PT: case BL|PT:
@ -4346,7 +4347,12 @@ void loop()
} }
change = true; change = true;
break; break;
case BR|PT: break; case BR|PLC: // while pressed long continues
case BE|PLC:
break;
case BR|PT:
//encoder_val = 0; lcd.setCursor(0, 0); lcd.print(millis());
break;
case BE|SC: case BE|SC:
if(!menumode) if(!menumode)
stepsize_change(+1); stepsize_change(+1);
@ -4358,7 +4364,7 @@ void loop()
} }
break; break;
case BE|DC: case BE|DC:
delay(100); //delay(100);
bandval++; bandval++;
if(bandval >= N_BANDS) bandval = 0; if(bandval >= N_BANDS) bandval = 0;
stepsize = STEP_1k; stepsize = STEP_1k;