[USERFERQ] Store userbands to external EEPROM.

[openi2cradio/OpenI2CRadio.git] / ui_updown.c

diff --git a/ui_updown.c b/ui_updown.c
index a51cec5..6f3bbbb 100644 (file)
--- a/ui_updown.c
+++ b/ui_updown.c
@@ -83,16 +83,32 @@ static void setband_updown(unsigned char updown)
     if(setup.fm == 0){  // MW
         band = setup.amband + 1;
         if(setup.amband == AKC6955_BAND_AMUSER){
-            setup.am_usrbands[setup.am_userbandnum].freq = setup.amfreq;
+            userband.am_usrbands[setup.am_userbandnum].freq = setup.amfreq;
         }
         setup.amfreq_bank[setup.amband] = setup.amfreq;
         if(updown == 0) { // down
             if(band <= 1) {
-                band = AKC6955_BAND_AMEND - 1;
+                band = AKC6955_BAND_AMEND + 1;
             }
             band -= 2;
         }
         setup.amband = band;
+        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;
+       }
         if(setup.amband == AKC6955_BAND_AMUSER){
 //            amfreq = am_usrbands[am_userbandnum].freq;
             call_userband(setup.am_userbandnum);
@@ -100,13 +116,13 @@ static void setband_updown(unsigned char updown)
         setfreq_updown_amsub();
     } else { // FM
         if(setup.fmband == AKC6955_BAND_FMUSER){
-            setup.fm_usrbands[setup.fm_userbandnum].freq = setup.fmfreq;
+            userband.fm_usrbands[setup.fm_userbandnum].freq = setup.fmfreq;
         }
         band = setup.fmband + 1;
         setup.fmfreq_bank[setup.fmband] = setup.fmfreq;
         if(updown == 0) { // down
             if(band <= 1) {
-                band = AKC6955_BAND_FMEND - 1;
+                band = AKC6955_BAND_FMEND + 1;
             }
             band -= 2;
         }
@@ -125,7 +141,6 @@ void setfreq_updown(unsigned char ctlword)
 
     backlight_reset(ctlword);
 
-
     update_status();
     switch(ctlword){
         case charcode_8: // Up band
@@ -134,67 +149,89 @@ void setfreq_updown(unsigned char ctlword)
         case charcode_2: // Down band
             setband_updown(0x00);
             break;
-        case charcode_4: // Down Freq;
-            freq = 9; // 27KHz@3K/9KStep.
-            if(setup.fm != 0) {
-                freq = 10; // 250KHz
-            } else if(setup.am_mode3k == 0){
-                freq = 6; // 30KHz
-            }
-            akc6955_down_freq(freq);
-            break;
-        case charcode_6: // Down Freq;
+        case charcode_6: // Up Middle;
+        case charcode_4: // Down Middle;
             freq = 9; // 27KHz@3K/9KStep.
             if(setup.fm != 0) {
-                freq = 10; // 250KHz
+              switch(setup.fm_tunepitch & 3) {
+               case 3:
+                 freq = 20; // 500KHz excepts TV1/TV2.
+                 if((setup.fmband == AKC6955_BAND_TV1) || (setup.fmband == AKC6955_BAND_TV2)) {
+                      freq = 10; // 250KHz
+                 }
+                 break;
+               default:
+                 freq = 10; // 250KHz
+                 break;
+              }
             } else if(setup.am_mode3k == 0){
                 freq = 6; // 30KHz
             }
-            akc6955_up_freq(freq); // 225 or 27 or 45KHz
-            break;
-        case charcode_9: // Down Fast;
-            freq = 33; // 99KHz@3K/9KStep.
-            if(setup.fm != 0){
-                freq = 40; // 1MHz
-            } else if(setup.am_mode3k != 0){
-                freq = 20; // 100KHz
-            }
-            akc6955_up_freq(freq); // 825 or 90 or 165KHz
+            if(ctlword == charcode_6) {
+              akc6955_up_freq(freq); // 225 or 27 or 45KHz
+           } else {
+              akc6955_down_freq(freq); // 225 or 27 or 45KHz
+           }
             break;
+        case charcode_9: // Up Fast;
         case charcode_7: // Down Fast;
             freq = 33; // 99KHz@3K/9KStep.
             if(setup.fm != 0){
-                freq = 40; // 1MHz
-            } else if(setup.am_mode3k != 0){
+              switch(setup.fm_tunepitch & 3) {
+               case 3:
+                 freq = 80; // 2MHz excepts TV1/TV2.
+                 if((setup.fmband == AKC6955_BAND_TV1) || (setup.fmband == AKC6955_BAND_TV2)) {
+                      freq = 40; // 1MHz
+                 }
+                 break;
+               default:
+                 freq = 40; // 1MHz
+                 break;
+              }
+            } else if(setup.am_mode3k == 0){
                 freq = 20; // 100KHz
             }
-            akc6955_down_freq(freq); // 825 or 90 or 165KHz
+            if(ctlword == charcode_9) {
+              akc6955_up_freq(freq); // 825 or 90 or 165KHz
+           } else {
+              akc6955_down_freq(freq); // 825 or 90 or 165KHz
+           }
             break;
+        case charcode_3: // Up Slow;
         case charcode_1: // Down Slow;
             if(setup.fm != 0){
-                freq = 4; // DOWN 100KHz
+              switch(setup.fm_tunepitch & 3) {
+               case 0:
+                 freq = 1; // 25KHz
+                 break;
+               case 1:
+                 freq = 2; // 50KHz
+                 break;
+               case 2:
+                 freq = 4; // 100KHz
+                 break;
+               default:
+                 freq = 8; // 200KHz excepts TV1/TV2.
+                 if((setup.fmband == AKC6955_BAND_TV1) || (setup.fmband == AKC6955_BAND_TV2)) {
+                      freq = 4; // 100KHz
+                 }
+                 break;
+              }
             } else {
                 freq = 1; // 5KHz or 3KHz
                 if(setup.amband == AKC6955_BAND_MW2) {
                     freq = 3; // 9KHz
                 } else if(setup.amband == AKC6955_BAND_MW3) {
                     freq = 2; // 10KHz
-                }
-            }
-            akc6955_down_freq(freq);
-            break;
-        case charcode_3: // Up Slow;
-            if(setup.fm != 0){
-                freq = 4; // DOWN 100KHz
-            } else {
-                freq = 1; // 5KHz or 3KHz
-                if(setup.amband == AKC6955_BAND_MW2) {
-                    freq = 3; // 9KHz
-                } else if(setup.amband == AKC6955_BAND_MW3) {
+                } else if(setup.amband == AKC6955_BAND_MW4) {
                     freq = 2; // 10KHz
                 }
-            }
-            akc6955_up_freq(freq);
+           }
+            if(ctlword == charcode_1) {
+              akc6955_down_freq(freq);
+           } else {
+              akc6955_up_freq(freq);
+           }
             break;
         case charcode_0: // Step
             setup.threshold_width++;