[UI][Scan][Backport] Check powerbutton in scanning.

diff --git a/helps.c b/helps.c
index aa508a5..4df3c42 100644 (file)
--- a/helps.c
+++ b/helps.c
@@ -37,11 +37,11 @@ const char *userfreq_helpstr[10] = {
 #endif
        "5: Reload", " ",
         "1: -1", "7: +1",
-        "4: Call direct", "6: Set",
 #if 1
         "2: -28", "8: +28",
         "3: -100", "9: +100",
 #endif
+        "4: Call direct", "6: Set",
         "A: Exit",  "D: Reset",
         "E: Backlight", "F: (Exit) Help",
     };

diff --git a/menu.c b/menu.c
index 74f038e..523e996 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -174,6 +174,7 @@ void scan_start(void)
     do {
         do {
              c = pollkey_single_timeout(20, 0) ; // 23*20 = 460ms
+             if(chk_powerbutton() != 0) shutdown(1);
             update_status();
             cc = ' ';
             if((akc6955_chk_donescan() == 0) && (scanflag != 0)){

diff --git a/menu_memoryfreq.c b/menu_memoryfreq.c
index 50fd912..acbe859 100644 (file)
--- a/menu_memoryfreq.c
+++ b/menu_memoryfreq.c
@@ -154,7 +154,7 @@ void on_updown_userfreq(void)
             _LOCATE(0,0);
             printstr("CH:");
             print_numeric_nosupress(setup.memorynum, 3);
-            printstr(" 8/2/A");
+            printstr(" HELP=F");
             update_status();
             print_freq(1);
             _HOME();
@@ -228,6 +228,10 @@ void on_updown_userfreq(void)
            case charcode_a:
                 goto _l0;
                 break;
+           case charcode_f:
+               userfreq_help();
+               _CLS();
+               break;
            case charcode_e: // Set Light
            default:
                break;

diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index c1e5e7c..88e109a 100644 (file)
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Sat Aug 31 22:37:32 JST 2013
+#Fri Sep 06 01:24:33 JST 2013
 default.languagetoolchain.dir=/opt/microchip/xc8/v1.20/bin
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=1c49f19f6a43b876c317e0d8d41c0854
 default.languagetoolchain.version=1.20