[v1.0][Doc] v1.0(.0) Release.

[openi2cradio/OpenI2CRadio.git] / ui_display.c

diff --git a/ui_display.c b/ui_display.c
index b1be147..ee3fba2 100644 (file)
--- a/ui_display.c
+++ b/ui_display.c
@@ -62,19 +62,30 @@ void print_freq(unsigned char y)
         if(setup.fmband < AKC6955_BAND_TV1) {
             printstr("FM");
             _PUTCHAR('1' + (setup.fmband & 7));
-            printstr("  ");
+            _PUTCHAR(' ');
         } else if(setup.fmband < AKC6955_BAND_FMUSER){
             printstr("TV");
             _PUTCHAR('1' +setup. fmband - AKC6955_BAND_TV1);
-            printstr("  ");
+           _PUTCHAR(' ');
         } else { // USER
             printstr("FMU");
             _PUTCHAR('0' + setup.fm_userbandnum);
-            _PUTCHAR(' ');
         }
+         if(stereoflag != 0){
+             printstr(" ST");
+         } else {
+             printstr("   ");
+         }
+         freq = setup.fmfreq;// + diffstat / 100;
+         freq_lo = freq % 100;
+         freq_hi = freq / 100;
+         print_numeric_nosupress(freq_hi, 3);
+         _PUTCHAR('.');
+         print_numeric_nosupress(freq_lo, 2);
+         printstr("MHz");
     } else { // AM
         if(setup.amband == AKC6955_BAND_LW) {
-            printstr("LW");
+            printstr("LW   ");
         } else if(setup.amband <AKC6955_BAND_SW1) { //MW
             printstr("MW");
             _PUTCHAR('1' + setup.amband - AKC6955_BAND_MW1);
@@ -94,32 +105,10 @@ void print_freq(unsigned char y)
             _PUTCHAR('0' + setup.am_userbandnum);
             _PUTCHAR(' ');
         }
-     }
-//     _LOCATE(15-5 ,1);
-     _LOCATE(15-3-8, y);
-     if(setup.fm != 0){
-         if(stereoflag != 0){
-             printstr("ST");
-         } else {
-             printstr("  ");
-         }
-         freq = setup.fmfreq;// + diffstat / 100;
-         freq_lo = freq % 100;
-         freq_hi = freq / 100;
-         print_numeric_nosupress(freq_hi, 3);
-         _PUTCHAR('.');
-         print_numeric_nosupress(freq_lo, 2);
-     } else {
-         freq = setup.amfreq;// + diffstat / 10;
-         printstr("   ");
-         print_numeric_nosupress(freq, 5);
-     }
-     // Signal
-     _LOCATE(15-3, y);
-     if(setup.fm != 0){
-         printstr("MHz");
-     } else {
-         printstr("KHz");
+        freq = setup.amfreq;// + diffstat / 10;
+        printstr("   ");
+        print_numeric_nosupress(freq, 5);
+        printstr("KHz");
      }
      _HOME();
 }
@@ -133,7 +122,7 @@ void update_display(void)
     unsigned int batlv;
  //   _CLS();
     _LOCATE(0,0);
-    printstr("S");
+    _PUTCHAR('S');
     sig = recv_signal + 40;
     print_numeric_nosupress(sig / 20, 1);
     _PUTCHAR(' ');