From 8189e0b6e5c04dc2b9cedf5767df36da670a144c Mon Sep 17 00:00:00 2001
From: OneOfEleven <OneOfEleven@users.noreply.github.com>
Date: Sat, 9 Sep 2023 11:36:09 +0100
Subject: [PATCH] More menu renames

---
 README.md           |   6 ++++++
 firmware            | Bin 167608 -> 167608 bytes
 firmware.bin        | Bin 55220 -> 55220 bytes
 firmware.packed.bin | Bin 55238 -> 55238 bytes
 ui/menu.c           |  19 ++++++-------------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index b7c9943..3a3dd96 100644
--- a/README.md
+++ b/README.md
@@ -27,11 +27,17 @@ Battery voltage boot screen now includes the percentage (as well as voltage).
 Slightly less intense menu style.
 
 * "STEP" menu, added 1.25kHz option, removed 5kHz option
+* "TXP" menu, renamed to "TX-PWR"
+* "SAVE" menu, renamed to "B-SAVE"
+* "WX" menu, renamed to "CROS-B" - 'WX' normally means weather here in the UK
 * "ABR" menu, renamed to "BAK-LT", shows extended backlight times
+* "SCR" menu, renamed to "SCRAM"
 * "MIC" menu, shows mic gain in dB's, now includes the max mic gain possible (+15.5dB)
 * "VOL" menu, renamed to "BATVOL", shows voltage and percentage 
 * "AM" menu, renamed to "MODE", shows modulation mode
 
+Menu renames are to try and reduce 'WTF does that do/mean ?'
+
 # Compiler
 
 arm-none-eabi GCC version 10.3.1 is recommended, which is the current version on Ubuntu 22.04.03 LTS.
diff --git a/firmware b/firmware
index cae351adc4a594371df41a3158538053f8001155..d0ec9797ee79196285dda3392512b071fc97ee78 100644
GIT binary patch
delta 64
zcmdlnmutsdu7)j)`!BHQ280JqKYW4FRKn4hfx*eyhXDwDU43<(Js6yHgB`<Mrwd$U
T6k~G^@(<Q^+OBhvv1cy;tBw=$

delta 64
zcmdlnmutsdu7)j)`!BErFfcGoKYW4FR07CgaB}tmQNFIey3QU9!H!|BKv{u{jACrz
O5g>`}Iu{vx_5uJ~DG?|D

diff --git a/firmware.bin b/firmware.bin
index bda1e86340f7ac1742f429521d03566f9e0984e6..2531b4d8b0be5e53f68ea93673009a8a4a69c5c0 100644
GIT binary patch
delta 59
zcmdn8o_Wi9<_-HVu;>Pa2TeYF!BoQ0mw~~_*@poLd|iEYojn+wbb}qkTqg@$6k~G^
O@(<Q^+N^W2gAD**Jrc11

delta 59
zcmdn8o_Wi9<_-HVummtLFibvt!BhfBGdMZ>fGA&AUtMPphG54qSD>W8MKQMU2$1+@
Ior@i802E6P=Kufz

diff --git a/firmware.packed.bin b/firmware.packed.bin
index e0d0e721120dec2aead091b7972b14210be1d81a..441cf8ace9b88d80aef4743dab6850836761a25a 100644
GIT binary patch
delta 62
zcmV-E0KxypuLH)f1F+A~1PV$736s;%H5l+MVB0OA0DRa=*2Z<A2%`kqLQ?Fa0zi`>
U(G~_w#JHLf#<M)phz0`WmU(>~EC2ui

delta 62
zcmV-E0KxypuLH)f1F+A~1a}%!Ta(k!H5jpAVB0OA0DRa=*2Z<A2%`kqQ$FdYR0WeD
U(G~_+&iBbYgtI)+hz0`4E2+>N`2YX_

diff --git a/ui/menu.c b/ui/menu.c
index e64b451..1ed910e 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -32,27 +32,24 @@
 
 static const char MenuList[][7] =
 {
-// 0
 	"SQL",
     "STEP",
-    "TXP",
+    "TX-PWR",
     "R_DCS",
 	"R_CTCS",
 	"T_DCS",
 	"T_CTCS",
 	"SFT-D",
-// 8
 	"OFFSET",
 	"W/N",
-	"SCR",
+	"SCRAM",
     "BCL",
 	"MEM-CH",
-	"SAVE",
+	"B-SAVE",
     "VOX",
     "BAK-LT",
-// 16
 	"TDR",
-    "WX",
+    "CROS-B",
 	"BEEP",
 	"TOT",
 	#ifndef DISABLE_VOICE
@@ -61,7 +58,6 @@ static const char MenuList[][7] =
 	"SC-REV",
 	"MDF",
     "AUTOLK",
-// 24
 	"S-ADD1",
 	"S-ADD2",
 	"STE",
@@ -70,7 +66,6 @@ static const char MenuList[][7] =
     "1-CALL",
 	"S-LIST",
 	"SLIST1",
-// 32
 	"SLIST2",
 	#ifndef DISABLE_ALARM
 		"AL-MOD",
@@ -81,7 +76,6 @@ static const char MenuList[][7] =
 	"D-ST",
     "D-RSP",
 	"D-HOLD",
-// 40
 	"D-PRE",
 	"PTT-ID",
 	"D-DCD",
@@ -90,21 +84,20 @@ static const char MenuList[][7] =
 	"ROGER",
 	"BATVOL",
 	"MODE",
-// 48
 	#ifndef DISABLE_NOAA
 		"NOAA_S",
 	#endif
 	"DEL-CH",
 	"RESET",
 
-// normally hidden menu items from here on ..
+	// normally hidden menu items from here on.
+	// enabled if pressing PTT and side button below PTT at power-on.
 
 	"350TX",
 	"F-LOCK",
 	"200TX",
 	"500TX",
 	"350EN",
-// 56 (55 if NOAA is not used)
 	"SCREN"
 };