From 593a75c78006d3e9b6c6f0bbbb274712150b35b0 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Fri, 6 Sep 2013 00:36:55 +0900 Subject: [PATCH] [UI] Set mode3k correctly. --- menu.c | 20 +++++++++++++++++--- ui_updown.c | 20 ++++++++++++++++---- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/menu.c b/menu.c index 1462b3c..ecca7bf 100644 --- a/menu.c +++ b/menu.c @@ -253,6 +253,20 @@ void setband_direct(void) setup.amfreq_bank[setup.amband] = setup.amfreq; setup.amband = read_numeric(band, 2, 7, 1); setup.amfreq = setup.amfreq_bank[setup.amband]; + switch(band) { + case AKC6955_BAND_LW: + case AKC6955_BAND_MW2: + setup.am_mode3k = 0xff; + break; + case AKC6955_BAND_MW1: + case AKC6955_BAND_MW3: + case AKC6955_BAND_MW4: + setup.am_mode3k = 0x00; + break; + default: + break; + } + akc6955_set_amband(setup.amband); freq = setup.amfreq; } @@ -344,7 +358,7 @@ void set_userband(void) to = read_numeric(to, 5, 7, 1); setup.fm_usrbands[c].start = (from - 3000) / 80; setup.fm_usrbands[c].stop = (to - 3000) / 80; - setup.fm_usrbands[c].freq = from * 80 + 3000; + setup.fm_usrbands[c].freq = from; setup.fm_userbandnum = c; } else { mode3k = setup.am_usrbands[c].mode3k; @@ -380,11 +394,11 @@ void set_userband(void) setup.am_usrbands[c].start = from / pp; setup.am_usrbands[c].stop = to / pp; setup.am_usrbands[c].mode3k = mode3k; - setup.am_usrbands[c].freq = from * pp; + setup.am_usrbands[c].freq = from; setup.am_userbandnum = c; } call_userband(c); - _CLS(); + _CLS(); } void input_userband(void) diff --git a/ui_updown.c b/ui_updown.c index eeb23cb..495772f 100644 --- a/ui_updown.c +++ b/ui_updown.c @@ -93,10 +93,22 @@ static void setband_updown(unsigned char updown) band -= 2; } setup.amband = band; - if(setup.amband == AKC6955_BAND_AMUSER){ -// amfreq = am_usrbands[am_userbandnum].freq; - call_userband(setup.am_userbandnum); - } + switch(setup.amband) { + case AKC6955_BAND_LW: + case AKC6955_BAND_MW2: + setup.am_mode3k = 0xff; + break; + case AKC6955_BAND_MW1: + case AKC6955_BAND_MW3: + case AKC6955_BAND_MW4: + setup.am_mode3k = 0x00; + break; + case AKC6955_BAND_AMUSER: + call_userband(setup.am_userbandnum); + break; + default: + break; + } setfreq_updown_amsub(); } else { // FM if(setup.fmband == AKC6955_BAND_FMUSER){ -- 2.11.0