From eac9a2adc8c7c77f13b1056e7ac58891c4e9a251 Mon Sep 17 00:00:00 2001 From: birdybro Date: Tue, 11 Jan 2022 04:19:30 -0700 Subject: [PATCH] Change "Analog" to "Stick" to match joy_ana_map (#509) The current strings for `joy_button_map` are not as intuitive to the user as they probably could be. This proposed change will help the user know what is meant by the defining the axis of the joystick by referring to the stick the same way as it was referred to during the earlier controller test step. If there is a better way to do this or this is not appropriate, that's okay too. :) --- menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.cpp b/menu.cpp index 76eaca6..df84154 100644 --- a/menu.cpp +++ b/menu.cpp @@ -209,7 +209,7 @@ const char *config_autofire_msg[] = { " AUTOFIRE OFF", " AUTOFIRE const char *config_cd32pad_msg[] = { "OFF", "ON" }; const char *config_button_turbo_msg[] = { "OFF", "FAST", "MEDIUM", "SLOW" }; const char *config_button_turbo_choice_msg[] = { "A only", "B only", "A & B" }; -const char *joy_button_map[] = { "RIGHT", "LEFT", "DOWN", "UP", "BUTTON A", "BUTTON B", "BUTTON X", "BUTTON Y", "BUTTON L", "BUTTON R", "SELECT", "START", "KBD TOGGLE", "MENU", " Analog X: Tilt RIGHT", " Analog Y: Tilt DOWN", " Mouse emu X: Tilt RIGHT", " Mouse emu Y: Tilt DOWN" }; +const char *joy_button_map[] = { "RIGHT", "LEFT", "DOWN", "UP", "BUTTON A", "BUTTON B", "BUTTON X", "BUTTON Y", "BUTTON L", "BUTTON R", "SELECT", "START", "KBD TOGGLE", "MENU", " Stick 1: Tilt RIGHT", " Stick 1: Tilt DOWN", " Mouse emu X: Tilt RIGHT", " Mouse emu Y: Tilt DOWN" }; const char *joy_ana_map[] = { " DPAD test: Press RIGHT", " DPAD test: Press DOWN", " Stick 1 Test: Tilt RIGHT", " Stick 1 Test: Tilt DOWN", " Stick 2 Test: Tilt RIGHT", " Stick 2 Test: Tilt DOWN" }; const char *config_stereo_msg[] = { "0%", "25%", "50%", "100%" }; const char *config_uart_msg[] = { " None", " PPP", " Console", " MIDI", " Modem"};