OSDN Git Service

[Disp] Add mini-help on Up-Down Freq memory.
[openi2cradio/OpenI2CRadio.git] / radio_getstat.c
index 1053830..50cc01d 100644 (file)
@@ -57,37 +57,36 @@ void update_status(void)
 {
 
     unsigned int adc;
-    fm = akc6955_get_fm();
+    __bitops_t c;
 
-        recv_signal = akc6955_read_level();
-        diffstat = akc6955_get_diff();
-        volume = akc6955_getvolume();
-        prevolume = akc6955_get_prevolume();
-        if(fm != 0){
-            fmfreq = akc6955_get_freq();
-            fmband = akc6955_get_fmband();
+    setup.fm = akc6955_get_fm();
+    recv_signal = akc6955_read_level();
+    diffstat = akc6955_get_diff();
+    setup.volume = akc6955_getvolume();
+    setup.prevolume = akc6955_get_prevolume();
+        if(setup.fm != 0){
+            setup.fmfreq = akc6955_get_freq();
+            akc6955_get_fmband(setup.fmband);
+            setup.fmfreq_bank[setup.fmband] = setup.fmfreq;
             stereoflag = akc6955_get_stereo();
+            akc6955_get_fmbandwidth(setup.fmbandwidth);
         } else {
-            amfreq = akc6955_get_freq();
-            amband = akc6955_get_amband();
+            setup.amfreq = akc6955_get_freq();
+            akc6955_get_amband(setup.amband);
+            setup.amfreq_bank[setup.amband] = setup.amfreq;
+            c.byte = akc6955_readcmd(AKC6955_CNR_AM);
+            if(c.b7) {
+                setup.am_mode3k = 0xff;
+            } else {
+                setup.am_mode3k = 0;
+            }
             stereoflag = 0x00;
         }
-#if 1
         tuneflag = akc6955_tune();
         cnrlevel = akc6955_get_cnr();
-//        batlevel_6955 = akc6955_get_battery();
-        akc6955_get_fmbandwidth(fmbandwidth);
-#else
-        batlevel_6955 = 330;
-#endif
-    batlevel_6955 = 330;
-#ifdef __SDCC
-    startadc(7);
-#else
-    startadc(ADC_CH7 | ADC_INT_OFF ,ADC_7ANA);
-#endif
-    idle_time_ms(1);
-    polladc2(adc);
-    battlevel = adc_rawtobatt(adc, batlevel_6955);
-//    battlevel = adc;
+        batlevel_6955 = akc6955_get_battery();
+   startadc(7);
+   idle_time_ms(1);
+   polladc2(adc);
+   battlevel = adc_rawtobatt(adc, batlevel_6955);
 }