OSDN Git Service

[IO][v2.0] Remove unnecessary TMR3.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 20 Oct 2013 18:18:36 +0000 (03:18 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 20 Oct 2013 18:18:36 +0000 (03:18 +0900)
ioports.c
main.c

index 42673b0..eb645c3 100644 (file)
--- a/ioports.c
+++ b/ioports.c
@@ -120,7 +120,7 @@ void keyin_ioinit(void)
     ANSELC = AN_C_VAL;
     TRISC = TRIS_C_VAL_O;
  //   lcd_backlightinit();
-    io_intcountinit();
+//    io_intcountinit();
 }
 #endif
 
@@ -148,7 +148,7 @@ void keyin_ioinit(void)
     LATC = 0x00;
     TRISC = TRIS_C_VAL_O;
 //    lcd_backlightinit();
-    io_intcountinit();
+//    io_intcountinit();
 }
 #endif
 
diff --git a/main.c b/main.c
index 92cfb47..c66a69c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -282,7 +282,8 @@ int main(void)
     unsigned char p;
     unsigned char lvcount = 0;
     unsigned char dispf = 0xff;
-    unsigned char i;    
+    unsigned char i;
+    unsigned int step;
 
     OSCCON =  (0x80 & 0b11111100) | 0b00111000;
 //    OSCCON =  (0x80 & 0b11111100) | 0b00110010; // 8MHz 
@@ -371,11 +372,29 @@ int main(void)
 #endif
             }
 #ifdef USE_RENCODER
+          if((setup.fm == 0) && (setup.amband == AKC6955_BAND_MW2)) {
+             if(renc_count < 4) {
+                step = renc_count * 3;
+             } else if(renc_count < 7) {
+                step = renc_count * 9;
+             } else {
+                step = renc_count * 27;
+             }
+          } else {
+             if(renc_count < 4) {
+                step = renc_count;
+             } else if(renc_count < 7) {
+                step = renc_count * 3;
+             } else {
+                step = renc_count * 9;
+             }
+          }
+   
             if(renc_dir == RENC_LEFT) {
-              akc6955_down_freq(renc_count);
+              akc6955_down_freq(step);
               rencoder_init();
            } else if(renc_dir == RENC_RIGHT) {
-              akc6955_up_freq(renc_count);
+              akc6955_up_freq(step);
               rencoder_init();
            }
 #endif