odie/ubitxv6
1
0
Fork 0
mirror of https://codeberg.org/mclemens/ubitxv6.git synced 2024-07-19 21:04:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from reedbn/band-handling-updates

Browse Source 
Band handling updates
This commit is contained in:
reedbn 2020-01-26 11:28:55 -08:00 committed by GitHub
commit e35a2addf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ubitx_ui.cpp
View File

@ -416,16 +416,29 @@ void enterFreq(){
switch(button.id){ switch(button.id){
case KEYS_OK: case KEYS_OK:
{ {
long freq = atol(c); uint32_t new_freq = atol(c);
if((LOWEST_FREQ/1000 <= freq) && (freq <= HIGHEST_FREQ/1000)){ if((LOWEST_FREQ/1000 <= new_freq) && (new_freq <= HIGHEST_FREQ/1000)){
freq *= 1000L; new_freq *= 1000L;
setFrequency(freq);
uint32_t prev_freq = GetActiveVfoFreq();
//Transition from below to above the traditional threshold for USB
if(prev_freq < THRESHOLD_USB_LSB && new_freq >= THRESHOLD_USB_LSB){
SetActiveVfoMode(VfoMode_e::VFO_MODE_USB);
}
//Transition from aboveo to below the traditional threshold for USB
if(prev_freq >= THRESHOLD_USB_LSB && new_freq < THRESHOLD_USB_LSB){
SetActiveVfoMode(VfoMode_e::VFO_MODE_LSB);
}
if (VFO_A == globalSettings.activeVfo){ if (VFO_A == globalSettings.activeVfo){
globalSettings.vfoA.frequency = freq; globalSettings.vfoA.frequency = new_freq;
} }
else{ else{
globalSettings.vfoB.frequency = freq; globalSettings.vfoB.frequency = new_freq;
} }
setFrequency(new_freq);
saveVFOs(); saveVFOs();
} }
guiUpdate(); guiUpdate();
@ -607,10 +620,13 @@ void cwToggle(struct Button *b){
} }
void sidebandToggle(Button* button){ void sidebandToggle(Button* button){
if(BUTTON_LSB == button->id) if(BUTTON_LSB == button->id){
SetActiveVfoMode(VfoMode_e::VFO_MODE_LSB); SetActiveVfoMode(VfoMode_e::VFO_MODE_LSB);
else }
else{
SetActiveVfoMode(VfoMode_e::VFO_MODE_USB); SetActiveVfoMode(VfoMode_e::VFO_MODE_USB);
}
setFrequency(GetActiveVfoFreq());
struct Button button2; struct Button button2;
getButton(BUTTON_USB, &button2); getButton(BUTTON_USB, &button2);