From 96b5642c93d16116eb0078dd2de754ce9cec3996 Mon Sep 17 00:00:00 2001 From: Erin of Yukis Date: Tue, 10 Feb 2026 14:15:54 +0100 Subject: [PATCH] sdlapp: Enable compilation of most apps/games MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes `#ifdef`s in many places to just have `HAVE_TOUCHSCREEN` be the input fall back, as is already tentatively the case in the code. Solitaire was the only app excluded since there aren’t enough buttons for it mapped in the SDL layer. Change-Id: I62450b7110b86c8037a121e96cd2e46754be79a3 --- apps/plugins/SOURCES | 3 +++ apps/plugins/SOURCES.app_build | 2 +- apps/plugins/blackjack.c | 6 +++++- apps/plugins/boomshine.lua | 8 ++++++-- apps/plugins/brickmania.c | 5 ++++- apps/plugins/calculator.c | 5 ++++- apps/plugins/calendar.c | 5 +---- apps/plugins/chessclock.c | 5 ++++- apps/plugins/chip8.c | 5 +---- apps/plugins/cube.c | 5 +---- apps/plugins/fft/fft.c | 3 ++- apps/plugins/flipit.c | 5 +---- apps/plugins/invadrox.c | 5 +---- apps/plugins/jewels.c | 5 +---- apps/plugins/metronome.c | 2 ++ apps/plugins/minesweeper.c | 5 +---- apps/plugins/mp3_encoder.c | 5 +---- apps/plugins/oscilloscope.c | 5 +---- apps/plugins/pegbox.c | 5 +---- apps/plugins/pong.c | 5 +---- apps/plugins/rockblox.c | 5 +---- apps/plugins/sliding_puzzle.c | 5 +---- apps/plugins/snake.c | 5 +---- apps/plugins/snake2.c | 5 +---- apps/plugins/sokoban.c | 5 +---- apps/plugins/spacerocks.c | 5 +---- apps/plugins/star.c | 10 +++++----- apps/plugins/vu_meter.c | 5 +---- apps/plugins/wormlet.c | 5 +---- apps/plugins/xobox.c | 5 +---- 30 files changed, 56 insertions(+), 93 deletions(-) diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 3a57e3f9e5..d06e0181f2 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -157,7 +157,10 @@ pong.c sliding_puzzle.c snake.c snake2.c +#ifndef SDLAPP +/* Too many buttons for SDL */ solitaire.c +#endif sokoban.c star.c starfield.c diff --git a/apps/plugins/SOURCES.app_build b/apps/plugins/SOURCES.app_build index cdd764dc27..746af3c0a9 100644 --- a/apps/plugins/SOURCES.app_build +++ b/apps/plugins/SOURCES.app_build @@ -1,4 +1,4 @@ -#if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1) +#if !defined(HAVE_TOUCHSCREEN) || defined(DX50) || defined(DX90) || defined(HIBY_R3PROII) || defined(HIBY_R1) || defined(SDLAPP) /* In devices running RockBox as an application, but having a keypad */ #include "SOURCES" #else diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 10272f90e4..146fe2da41 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c @@ -628,7 +628,7 @@ enum { #define BJACK_RIGHT BUTTON_RIGHT #define BJACK_LEFT BUTTON_LEFT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif @@ -641,6 +641,10 @@ enum { #define BJACK_SELECT BUTTON_CENTER #define BJACK_SELECT_NAME "BUTTON_CENTER" #endif +#ifndef BJACK_QUIT +#define BJACK_QUIT BUTTON_BOTTOMRIGHT +#define BJACK_QUIT_NAME "BUTTON_BOTTOMRIGHT" +#endif #ifndef BJACK_MAX #define BJACK_MAX BUTTON_TOPRIGHT #endif diff --git a/apps/plugins/boomshine.lua b/apps/plugins/boomshine.lua index fcdf7c9a1c..089a4e6b0e 100644 --- a/apps/plugins/boomshine.lua +++ b/apps/plugins/boomshine.lua @@ -707,7 +707,9 @@ if HAS_TOUCHSCREEN then rb.touchscreen_mode(rb.TOUCHSCREEN_POINT) end -rb.backlight_force_on() +if rb.backlight_force_on then + rb.backlight_force_on() +end local eva = rockev.register("action", action_event, rb.HZ / 10) @@ -761,7 +763,9 @@ else end -- Restore user backlight settings -rb.backlight_use_settings() +if rb.backlight_use_settings then + rb.backlight_use_settings() +end if rb.cpu_boost then rb.cpu_boost(false) end os.exit() diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index bb34219895..b45b7597e3 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -382,7 +382,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define UP BUTTON_UP #define DOWN BUTTON_DOWN -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif @@ -408,6 +408,9 @@ CONFIG_KEYPAD == SANSA_M200_PAD #ifndef DOWN #define DOWN BUTTON_BOTTOMMIDDLE #endif +#ifndef QUIT +#define QUIT BUTTON_BOTTOMRIGHT +#endif #endif /* MI: fallback for the suicide combination */ diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 5e69e1f12a..97e998c43d 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -557,7 +557,7 @@ F3: equal to "=" #define CALCULATOR_CALC BUTTON_MENU #define CALCULATOR_CLEAR BUTTON_USER -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif @@ -583,6 +583,9 @@ F3: equal to "=" #ifndef CALCULATOR_CLEAR #define CALCULATOR_CLEAR BUTTON_TOPRIGHT #endif +#ifndef CALCULATOR_QUIT +#define CALCULATOR_QUIT BUTTON_TOPLEFT +#endif #include "lib/pluginlib_touchscreen.h" static struct ts_raster calc_raster = { X_0_POS, Y_1_POS, diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index d1213367ae..42cd88c1aa 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -409,9 +409,6 @@ #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define CALENDAR_QUIT (BUTTON_BACK|BUTTON_MENU) #define CALENDAR_SELECT BUTTON_PLAY @@ -443,7 +440,7 @@ #define CALENDAR_NEXT_MONTH BUTTON_POWER #define CALENDAR_PREV_MONTH BUTTON_USER -#else +#elif !defined(HAVE_TOUCHSCREEN) #error "No keypad setting." #endif diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 521ae034b7..6df7756151 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -418,7 +418,7 @@ #define CHC_SETTINGS_OK BUTTON_SELECT #define CHC_SETTINGS_CANCEL BUTTON_BACK -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif @@ -444,6 +444,9 @@ #ifndef CHC_MENU #define CHC_MENU BUTTON_TOPRIGHT #endif +#ifndef CHC_QUIT +#define CHC_QUIT BUTTON_BOTTOMRIGHT +#endif #endif diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index fa6acea82a..cecda4503a 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -1314,10 +1314,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define CHIP8_KEY8 BUTTON_POWER #define CHIP8_KEY9 BUTTON_USER -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index d3c95be10f..692bad893e 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -392,9 +392,6 @@ #define CUBE_PAUSE BUTTON_PLAY #define CUBE_HIGHSPEED BUTTON_BACK -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define CUBE_QUIT BUTTON_BACK #define CUBE_NEXT BUTTON_RIGHT @@ -425,7 +422,7 @@ #define CUBE_PAUSE BUTTON_USER #define CUBE_HIGHSPEED BUTTON_SELECT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index fb719ab9aa..8933984669 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c @@ -56,7 +56,8 @@ static const struct button_mapping *plugin_contexts[] = { pla_main_ctx }; #if (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ || (CONFIG_KEYPAD == IPOD_3G_PAD) \ - || (CONFIG_KEYPAD == IPOD_4G_PAD) + || (CONFIG_KEYPAD == IPOD_4G_PAD) \ + || defined(SDLAPP) #define FFT_QUIT PLA_UP #else #define FFT_QUIT PLA_EXIT diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 3080f2f239..89ac3655c8 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -482,9 +482,6 @@ #define FLIPIT_STEP_BY_STEP BUTTON_VOL_UP #define FLIPIT_TOGGLE BUTTON_SELECT -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define FLIPIT_LEFT BUTTON_LEFT @@ -523,7 +520,7 @@ #define FLIPIT_STEP_BY_STEP BUTTON_POWER #define FLIPIT_TOGGLE BUTTON_SELECT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index d8b792aedc..c01ef71e7c 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -281,9 +281,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define QUIT BUTTON_BACK @@ -305,7 +302,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error INVADROX: Unsupported keypad #endif diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index e681c578ad..1413214a43 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -367,9 +367,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define HK_SELECT "SELECT" #define HK_CANCEL "BACK" -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define JEWELS_UP BUTTON_UP #define JEWELS_DOWN BUTTON_DOWN @@ -400,7 +397,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define HK_SELECT "A" #define HK_CANCEL "B" -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c index f7baccf84f..0c43c25063 100644 --- a/apps/plugins/metronome.c +++ b/apps/plugins/metronome.c @@ -86,6 +86,8 @@ enum metronome_errors || (CONFIG_KEYPAD == IPOD_3G_PAD) \ || (CONFIG_KEYPAD == IPOD_4G_PAD) #define METRONOME_QUIT PLA_UP +#elif defined(SDLAPP) +#define METRONOME_QUIT PLA_CANCEL #else #define METRONOME_QUIT PLA_EXIT #endif diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index e4a99e8f22..c69b356487 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -442,9 +442,6 @@ CONFIG_KEYPAD == MROBE500_PAD # define MINESWP_DISCOVER (BUTTON_MENU|BUTTON_REPEAT) # define MINESWP_INFO BUTTON_MENU -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == RG_NANO_PAD # define MINESWP_LEFT BUTTON_LEFT # define MINESWP_RIGHT BUTTON_RIGHT @@ -465,7 +462,7 @@ CONFIG_KEYPAD == MROBE500_PAD # define MINESWP_DISCOVER BUTTON_SELECT # define MINESWP_INFO BUTTON_MENU -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 7e96ab81d9..c8a1d979b4 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -2577,9 +2577,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_SELECT -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define MP3ENC_PREV BUTTON_LEFT #define MP3ENC_NEXT BUTTON_RIGHT @@ -2598,7 +2595,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_SELECT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 49c0aeda4e..7719db65c1 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -550,9 +550,6 @@ #define OSCILLOSCOPE_VOL_UP BUTTON_UP #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == RG_NANO_PAD #define OSCILLOSCOPE_QUIT BUTTON_START #define OSCILLOSCOPE_DRAWMODE BUTTON_X @@ -576,7 +573,7 @@ #define OSCILLOSCOPE_VOL_UP BUTTON_UP #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 832ebc49f7..f9fa412a23 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c @@ -711,9 +711,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define LVL_UP_TEXT "UP+MENU" #define LVL_DOWN_TEXT "DOWN+MENU" -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == RG_NANO_PAD #define PEGBOX_SELECT BUTTON_A #define PEGBOX_QUIT BUTTON_START @@ -748,7 +745,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define LVL_DOWN_TEXT "Start" #define SELECT_TEXT "A" -#else +#elif !defined(HAVE_TOUCHSCREEN) #error "Unsupported keymap!" #endif diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index c9addff347..329b1ec813 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -318,9 +318,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define PONG_RIGHT_UP BUTTON_BACK #define PONG_RIGHT_DOWN BUTTON_RIGHT -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define PONG_QUIT BUTTON_BACK #define PONG_PAUSE BUTTON_PLAY @@ -345,7 +342,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define PONG_RIGHT_UP BUTTON_MENU #define PONG_RIGHT_DOWN BUTTON_POWER -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index a657dde2d7..ce0745530f 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -458,9 +458,6 @@ #define ROCKBLOX_RESTART BUTTON_BACK #define ROCKBLOX_SCROLL_ENABLED 1 -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define ROCKBLOX_OFF (BUTTON_BACK|BUTTON_REPEAT) #define ROCKBLOX_ROTATE_CCW BUTTON_UP @@ -495,7 +492,7 @@ #define ROCKBLOX_DROP BUTTON_SELECT #define ROCKBLOX_RESTART BUTTON_USER -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 63121edba1..934fbfc1a7 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -348,9 +348,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define PUZZLE_SHUFFLE BUTTON_BACK #define PUZZLE_PICTURE BUTTON_PLAY -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define PUZZLE_QUIT BUTTON_BACK #define PUZZLE_LEFT BUTTON_LEFT @@ -378,7 +375,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define PUZZLE_SHUFFLE BUTTON_SELECT #define PUZZLE_PICTURE BUTTON_MENU -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 4055087159..2cf10a2811 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -305,9 +305,6 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; #define SNAKE_DOWN BUTTON_DOWN #define SNAKE_PLAYPAUSE BUTTON_PLAY -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define SNAKE_QUIT BUTTON_BACK #define SNAKE_LEFT BUTTON_LEFT @@ -332,7 +329,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; #define SNAKE_DOWN BUTTON_DOWN #define SNAKE_PLAYPAUSE BUTTON_SELECT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index d8a97f159f..8e38df047e 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -449,9 +449,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define SNAKE2_PLAYPAUSE BUTTON_PLAY #define SNAKE2_PLAYPAUSE_TEXT "PLAY" -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define SNAKE2_LEFT BUTTON_LEFT #define SNAKE2_RIGHT BUTTON_RIGHT @@ -479,7 +476,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define SNAKE2_PLAYPAUSE BUTTON_SELECT #define SNAKE2_PLAYPAUSE_TEXT "A" -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 7b6e79f70b..03edeb67c4 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -681,9 +681,6 @@ #define BUTTON_SAVE BUTTON_BACK #define BUTTON_SAVE_NAME "BACK" -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define SOKOBAN_LEFT BUTTON_LEFT #define SOKOBAN_RIGHT BUTTON_RIGHT @@ -734,7 +731,7 @@ #define SOKOBAN_LEVEL_REPEAT_NAME "[TOPRIGHT]" #define BUTTON_SAVE_NAME "A [CENTER]" -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 38ee7504ac..db3e8d7f40 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -363,9 +363,6 @@ #define AST_RIGHT BUTTON_RIGHT #define AST_FIRE BUTTON_PLAY -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define AST_PAUSE BUTTON_MENU #define AST_QUIT BUTTON_BACK @@ -393,7 +390,7 @@ #define AST_RIGHT BUTTON_RIGHT #define AST_FIRE BUTTON_SELECT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 856a2af51a..097c67f94c 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -705,15 +705,15 @@ #define STAR_LEVEL_DOWN_NAME "Start" #define STAR_LEVEL_REPEAT_NAME "Y" -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif #ifdef HAVE_TOUCHSCREEN -//#ifndef STAR_QUIT -//#define STAR_QUIT BUTTON_TOPLEFT -//#define STAR_QUIT_NAME "TOPLEFT" -//#endif +#ifndef STAR_QUIT +#define STAR_QUIT BUTTON_TOPRIGHT +#define STAR_QUIT_NAME "TOPRIGHT" +#endif #ifndef STAR_LEFT #define STAR_LEFT BUTTON_MIDLEFT #endif diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index d18b6a658c..17569a623d 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -443,9 +443,6 @@ #define LABEL_MENU "MENU" #define LABEL_VOLUME "VOL+/VOL-" -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define VUMETER_QUIT BUTTON_BACK #define VUMETER_HELP BUTTON_LEFT @@ -479,7 +476,7 @@ #define LABEL_MENU "X" #define LABEL_VOLUME "Up/Down" -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index c02234d500..d347c88035 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -397,9 +397,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define BTN_QUIT BUTTON_POWER #define BTN_STOPRESET BUTTON_BACK -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == MA_PAD #define BTN_DIR_UP BUTTON_UP #define BTN_DIR_DOWN BUTTON_DOWN @@ -429,7 +426,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define BTN_QUIT BUTTON_BACK #define BTN_STOPRESET BUTTON_MENU -#else +#elif !defined(HAVE_TOUCHSCREEN) #error No keymap defined! #endif diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index f82cde1c32..eca53a2bda 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -351,9 +351,6 @@ CONFIG_KEYPAD == MROBE500_PAD #define DOWN BUTTON_DOWN #define PAUSE BUTTON_PLAY -#elif CONFIG_KEYPAD == SHANLING_Q1_PAD || CONFIG_KEYPAD == HIBY_R3PROII_PAD -/* use touchscreen */ - #elif CONFIG_KEYPAD == RG_NANO_PAD #define QUIT BUTTON_START @@ -372,7 +369,7 @@ CONFIG_KEYPAD == MROBE500_PAD #define DOWN BUTTON_DOWN #define PAUSE BUTTON_SELECT -#else +#elif !defined(HAVE_TOUCHSCREEN) #error "No keymap defined!" #endif