From 9805cd56f40176d8414c2b0fd9ce83bd5822b17a Mon Sep 17 00:00:00 2001
From: "K.Ohta" <whatisthis.sowhat@gmail.com>
Date: Thu, 12 Sep 2013 02:26:53 +0900
Subject: [PATCH] [UI][HELP] Fix version string.

---
 .../nbproject/Makefile-genesis.properties          |  2 +-
 OpenI2CRadio.v1.0.X/nbproject/configurations.xml   | 19 ----------------
 helps.c                                            | 26 +++++++++++-----------
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/OpenI2CRadio.v1.0.X/nbproject/Makefile-genesis.properties b/OpenI2CRadio.v1.0.X/nbproject/Makefile-genesis.properties
index c405247..189196b 100644
--- a/OpenI2CRadio.v1.0.X/nbproject/Makefile-genesis.properties
+++ b/OpenI2CRadio.v1.0.X/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Thu Sep 12 01:47:09 JST 2013
+#Thu Sep 12 02:08:10 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
diff --git a/OpenI2CRadio.v1.0.X/nbproject/configurations.xml b/OpenI2CRadio.v1.0.X/nbproject/configurations.xml
index f27d69c..ca19272 100644
--- a/OpenI2CRadio.v1.0.X/nbproject/configurations.xml
+++ b/OpenI2CRadio.v1.0.X/nbproject/configurations.xml
@@ -201,25 +201,6 @@
       </PICkit3PlatformTool>
       <XC8-config-global>
       </XC8-config-global>
-      <sdcc>
-        <property key="V-show-commands-compiler" value="false"/>
-        <property key="Werror" value="false"/>
-        <property key="debug-xtra14" value="false"/>
-        <property key="debug-xtra16" value="false"/>
-        <property key="extended" value="false"/>
-        <property key="no-c-code-in-asm" value="false"/>
-        <property key="no-optimize-goto" value="false"/>
-        <property key="no-pcode-opt" value="false"/>
-        <property key="obanksel" value="2"/>
-        <property key="optimize-cmp" value="true"/>
-        <property key="optimize-df" value="true"/>
-        <property key="pcode-verbose" value="false"/>
-        <property key="pno-banksel" value="false"/>
-        <property key="pstack-model" value="small"/>
-        <property key="use-non-free" value="true"/>
-        <property key="verbose" value="true"/>
-        <appendMe value="libio18f45k20.lib  libc18f.lib"/>
-      </sdcc>
     </conf>
   </confs>
 </configurationDescriptor>
diff --git a/helps.c b/helps.c
index 5d9d53a..6c84978 100644
--- a/helps.c
+++ b/helps.c
@@ -45,13 +45,12 @@ const char *userfreq_helpstr[10] = {
         "E: Backlight", "F: (Exit) Help",
     };
 
-const char *updown_helpstr[18] = {
-        "5: Menu", " ",
+const char *updown_helpstr[16] = {
+        "5: Menu", "0: Narrow/Broad",
         "1: Slow Down", "3: Slow Up",
         "4: Down", "6: Up",
         "7: Fast Down", "9: Fast Up",
         "2: Band Down", "8: Band Up",
-        "0: Narrow/Broad", " ",
         "A: AM/FM", "B: User freq",
         "C Scan", "D: Stereo mode",
         "E: Backlight", "F: (Exit) Help",
@@ -69,25 +68,25 @@ const char *setup_helpstr[14] = {
 
 const char *mainmenu_helpstr[14] = {
         "0: Setup", "1: Band",
-        "3: Freq", " "
+        "2:Resv" , "3: Freq",
         "4: Call user", "6: Set user",
         "7: Power Off", "8: Volume",
-        "9: Width", "a: AM/FM",
-        "b: Cancel","c: Set user",
-        "d: Input user","f: (Exit) Help",
+        "9: Reload", "A: AM/FM",
+        "B: Cancel","C: Set user",
+        "D: Input user","F: (Exit) Help",
 };
 
 const char *numeric_helpstr[8] = {
-     "On numeric input", " ",
-    "0-9: Numeric", "f: enter",
-    "a: Delete", "b: Reset value",
-    "d: Left", "e: Right",
+     "On numeric", " input",
+    "0-9: Numeric", "F: Enter",
+    "A: Delete", "B: Reset value",
+    "D: Left", "E: Right",
 };
 
 
 const char *version_helpstr[8] = {
     "Open I2C Radio", "V1.00",
-    "(C) 2013", "K.Ohta",
+    "(C) 2013", "Kyuma Ohta",
     "Licensed under", "GPLv2+LE",
     "Press any key", " to continue.",
 };
@@ -158,6 +157,7 @@ void mainmenu_help(void)
 
     char l;
     l = 0;
+    if(help_header() == charcode_f) return;
     do {
         c = printhelp_2lines(mainmenu_helpstr[l], mainmenu_helpstr[l + 1]);
         if(c == charcode_f) return;
@@ -182,7 +182,7 @@ void updown_help(void)
         c = printhelp_2lines(updown_helpstr[l], updown_helpstr[l + 1]);
         if(c == charcode_f) return;
         l += 2;
-        if(l >= 18) {
+        if(l >= 16) {
             c = numeric_help();
             if(c == charcode_f) return;
             if(help_version() == charcode_f) return;
-- 
2.11.0