[Build] Build with XC8 v1.21.

[openi2cradio/OpenI2CRadio.git] / menu_defs.c

diff --git a/menu_defs.c b/menu_defs.c
index 17a37b3..f5ba727 100644 (file)
--- a/menu_defs.c
+++ b/menu_defs.c
@@ -52,9 +52,10 @@
 #include "power.h"
 #include "adc_int.h"
 
-
 const banddesc ambands[19] = {
-    {150,285},
+//const unsigned int ambands[38] = {
+//    {150,285},
+    {100,522}, // Extend LW.
     {520,1710},
     {522,1620},
     {520,1710},
@@ -87,46 +88,49 @@ const banddesc fmbands[8] = {
 
 
 __radioset_t setup;
+__freqset_t freqset;
+__freqset_t freqset_temp;
+__userband_t_t userband;
 unsigned char scanflag;
 
 
-/*
- *
- */
+
+
 void setdefault(void)
 {
     char i;
-    __radioset_t *p = &setup;
     //amfreq = 954;
     //fmfreq = 8000; // 10KHz order.
-    p->amband = AKC6955_BAND_MW2;
-    p->fmband = AKC6955_BAND_FM2;
-    p->am_mode3k = 0xff;
-    p->fm = 0;
-    p->am_userbandnum = 0;
-    p->fm_userbandnum = 0;
-    p->lowboost = 0xff;
-    p->threshold_amcnr = 0;
-    p->threshold_fmcnr = 0;
-    p->threshold_fmstereo = 0;
-    p->threshold_width = 0;
-    for(i = 0; i < 4; i++){
-        p->am_usrbands[i].start = 0x19;
-        p->am_usrbands[i].stop  = 0x32;
+    setup.amband = AKC6955_BAND_MW2;
+    setup.fmband = AKC6955_BAND_FM2;
+    setup.am_mode3k = 0xff;
+    setup.fm = 0;
+    setup.am_userbandnum = 0;
+    setup.fm_userbandnum = 0;
+    setup.lowboost = 0xff;
+    setup.threshold_amcnr = 0;
+    setup.threshold_fmcnr = 0;
+    setup.threshold_fmstereo = 0;
+    setup.threshold_width = 0;
+    for(i =0; i < AKC6955_BAND_AMEND; i++){
+      setup.amfreq_bank[i] = ((ambands[i].end - ambands[i].start) / 2) + ambands[i].start;
     }
-    for(i = 0; i < 4; i++){
-        p->fm_usrbands[i].start = 0x19;
-        p->fm_usrbands[i].stop  = 0x32;
+    for(i =0; i <  AKC6955_BAND_FMEND ; i++){
+      setup.fmfreq_bank[i] = ((fmbands[i].end - fmbands[i].start) / 2) + fmbands[i].start;
     }
-    for(i =0; i < 18; i++){
-      p->amfreq_bank[i] = ((ambands[i].end - ambands[i].start) / 2) + ambands[i].start;
+    setup.memorynum = 0x00;
+    setup.pagenum = 0x00;
+#if 0
+    for(i = 0; i < USER_MEMORY_NUM; i++) {
+        freqset.memoryfreqs[i].band = AKC6955_BAND_MW2;
+        freqset.memoryfreqs[i].fm = 0;
+        freqset.memoryfreqs[i].freq = 594; // NHK1 Tokyo.
     }
-    for(i =0; i < 8; i++){
-      p->fmfreq_bank[i] = ((fmbands[i].end - fmbands[i].start) / 2) + fmbands[i].start;
-    }
-    p->fmfreq = p->fmfreq_bank[p->fmband];
-    p->amfreq = p->amfreq_bank[p->amband];
-    p->stereo = 0xff; // Auto
+#endif
+    setup.fmfreq = setup.fmfreq_bank[setup.fmband];
+    setup.amfreq = setup.amfreq_bank[setup.amband];
+    setup.stereo = 0xff; // Auto
+    setup.fm_tunepitch = 0x02; // 100KHz
 }
 
 void valinit(void)
@@ -142,13 +146,10 @@ void valinit(void)
     recv_signal = 103;
     battlevel = 0;
     batlevel_6955 = 330; // 3.30V(temporally).
-    if(setup.amband > 18) setup.amband = 18;
-    if(setup.fmband > 7) setup.fmband = 7;
-    if(setup.am_userbandnum >= USER_BAND_NUM) setup.am_userbandnum = USER_BAND_NUM - 1;
-    if(setup.fm_userbandnum >= USER_BAND_NUM) setup.fm_userbandnum = USER_BAND_NUM - 1;
     setup.volume = 36;
     setup.prevolume = 3;
     setup.fmbandwidth = 0;
+//    setup.pagenum = setup.memorynum / USER_MEMORY_NUM;
     diffstat = 0;
     cnrlevel = 103;
     stereoflag = 0x00; // Auto