bug fix for the user defined menus

Author: flash62au

change_log.md

@@ -1,4 +1,6 @@
 # Change Log
+### V1.106
+- bug fix for the user defined menus
 ### V1.105
 - Initial Chinese language support.  Needed a new define to be able to override the direction font
 ### V1.104
@@ -20,7 +22,7 @@
   - Use ``#define USE_FAST_WIFI_SCAN_METHOD true`` to use a faster scanning method
 - Now disconects the WiFi as a precaution on startup
 - Fixed a bug with use of the WiFi country codes
-- Realised that ``#define ENFORCED_COUNTRY_CODE true`` is not actualyl used byt the code.  I will look into that later
+- Realised that ``#define ENFORCED_COUNTRY_CODE true`` is not actually used by the code.  I will look into that later
 
 ### V1.97
 - Additional logging

config_buttons_example.h

@@ -92,6 +92,18 @@
 // #define CHOSEN_KEYPAD_8_DISPLAY_NAME     "8 Estop"
 // #define CHOSEN_KEYPAD_9_DISPLAY_NAME     "9 Fwd"
 
+// Chinese equivalent for the default keypad display names
+// #define CHOSEN_KEYPAD_0_DISPLAY_NAME     "0 灯光"
+// #define CHOSEN_KEYPAD_1_DISPLAY_NAME     "1 铃声"
+// #define CHOSEN_KEYPAD_2_DISPLAY_NAME     "2 喇叭"
+// #define CHOSEN_KEYPAD_3_DISPLAY_NAME     "3 F3"
+// #define CHOSEN_KEYPAD_4_DISPLAY_NAME     "4 F4"
+// #define CHOSEN_KEYPAD_5_DISPLAY_NAME     "5 下一个总计"
+// #define CHOSEN_KEYPAD_6_DISPLAY_NAME     "6 X倍速度"
+// #define CHOSEN_KEYPAD_7_DISPLAY_NAME     "7 倒车"
+// #define CHOSEN_KEYPAD_8_DISPLAY_NAME     "8 急停"
+// #define CHOSEN_KEYPAD_9_DISPLAY_NAME     "9 前进"
+
 // '#" button action
 // By default, # will show the list above. 
 //   true = will take you to the Loco Function Labels screen directly
@@ -482,6 +494,8 @@
 // #include "language_deutsch.h"
 // Italian - Italiano
 // #include "language_italiano.h"
+
+// Note: to use Chinese characters a suitable font must also be selected below
 // Chinese - 中文
 // #include "language_chinese.h"
 
@@ -494,30 +508,21 @@
 
 // Chinese
 // This font is required for Chinese characters
+// Uncomment it if you wish to use the Chinese translations
 // #define FONT_DEFAULT u8g2_font_boutique_bitmap_7x7_t_gb2312
 
-// Direction Indication Font override (not recommended other than for use of Chinese characters)
-// Any font from here can be used https://github.com/olikraus/u8g2/wiki/fntlist8#8-pixel-height
-// The default one is 29px high
-// Uncomment if and change to the appropriate font if required
-// #define FONT_DIRECTION u8g2_font_neuecraft_tr
+// ******************
 
-// Chinese
-// This font is required for Chinese characters
-
-// *****
-
-// #define FONT_DIRECTION u8g2_font_boutique_bitmap_9x9_bold_t_gb2312
 // Direction Indication Font override (not recommended other than for use of Chinese characters)
 // Any font from here can be used https://github.com/olikraus/u8g2/wiki/fntlist8#8-pixel-height
-// The default one is 14px high
+// The default one is 29px high
 // Uncomment if and change to the appropriate font if required
 // #define FONT_DIRECTION u8g2_font_neuecraft_tr
 
 // Chinese
 // One (only) of these fonts is required for Chinese characters.  The first is recommended. The second is smaller is preferred.
-// #define FONT_DIRECTION u8g2_font_wqy13_t_gb2312a
 // #define FONT_DIRECTION u8g2_font_boutique_bitmap_9x9_bold_t_gb2312
+// #define FONT_DIRECTION u8g2_font_wqy13_t_gb2312a
 
 // *******************************************************************************************************************
 // Startup Commands

static.h

@@ -1,4 +1,4 @@
-const String appVersion = "v1.105";
+const String appVersion = "v1.106";
 #ifndef CUSTOM_APPNAME
    const String appName = "WiTcontroller";
 #else
@@ -468,6 +468,70 @@ const int glyph_speed_step = 0x00d6;
    const int menuCharsRequired[20] = MENU_CHARS_REQUIRED;
 #endif
 
+// catchall in case a particular menu item isn't used
+// must be unique and not be used for any actual menu item
+#ifndef MENU_ITEM_FUNCTION
+   #define MENU_ITEM_FUNCTION                   'M'
+#endif
+#ifndef MENU_ITEM_ADD_LOCO
+   #define MENU_ITEM_ADD_LOCO                   'N'
+#endif
+#ifndef MENU_ITEM_DROP_LOCO
+   #define MENU_ITEM_DROP_LOCO                  'O'
+#endif
+#ifndef MENU_ITEM_TOGGLE_DIRECTION
+   #define MENU_ITEM_TOGGLE_DIRECTION           'P'
+#endif
+#ifndef MENU_ITEM_SPEED_STEP_MULTIPLIER
+   #define MENU_ITEM_SPEED_STEP_MULTIPLIER      'Q'
+#endif
+#ifndef MENU_ITEM_THROW_POINT
+   #define MENU_ITEM_THROW_POINT                'R'
+#endif
+#ifndef MENU_ITEM_CLOSE_POINT
+   #define MENU_ITEM_CLOSE_POINT                'S'
+#endif
+#ifndef MENU_ITEM_ROUTE
+   #define MENU_ITEM_ROUTE                      'T'
+#endif
+#ifndef MENU_ITEM_TRACK_POWER
+   #define MENU_ITEM_TRACK_POWER                'U'
+#endif
+#ifndef MENU_ITEM_EXTRAS
+   #define MENU_ITEM_EXTRAS                     'V'
+#endif
+#ifndef MENU_ITEM_FUNCTION_KEY_TOGGLE
+   #define MENU_ITEM_FUNCTION_KEY_TOGGLE        'W'
+#endif
+#ifndef MENU_ITEM_EDIT_CONSIST
+   #define MENU_ITEM_EDIT_CONSIST               'X'
+#endif
+#ifndef MENU_ITEM_TBA
+   #define MENU_ITEM_TBA                        'Y'
+#endif
+#ifndef MENU_ITEM_HEARTBEAT_TOGGLE
+   #define MENU_ITEM_HEARTBEAT_TOGGLE           'Z'
+#endif
+#ifndef MENU_ITEM_INCREASE_MAX_THROTTLES
+   #define MENU_ITEM_INCREASE_MAX_THROTTLES     '{'
+#endif
+#ifndef MENU_ITEM_DECREASE_MAX_THROTTLES
+   #define MENU_ITEM_DECREASE_MAX_THROTTLES     '}'
+#endif
+#ifndef MENU_ITEM_DISCONNECT
+   #define MENU_ITEM_DISCONNECT                 '['
+#endif
+#ifndef MENU_ITEM_OFF_SLEEP
+   #define MENU_ITEM_OFF_SLEEP                  ']'
+#endif
+#ifndef MENU_ITEM_DROP_BEFORE_ACQUIRE_TOGGLE
+   #define MENU_ITEM_DROP_BEFORE_ACQUIRE_TOGGLE ':'
+#endif
+#ifndef MENU_ITEM_SAVE_CURRENT_LOCOS
+   #define MENU_ITEM_SAVE_CURRENT_LOCOS         ';'
+#endif
+
+
 // if defined in config_buttons.h these values will be overwritten
 //
 #ifndef ENCODER_ROTATION_CLOCKWISE_IS_INCREASE_SPEED