diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/calculator.c | 4 | ||||
-rw-r--r-- | apps/plugins/chessclock.c | 2 | ||||
-rw-r--r-- | apps/plugins/chip8.c | 18 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 8 | ||||
-rw-r--r-- | apps/plugins/rockpaint.c | 8 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 14 |
6 files changed, 28 insertions, 26 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 1e07d23a2e..ddc1609fba 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -414,10 +414,10 @@ F3: equal to "=" | |||
414 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 414 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
415 | #define CALCULATOR_UP BUTTON_UP | 415 | #define CALCULATOR_UP BUTTON_UP |
416 | #define CALCULATOR_DOWN BUTTON_DOWN | 416 | #define CALCULATOR_DOWN BUTTON_DOWN |
417 | #define CALCULATOR_QUIT BUTTON_POWER | 417 | #define CALCULATOR_QUIT (BUTTON_BACK|BUTTON_REPEAT) |
418 | #define CALCULATOR_INPUT BUTTON_SELECT | 418 | #define CALCULATOR_INPUT BUTTON_SELECT |
419 | #define CALCULATOR_CALC BUTTON_PLAYPAUSE | 419 | #define CALCULATOR_CALC BUTTON_PLAYPAUSE |
420 | #define CALCULATOR_CLEAR BUTTON_BACK | 420 | #define CALCULATOR_CLEAR (BUTTON_BACK|BUTTON_REL) |
421 | 421 | ||
422 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 422 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) |
423 | #define CALCULATOR_LEFT BUTTON_LEFT | 423 | #define CALCULATOR_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 0e18ccfcd6..be4d90e81a 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -310,7 +310,7 @@ | |||
310 | #define CHC_QUIT BUTTON_POWER | 310 | #define CHC_QUIT BUTTON_POWER |
311 | #define CHC_STARTSTOP BUTTON_PLAYPAUSE | 311 | #define CHC_STARTSTOP BUTTON_PLAYPAUSE |
312 | #define CHC_RESET BUTTON_BACK | 312 | #define CHC_RESET BUTTON_BACK |
313 | #define CHC_MENU BUTTON_SELECT | 313 | #define CHC_MENU (BUTTON_SELECT|BUTTON_REPEAT) |
314 | #define CHC_SETTINGS_INC BUTTON_UP | 314 | #define CHC_SETTINGS_INC BUTTON_UP |
315 | #define CHC_SETTINGS_DEC BUTTON_DOWN | 315 | #define CHC_SETTINGS_DEC BUTTON_DOWN |
316 | #define CHC_SETTINGS_OK BUTTON_SELECT | 316 | #define CHC_SETTINGS_OK BUTTON_SELECT |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 2585c49ff2..e7f874db3b 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1175,15 +1175,17 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
1175 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 1175 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
1176 | 1176 | ||
1177 | #define CHIP8_OFF BUTTON_POWER | 1177 | #define CHIP8_OFF BUTTON_POWER |
1178 | #define CHIP8_KEY1 BUTTON_LEFT | 1178 | #define CHIP8_KEY0 BUTTON_VOL_DOWN |
1179 | #define CHIP8_KEY1 BUTTON_BACK | ||
1179 | #define CHIP8_KEY2 BUTTON_UP | 1180 | #define CHIP8_KEY2 BUTTON_UP |
1180 | #define CHIP8_KEY3 BUTTON_RIGHT | 1181 | #define CHIP8_KEY3 BUTTON_PLAYPAUSE |
1181 | #define CHIP8_KEY4 BUTTON_DOWN | 1182 | #define CHIP8_KEY4 BUTTON_LEFT |
1182 | #define CHIP8_KEY5 BUTTON_PLAYPAUSE | 1183 | #define CHIP8_KEY5 BUTTON_SELECT |
1183 | #define CHIP8_KEY6 BUTTON_BACK | 1184 | #define CHIP8_KEY6 BUTTON_RIGHT |
1184 | #define CHIP8_KEY7 BUTTON_SELECT | 1185 | #define CHIP8_KEY7 BUTTON_BOTTOMLEFT |
1185 | #define CHIP8_KEY8 BUTTON_VOL_DOWN | 1186 | #define CHIP8_KEY8 BUTTON_DOWN |
1186 | #define CHIP8_KEY9 BUTTON_VOL_UP | 1187 | #define CHIP8_KEY9 BUTTON_BOTTOMRIGHT |
1188 | #define CHIP8_KEYA BUTTON_VOL_UP | ||
1187 | 1189 | ||
1188 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 1190 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
1189 | 1191 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 78239c0a34..a3e429bffa 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -324,11 +324,11 @@ static void setoptions (void) | |||
324 | options.LEFT = BUTTON_LEFT; | 324 | options.LEFT = BUTTON_LEFT; |
325 | options.RIGHT = BUTTON_RIGHT; | 325 | options.RIGHT = BUTTON_RIGHT; |
326 | 326 | ||
327 | options.A = BUTTON_BACK; | 327 | options.A = BUTTON_VOL_UP; |
328 | options.B = BUTTON_PLAYPAUSE; | 328 | options.B = BUTTON_VOL_DOWN; |
329 | options.START = BUTTON_SELECT; | 329 | options.START = BUTTON_SELECT; |
330 | options.SELECT = (BUTTON_PLAYPAUSE | BUTTON_REPEAT); | 330 | options.SELECT = BUTTON_PLAYPAUSE; |
331 | options.MENU = (BUTTON_SELECT | BUTTON_REPEAT); | 331 | options.MENU = BUTTON_BACK; |
332 | 332 | ||
333 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 333 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
334 | options.UP = BUTTON_UP; | 334 | options.UP = BUTTON_UP; |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 37f9ee9429..297ee89f9e 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -212,10 +212,10 @@ | |||
212 | 212 | ||
213 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 213 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
214 | #define ROCKPAINT_QUIT BUTTON_POWER | 214 | #define ROCKPAINT_QUIT BUTTON_POWER |
215 | #define ROCKPAINT_DRAW BUTTON_SELECT | 215 | #define ROCKPAINT_DRAW BUTTON_VOL_UP |
216 | #define ROCKPAINT_MENU BUTTON_PLAYPAUSE | 216 | #define ROCKPAINT_MENU BUTTON_VOL_DOWN |
217 | #define ROCKPAINT_TOOLBAR BUTTON_BACK | 217 | #define ROCKPAINT_TOOLBAR BUTTON_BOTTOMRIGHT |
218 | #define ROCKPAINT_TOOLBAR2 (BUTTON_BACK|BUTTON_PLAYPAUSE) | 218 | #define ROCKPAINT_TOOLBAR2 BUTTON_BOTTOMLEFT |
219 | #define ROCKPAINT_UP BUTTON_UP | 219 | #define ROCKPAINT_UP BUTTON_UP |
220 | #define ROCKPAINT_DOWN BUTTON_DOWN | 220 | #define ROCKPAINT_DOWN BUTTON_DOWN |
221 | #define ROCKPAINT_LEFT BUTTON_LEFT | 221 | #define ROCKPAINT_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 107d46bd67..6f1c9e933a 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -317,15 +317,15 @@ | |||
317 | #define LABEL_VOLUME "UP/DOWN" | 317 | #define LABEL_VOLUME "UP/DOWN" |
318 | 318 | ||
319 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 319 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
320 | #define VUMETER_QUIT BUTTON_POWER | 320 | #define VUMETER_QUIT BUTTON_BACK |
321 | #define VUMETER_HELP BUTTON_PLAYPAUSE | 321 | #define VUMETER_HELP BUTTON_PLAYPAUSE |
322 | #define VUMETER_MENU BUTTON_BACK | 322 | #define VUMETER_MENU (BUTTON_SELECT|BUTTON_REPEAT) |
323 | #define VUMETER_UP BUTTON_UP | 323 | #define VUMETER_UP BUTTON_VOL_UP |
324 | #define VUMETER_DOWN BUTTON_DOWN | 324 | #define VUMETER_DOWN BUTTON_VOL_DOWN |
325 | #define LABEL_HELP "PLAY" | 325 | #define LABEL_HELP "PLAY" |
326 | #define LABEL_QUIT "POWER" | 326 | #define LABEL_QUIT "BACK" |
327 | #define LABEL_MENU "BACK" | 327 | #define LABEL_MENU "Long SELECT" |
328 | #define LABEL_VOLUME "UP/DOWN" | 328 | #define LABEL_VOLUME "Vol+/Vol-" |
329 | 329 | ||
330 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 330 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
331 | #define VUMETER_QUIT BUTTON_POWER | 331 | #define VUMETER_QUIT BUTTON_POWER |