devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix red introduced from keymap typos

Browse source 
Change-Id: Ia2094eab6fe48b8fa1b313c7548e5e02d630327f
This commit is contained in:
Solomon Peachy 2020-10-11 17:20:22 -04:00
parent 2a471e288c
commit a5add3982b
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/plugins/battery_bench.c
View file

@ -53,7 +53,8 @@
#define BATTERY_ON_TXT "PLAY - start" #define BATTERY_ON_TXT "PLAY - start"
#define BATTERY_OFF_TXT "MENU" #define BATTERY_OFF_TXT "MENU"
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD || \
CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
#define BATTERY_ON BUTTON_SELECT #define BATTERY_ON BUTTON_SELECT
#define BATTERY_OFF BUTTON_POWER #define BATTERY_OFF BUTTON_POWER
@ -85,7 +86,6 @@
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD || \ #elif (CONFIG_KEYPAD == IRIVER_H10_PAD || \
CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD || \ CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD || \
CONFIG_KEYPAD == SONY_NWZ_PAD || \ CONFIG_KEYPAD == SONY_NWZ_PAD || \
CONFIG_KEYPAD == AGPTEK_ROCKER_PAD || \
CONFIG_KEYPAD == XDUOO_X3_PAD || \ CONFIG_KEYPAD == XDUOO_X3_PAD || \
CONFIG_KEYPAD == IHIFI_770_PAD || \ CONFIG_KEYPAD == IHIFI_770_PAD || \
CONFIG_KEYPAD == IHIFI_800_PAD || \ CONFIG_KEYPAD == IHIFI_800_PAD || \
@ -242,7 +242,11 @@
#define BATTERY_OFF_TXT "Power" #define BATTERY_OFF_TXT "Power"
#define BATTERY_ON_TXT "Menu - start" #define BATTERY_ON_TXT "Menu - start"
#elif defined(HAVE_TOUCHSCREEN) #else
#error "No keymap defined!"
#endif
#if defined(HAVE_TOUCHSCREEN)
#ifndef BATTERY_ON #ifndef BATTERY_ON
#define BATTERY_ON BUTTON_CENTER #define BATTERY_ON BUTTON_CENTER
@ -257,8 +261,6 @@
#define BATTERY_OFF_TXT "TOPLEFT" #define BATTERY_OFF_TXT "TOPLEFT"
#endif #endif
#else
#error No keymap defined!
#endif #endif
/****************************** Plugin Entry Point ****************************/ /****************************** Plugin Entry Point ****************************/

8
apps/plugins/pegbox.c
View file

@ -711,7 +711,11 @@ CONFIG_KEYPAD == MROBE500_PAD
#define LVL_UP_TEXT "VOL+" #define LVL_UP_TEXT "VOL+"
#define LVL_DOWN_TEXT "VOL-" #define LVL_DOWN_TEXT "VOL-"
#elif defined(HAVE_TOUCHSCREEN) #else
#error "Unsupported keymap!"
#endif
#if defined(HAVE_TOUCHSCREEN)
#ifndef PEGBOX_QUIT #ifndef PEGBOX_QUIT
#define PEGBOX_QUIT BUTTON_TOPLEFT #define PEGBOX_QUIT BUTTON_TOPLEFT
#endif #endif
@ -754,8 +758,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#ifndef LVL_DOWN_TEXT #ifndef LVL_DOWN_TEXT
#define LVL_DOWN_TEXT "BOTTOMRIGHT" #define LVL_DOWN_TEXT "BOTTOMRIGHT"
#endif #endif
#else
#error Unsupported keymap!
#endif #endif
/* get several sizes from the bitmaps */ /* get several sizes from the bitmaps */

8
apps/plugins/xobox.c
View file

@ -351,7 +351,11 @@ CONFIG_KEYPAD == MROBE500_PAD
#define DOWN BUTTON_NEXT #define DOWN BUTTON_NEXT
#define PAUSE BUTTON_PLAY #define PAUSE BUTTON_PLAY
#elif defined(HAVE_TOUCHSCREEN) #else
#error "No keymap defined!"
#endif
#if defined(HAVE_TOUCHSCREEN)
#ifndef QUIT #ifndef QUIT
#define QUIT BUTTON_TOPLEFT #define QUIT BUTTON_TOPLEFT
#endif #endif
@ -370,8 +374,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#ifndef PAUSE #ifndef PAUSE
#define PAUSE BUTTON_CENTER #define PAUSE BUTTON_CENTER
#endif #endif
#else
#error No keymap defined!
#endif #endif
#define MOVE_NO 0 /* player movement */ #define MOVE_NO 0 /* player movement */