summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2018-03-02 21:53:55 +0100
committerMarcin Bukat <marcin.bukat@gmail.com>2018-06-12 10:31:15 +0200
commitfbb6a2ff6d751adaaef73a86a98700f91571d0a1 (patch)
treee4bf533e945a03887620361ad110b3612321d67d
parent0538ba3d59a1a29adcee0b4656b204fda102ad89 (diff)
downloadrockbox-fbb6a2ff6d751adaaef73a86a98700f91571d0a1.tar.gz
rockbox-fbb6a2ff6d751adaaef73a86a98700f91571d0a1.zip
Agptek Rocker: Build plugins
Patch provided by Aapo Tahkola. Change-Id: I37a42a950d78d6b8aa3927ec7aeb30030f7be7a5
-rw-r--r--apps/plugins/battery_bench.c6
-rw-r--r--apps/plugins/blackjack.c14
-rw-r--r--apps/plugins/brickmania.c8
-rw-r--r--apps/plugins/calculator.c10
-rw-r--r--apps/plugins/calendar.c10
-rw-r--r--apps/plugins/chessbox/chessbox_pgn.h14
-rw-r--r--apps/plugins/chessclock.c10
-rw-r--r--apps/plugins/chip8.c8
-rw-r--r--apps/plugins/chopper.c5
-rw-r--r--apps/plugins/clix.c10
-rw-r--r--apps/plugins/cube.c10
-rw-r--r--apps/plugins/doom/i_video.c12
-rw-r--r--apps/plugins/fft/fft.c9
-rw-r--r--apps/plugins/flipit.c12
-rw-r--r--apps/plugins/fractals/fractal.h12
-rw-r--r--apps/plugins/goban/goban.h9
-rw-r--r--apps/plugins/imageviewer/imageviewer_button.h12
-rw-r--r--apps/plugins/jewels.c10
-rw-r--r--apps/plugins/lib/keymaps.h7
-rw-r--r--apps/plugins/lib/osd.c3
-rw-r--r--apps/plugins/lib/pluginlib_actions.c9
-rw-r--r--apps/plugins/midi/midiplay.c8
-rw-r--r--apps/plugins/minesweeper.c10
-rw-r--r--apps/plugins/mp3_encoder.c6
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c7
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
-rw-r--r--apps/plugins/oscilloscope.c11
-rw-r--r--apps/plugins/pacbox/pacbox.h9
-rw-r--r--apps/plugins/pegbox.c15
-rw-r--r--apps/plugins/pictureflow/pictureflow.c2
-rw-r--r--apps/plugins/pong.c8
-rw-r--r--apps/plugins/puzzles/rockbox.c31
-rw-r--r--apps/plugins/reversi/reversi-gui.h8
-rw-r--r--apps/plugins/rockblox.c10
-rw-r--r--apps/plugins/rockboy/rockboy.c12
-rw-r--r--apps/plugins/sliding_puzzle.c9
-rw-r--r--apps/plugins/snake.c8
-rw-r--r--apps/plugins/snake2.c9
-rw-r--r--apps/plugins/sokoban.c12
-rw-r--r--apps/plugins/solitaire.c17
-rw-r--r--apps/plugins/spacerocks.c8
-rw-r--r--apps/plugins/star.c16
-rw-r--r--apps/plugins/stopwatch.c8
-rw-r--r--apps/plugins/sudoku/sudoku.h9
-rw-r--r--apps/plugins/text_viewer/tv_button.h10
-rw-r--r--apps/plugins/vu_meter.c12
-rw-r--r--apps/plugins/wormlet.c9
-rw-r--r--apps/plugins/xobox.c8
-rw-r--r--apps/plugins/xworld/sys.c13
-rw-r--r--apps/plugins/zxbox/keymaps.h8
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c8
-rwxr-xr-xtools/configure2
52 files changed, 500 insertions, 12 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 2cdf510b3a..bb9c3b0e6f 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -273,6 +273,12 @@
273#define BATTERY_OFF_TXT "Power" 273#define BATTERY_OFF_TXT "Power"
274#define BATTERY_ON_TXT "Menu - start" 274#define BATTERY_ON_TXT "Menu - start"
275 275
276#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
277#define BATTERY_ON BUTTON_LEFT
278#define BATTERY_OFF BUTTON_RIGHT
279#define BATTERY_OFF_TXT "Right"
280#define BATTERY_ON_TXT "Left - start"
281
276#else 282#else
277#error No keymap defined! 283#error No keymap defined!
278#endif 284#endif
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index bd89d5a985..411ff3970b 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -559,6 +559,20 @@ enum {
559#define BJACK_QUIT BUTTON_POWER 559#define BJACK_QUIT BUTTON_POWER
560#define BJACK_QUIT_NAME "Power" 560#define BJACK_QUIT_NAME "Power"
561 561
562#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
563#define BJACK_SELECT BUTTON_SELECT
564#define BJACK_QUIT BUTTON_POWER
565#define BJACK_STAY (BUTTON_VOLUP|BUTTON_SELECT)
566#define BJACK_DOUBLEDOWN (BUTTON_VOLUP|BUTTON_DOWN)
567#define BJACK_UP BUTTON_UP
568#define BJACK_DOWN BUTTON_DOWN
569#define BJACK_RIGHT BUTTON_RIGHT
570#define BJACK_LEFT BUTTON_LEFT
571#define BJACK_SELECT_NAME "Select"
572#define BJACK_STAY_NAME "Option+Select"
573#define BJACK_QUIT_NAME "Volume up"
574#define BJACK_DOUBLE_NAME "Option+Down"
575
562#else 576#else
563#error No keymap defined! 577#error No keymap defined!
564#endif 578#endif
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 34a8338e65..3fc30819b9 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -324,6 +324,14 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
324#define SELECT BUTTON_MENU 324#define SELECT BUTTON_MENU
325#define CONTINUE_TEXT "Press MENU To Continue" 325#define CONTINUE_TEXT "Press MENU To Continue"
326 326
327#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
328#define QUIT BUTTON_POWER
329#define LEFT BUTTON_LEFT
330#define RIGHT BUTTON_RIGHT
331#define SELECT BUTTON_SELECT
332#define UP BUTTON_UP
333#define DOWN BUTTON_DOWN
334
327#else 335#else
328#error No keymap defined! 336#error No keymap defined!
329#endif 337#endif
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 25128d69be..a30ccdc83d 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -515,6 +515,16 @@ F3: equal to "="
515#define CALCULATOR_QUIT BUTTON_POWER 515#define CALCULATOR_QUIT BUTTON_POWER
516#define CALCULATOR_INPUT BUTTON_MENU 516#define CALCULATOR_INPUT BUTTON_MENU
517 517
518#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
519#define CALCULATOR_LEFT BUTTON_LEFT
520#define CALCULATOR_RIGHT BUTTON_RIGHT
521#define CALCULATOR_UP BUTTON_UP
522#define CALCULATOR_DOWN BUTTON_DOWN
523#define CALCULATOR_QUIT BUTTON_POWER
524#define CALCULATOR_INPUT BUTTON_SELECT
525#define CALCULATOR_CALC BUTTON_VOLUP
526#define CALCULATOR_CLEAR (BUTTON_SELECT|BUTTON_REPEAT)
527
518#else 528#else
519#error No keymap defined! 529#error No keymap defined!
520#endif 530#endif
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 65c29742e8..23446beb40 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -403,6 +403,16 @@
403#define CALENDAR_SELECT BUTTON_MENU 403#define CALENDAR_SELECT BUTTON_MENU
404#define CALENDAR_EVENT_MENU_NAME "menu" 404#define CALENDAR_EVENT_MENU_NAME "menu"
405 405
406#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
407#define CALENDAR_QUIT BUTTON_POWER
408#define CALENDAR_SELECT BUTTON_SELECT
409#define CALENDAR_NEXT_DAY BUTTON_RIGHT
410#define CALENDAR_PREV_DAY BUTTON_LEFT
411#define CALENDAR_NEXT_WEEK BUTTON_DOWN
412#define CALENDAR_PREV_WEEK BUTTON_UP
413#define CALENDAR_NEXT_MONTH (BUTTON_VOLDOWN)
414#define CALENDAR_PREV_MONTH (BUTTON_VOLUP)
415
406#else 416#else
407#error "No keypad setting." 417#error "No keypad setting."
408#endif 418#endif
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 34f68cb325..fe50297732 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -544,6 +544,20 @@
544#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 544#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
545#define CB_MENU BUTTON_MENU 545#define CB_MENU BUTTON_MENU
546 546
547#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
548#define CB_SELECT BUTTON_SELECT
549#define CB_UP BUTTON_UP
550#define CB_DOWN BUTTON_DOWN
551#define CB_LEFT BUTTON_LEFT
552#define CB_RIGHT BUTTON_RIGHT
553#define CB_PLAY BUTTON_VOLDOWN
554#define CB_MENU BUTTON_POWER
555#define CB_LEVEL BUTTON_VOLUP
556#define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT)
557#define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT)
558#define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT)
559#define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT)
560
547#else 561#else
548#error No keymap defined! 562#error No keymap defined!
549#endif 563#endif
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 7473c47024..bc907feec3 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -402,6 +402,16 @@
402#define CHC_QUIT BUTTON_POWER 402#define CHC_QUIT BUTTON_POWER
403#define CHC_STARTSTOP BUTTON_MENU 403#define CHC_STARTSTOP BUTTON_MENU
404 404
405#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
406#define CHC_QUIT (BUTTON_POWER|BUTTON_REPEAT)
407#define CHC_RESET (BUTTON_LEFT)
408#define CHC_MENU BUTTON_RIGHT
409#define CHC_STARTSTOP BUTTON_SELECT
410#define CHC_SETTINGS_INC BUTTON_VOLUP
411#define CHC_SETTINGS_DEC BUTTON_VOLDOWN
412#define CHC_SETTINGS_CANCEL BUTTON_RIGHT
413#define CHC_SETTINGS_OK (BUTTON_SELECT|BUTTON_REPEAT)
414
405#else 415#else
406#error No keymap defined! 416#error No keymap defined!
407#endif 417#endif
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 316852c14f..5fb55ae011 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1275,6 +1275,14 @@ CONFIG_KEYPAD == MROBE500_PAD
1275#define CHIP8_KEY8 BUTTON_BOTTOMMIDDLE 1275#define CHIP8_KEY8 BUTTON_BOTTOMMIDDLE
1276#define CHIP8_KEY9 BUTTON_BOTTOMRIGHT 1276#define CHIP8_KEY9 BUTTON_BOTTOMRIGHT
1277 1277
1278#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
1279#define CHIP8_OFF BUTTON_POWER
1280#define CHIP8_KEY2 BUTTON_UP
1281#define CHIP8_KEY4 BUTTON_DOWN
1282#define CHIP8_KEY5 BUTTON_SELECT
1283#define CHIP8_KEY6 BUTTON_RIGHT
1284#define CHIP8_KEY8 BUTTON_LEFT
1285
1278#else 1286#else
1279#error No keymap defined! 1287#error No keymap defined!
1280#endif 1288#endif
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 3c47633f85..4a838c44ae 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -204,6 +204,11 @@ CONFIG_KEYPAD == MROBE500_PAD
204#define ACTION BUTTON_SELECT 204#define ACTION BUTTON_SELECT
205#define ACTIONTEXT "Select" 205#define ACTIONTEXT "Select"
206 206
207#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
208#define QUIT BUTTON_POWER
209#define ACTION BUTTON_SELECT
210#define ACTIONTEXT "Select"
211
207 212
208#elif !defined(HAVE_TOUCHSCREEN) 213#elif !defined(HAVE_TOUCHSCREEN)
209#error No keymap defined! 214#error No keymap defined!
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index 5ad556d2ce..b47fe69952 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -266,6 +266,16 @@
266#define CLIX_BUTTON_RIGHT BUTTON_MIDRIGHT 266#define CLIX_BUTTON_RIGHT BUTTON_MIDRIGHT
267#define CLIX_BUTTON_CLICK BUTTON_CENTER 267#define CLIX_BUTTON_CLICK BUTTON_CENTER
268 268
269#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
270#define CLIX_BUTTON_QUIT BUTTON_POWER
271#define CLIX_BUTTON_UP BUTTON_UP
272#define CLIX_BUTTON_DOWN BUTTON_DOWN
273#define CLIX_BUTTON_SCROLL_FWD (BUTTON_VOLUP)
274#define CLIX_BUTTON_SCROLL_BACK (BUTTON_VOLDOWN)
275#define CLIX_BUTTON_LEFT BUTTON_LEFT
276#define CLIX_BUTTON_RIGHT BUTTON_RIGHT
277#define CLIX_BUTTON_CLICK BUTTON_SELECT
278
269#else 279#else
270#error "no keymap" 280#error "no keymap"
271#endif 281#endif
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 53f0d7d949..04cb013f26 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -403,6 +403,16 @@
403#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 403#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
404#define CUBE_QUIT BUTTON_POWER 404#define CUBE_QUIT BUTTON_POWER
405 405
406#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
407#define CUBE_QUIT (BUTTON_POWER|BUTTON_REL)
408#define CUBE_NEXT BUTTON_RIGHT
409#define CUBE_PREV BUTTON_LEFT
410#define CUBE_INC BUTTON_VOLUP
411#define CUBE_DEC BUTTON_VOLDOWN
412#define CUBE_MODE BUTTON_SELECT
413#define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_REPEAT)
414#define CUBE_PAUSE (BUTTON_LEFT | BUTTON_REPEAT)
415
406#else 416#else
407#error No keymap defined! 417#error No keymap defined!
408#endif 418#endif
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 2a6868778b..5535f08b6e 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -543,6 +543,18 @@ void I_ShutdownGraphics(void)
543#define DOOMBUTTON_SHOOT BUTTON_MENU 543#define DOOMBUTTON_SHOOT BUTTON_MENU
544#define DOOMBUTTON_MAP BUTTON_TOPLEFT 544#define DOOMBUTTON_MAP BUTTON_TOPLEFT
545 545
546#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
547#define DOOMBUTTON_UP BUTTON_UP
548#define DOOMBUTTON_DOWN BUTTON_DOWN
549#define DOOMBUTTON_LEFT BUTTON_LEFT
550#define DOOMBUTTON_RIGHT BUTTON_RIGHT
551#define DOOMBUTTON_OPEN BUTTON_VOLDOWN
552#define DOOMBUTTON_ESC (BUTTON_POWER|BUTTON_REPEAT)
553#define DOOMBUTTON_ENTER BUTTON_SELECT
554#define DOOMBUTTON_SHOOT BUTTON_SELECT
555#define DOOMBUTTON_WEAPON BUTTON_VOLUP
556#define DOOMBUTTON_MAP (BUTTON_VOLUP|BUTTON_REPEAT)
557
546#else 558#else
547#error Keymap not defined! 559#error Keymap not defined!
548#endif 560#endif
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 3e88722b23..a83bd36557 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -325,6 +325,15 @@ GREY_INFO_STRUCT
325# define FFT_PREV_GRAPH BUTTON_VOL_UP 325# define FFT_PREV_GRAPH BUTTON_VOL_UP
326# define FFT_NEXT_GRAPH BUTTON_VOL_DOWN 326# define FFT_NEXT_GRAPH BUTTON_VOL_DOWN
327 327
328#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
329# define FFT_PREV_GRAPH BUTTON_LEFT
330# define FFT_NEXT_GRAPH BUTTON_RIGHT
331# define FFT_AMP_SCALE BUTTON_UP
332# define FFT_FREQ_SCALE BUTTON_DOWN
333# define FFT_QUIT BUTTON_POWER
334# define FFT_ORIENTATION BUTTON_SELECT
335# define FFT_WINDOW BUTTON_VOLDOWN
336
328#elif !defined(HAVE_TOUCHSCREEN) 337#elif !defined(HAVE_TOUCHSCREEN)
329#error No keymap defined! 338#error No keymap defined!
330#endif 339#endif
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 158d69da8d..fafc1f9c08 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -470,6 +470,18 @@
470#define FLIPIT_QUIT BUTTON_POWER 470#define FLIPIT_QUIT BUTTON_POWER
471#define FLIPIT_TOGGLE BUTTON_MENU 471#define FLIPIT_TOGGLE BUTTON_MENU
472 472
473#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
474
475#define FLIPIT_LEFT BUTTON_LEFT
476#define FLIPIT_RIGHT BUTTON_RIGHT
477#define FLIPIT_UP BUTTON_UP
478#define FLIPIT_DOWN BUTTON_DOWN
479#define FLIPIT_QUIT (BUTTON_POWER|BUTTON_REL)
480#define FLIPIT_SHUFFLE (BUTTON_VOLDOWN)
481#define FLIPIT_SOLVE (BUTTON_SELECT|BUTTON_VOLUP)
482#define FLIPIT_STEP_BY_STEP (BUTTON_LEFT|BUTTON_VOLUP)
483#define FLIPIT_TOGGLE BUTTON_SELECT
484
473#else 485#else
474#error No keymap defined! 486#error No keymap defined!
475#endif 487#endif
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index d9c4a88bdf..aa8c31f093 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -472,6 +472,18 @@
472#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 472#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
473#define FRACTAL_QUIT BUTTON_POWER 473#define FRACTAL_QUIT BUTTON_POWER
474 474
475#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
476#define FRACTAL_QUIT BUTTON_POWER
477#define FRACTAL_UP BUTTON_UP
478#define FRACTAL_DOWN BUTTON_DOWN
479#define FRACTAL_RIGHT BUTTON_RIGHT
480#define FRACTAL_LEFT BUTTON_LEFT
481#define FRACTAL_ZOOM_IN (BUTTON_VOLUP|BUTTON_UP)
482#define FRACTAL_ZOOM_OUT (BUTTON_VOLUP|BUTTON_DOWN)
483#define FRACTAL_PRECISION_INC (BUTTON_VOLUP|BUTTON_RIGHT)
484#define FRACTAL_PRECISION_DEC (BUTTON_VOLUP|BUTTON_LEFT)
485#define FRACTAL_RESET BUTTON_SELECT
486
475#else 487#else
476#error No keymap defined! 488#error No keymap defined!
477#endif 489#endif
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index 261fd8ebcc..135b9dbe95 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -443,6 +443,15 @@
443#elif (CONFIG_KEYPAD == DX50_PAD) 443#elif (CONFIG_KEYPAD == DX50_PAD)
444#define GBN_BUTTON_MENU (BUTTON_POWER|BUTTON_REL) 444#define GBN_BUTTON_MENU (BUTTON_POWER|BUTTON_REL)
445 445
446#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
447#define GBN_BUTTON_UP BUTTON_UP
448#define GBN_BUTTON_DOWN BUTTON_DOWN
449#define GBN_BUTTON_LEFT BUTTON_LEFT
450#define GBN_BUTTON_RIGHT BUTTON_RIGHT
451#define GBN_BUTTON_MENU BUTTON_POWER
452#define GBN_BUTTON_PLAY (BUTTON_SELECT | BUTTON_REL)
453#define GBN_BUTTON_NAV_MODE BUTTON_VOLUP
454
446#else 455#else
447#error Unsupported keypad 456#error Unsupported keypad
448#endif 457#endif
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index 13502369ee..abd84f1710 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -483,6 +483,18 @@
483#define IMGVIEW_QUIT BUTTON_POWER 483#define IMGVIEW_QUIT BUTTON_POWER
484#define IMGVIEW_MENU BUTTON_MENU 484#define IMGVIEW_MENU BUTTON_MENU
485 485
486#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
487#define IMGVIEW_ZOOM_IN BUTTON_VOLUP
488#define IMGVIEW_ZOOM_OUT BUTTON_VOLDOWN
489#define IMGVIEW_UP BUTTON_UP
490#define IMGVIEW_DOWN BUTTON_DOWN
491#define IMGVIEW_LEFT BUTTON_LEFT
492#define IMGVIEW_RIGHT BUTTON_RIGHT
493#define IMGVIEW_NEXT (BUTTON_SELECT|BUTTON_RIGHT)
494#define IMGVIEW_PREVIOUS (BUTTON_SELECT|BUTTON_LEFT)
495#define IMGVIEW_QUIT (BUTTON_POWER|BUTTON_REL)
496#define IMGVIEW_MENU (BUTTON_SELECT|BUTTON_REL)
497
486#else 498#else
487#error No keymap defined! 499#error No keymap defined!
488#endif 500#endif
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 9fd57873f0..97531a001c 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -348,6 +348,16 @@ CONFIG_KEYPAD == MROBE500_PAD
348#define HK_SELECT "SELECT" 348#define HK_SELECT "SELECT"
349#define HK_CANCEL "POWER" 349#define HK_CANCEL "POWER"
350 350
351#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
352#define JEWELS_LEFT BUTTON_LEFT
353#define JEWELS_RIGHT BUTTON_RIGHT
354#define JEWELS_UP BUTTON_UP
355#define JEWELS_DOWN BUTTON_DOWN
356#define JEWELS_SELECT BUTTON_SELECT
357#define JEWELS_CANCEL BUTTON_POWER
358#define HK_SELECT "SELECT"
359#define HK_CANCEL "POWER"
360
351#elif (CONFIG_KEYPAD == HM60X_PAD) || \ 361#elif (CONFIG_KEYPAD == HM60X_PAD) || \
352 (CONFIG_KEYPAD == HM801_PAD) 362 (CONFIG_KEYPAD == HM801_PAD)
353#define JEWELS_LEFT BUTTON_LEFT 363#define JEWELS_LEFT BUTTON_LEFT
diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h
index c079a9080b..64deccf513 100644
--- a/apps/plugins/lib/keymaps.h
+++ b/apps/plugins/lib/keymaps.h
@@ -60,7 +60,8 @@
60 (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) || \ 60 (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) || \
61 (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ 61 (CONFIG_KEYPAD == IRIVER_H300_PAD) || \
62 (CONFIG_KEYPAD == HM801_PAD) || \ 62 (CONFIG_KEYPAD == HM801_PAD) || \
63 (CONFIG_KEYPAD == HM60X_PAD) 63 (CONFIG_KEYPAD == HM60X_PAD) || \
64 (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
64#define BTN_UP BUTTON_UP 65#define BTN_UP BUTTON_UP
65#define BTN_DOWN BUTTON_DOWN 66#define BTN_DOWN BUTTON_DOWN
66#define BTN_LEFT BUTTON_LEFT 67#define BTN_LEFT BUTTON_LEFT
@@ -83,6 +84,10 @@
83#define BTN_UP_RIGHT BUTTON_TOPRIGHT 84#define BTN_UP_RIGHT BUTTON_TOPRIGHT
84#endif 85#endif
85 86
87#if (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
88#define BTN_FIRE BUTTON_SELECT
89#define BTN_PAUSE BUTTON_POWER
90#endif
86 91
87#if (CONFIG_KEYPAD == HM60X_PAD) 92#if (CONFIG_KEYPAD == HM60X_PAD)
88#define BTN_FIRE BUTTON_POWER 93#define BTN_FIRE BUTTON_POWER
diff --git a/apps/plugins/lib/osd.c b/apps/plugins/lib/osd.c
index e6fc39178a..d2e0fe3e50 100644
--- a/apps/plugins/lib/osd.c
+++ b/apps/plugins/lib/osd.c
@@ -115,6 +115,9 @@ static struct osd grey_osd;
115#elif LCD_DEPTH == 24 115#elif LCD_DEPTH == 24
116# define _OSD_WIDTH2BYTES(w) ((w)*3) 116# define _OSD_WIDTH2BYTES(w) ((w)*3)
117# define _OSD_BYTES2WIDTH(b) ((b)/3) 117# define _OSD_BYTES2WIDTH(b) ((b)/3)
118#elif LCD_DEPTH == 32
119# define _OSD_WIDTH2BYTES(w) ((w)*4)
120# define _OSD_BYTES2WIDTH(b) ((b)/4)
118#else /* other LCD depth */ 121#else /* other LCD depth */
119# error Unknown LCD depth; please define macros 122# error Unknown LCD depth; please define macros
120#endif /* LCD_DEPTH */ 123#endif /* LCD_DEPTH */
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 2f550f817c..f9addb32f4 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -123,7 +123,8 @@ const struct button_mapping pla_main_ctx[] =
123 || (CONFIG_KEYPAD == HM60X_PAD) \ 123 || (CONFIG_KEYPAD == HM60X_PAD) \
124 || (CONFIG_KEYPAD == HM801_PAD) \ 124 || (CONFIG_KEYPAD == HM801_PAD) \
125 || (CONFIG_KEYPAD == SONY_NWZ_PAD) \ 125 || (CONFIG_KEYPAD == SONY_NWZ_PAD) \
126 || (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)) 126 || (CONFIG_KEYPAD == CREATIVE_ZEN_PAD) \
127 || (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD))
127 { PLA_UP, BUTTON_UP, BUTTON_NONE }, 128 { PLA_UP, BUTTON_UP, BUTTON_NONE },
128 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE }, 129 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE },
129 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, 130 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE },
@@ -422,6 +423,12 @@ const struct button_mapping pla_main_ctx[] =
422 {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, 423 {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE},
423 {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, 424 {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
424 {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, 425 {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
426#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
427 {PLA_CANCEL, BUTTON_VOLUP, BUTTON_NONE},
428 {PLA_EXIT, BUTTON_POWER, BUTTON_NONE},
429 {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE},
430 {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
431 {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
425#elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) 432#elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD)
426 {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE}, 433 {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE},
427 {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, 434 {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE},
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index 5e329cef06..418f72b6a5 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -285,6 +285,14 @@
285#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 285#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
286#define MIDI_QUIT BUTTON_POWER 286#define MIDI_QUIT BUTTON_POWER
287 287
288#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
289#define MIDI_QUIT BUTTON_POWER
290#define MIDI_FFWD BUTTON_RIGHT
291#define MIDI_REWIND BUTTON_LEFT
292#define MIDI_VOL_UP BUTTON_VOLUP
293#define MIDI_VOL_DOWN BUTTON_VOLDOWN
294#define MIDI_PLAYPAUSE BUTTON_SELECT
295
288#else 296#else
289#error No keymap defined! 297#error No keymap defined!
290#endif 298#endif
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index d83a24370b..98eb8d9e7a 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -388,6 +388,16 @@ CONFIG_KEYPAD == MROBE500_PAD
388#define MINESWP_DISCOVER BUTTON_SELECT 388#define MINESWP_DISCOVER BUTTON_SELECT
389#define MINESWP_INFO BUTTON_MENU 389#define MINESWP_INFO BUTTON_MENU
390 390
391#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
392#define MINESWP_LEFT BUTTON_LEFT
393#define MINESWP_RIGHT BUTTON_RIGHT
394#define MINESWP_UP BUTTON_UP
395#define MINESWP_DOWN BUTTON_DOWN
396#define MINESWP_QUIT BUTTON_POWER
397#define MINESWP_TOGGLE BUTTON_VOLUP
398#define MINESWP_DISCOVER BUTTON_SELECT
399#define MINESWP_INFO BUTTON_VOLDOWN
400
391#elif (CONFIG_KEYPAD == DX50_PAD) 401#elif (CONFIG_KEYPAD == DX50_PAD)
392# define MINESWP_QUIT (BUTTON_POWER|BUTTON_REL) 402# define MINESWP_QUIT (BUTTON_POWER|BUTTON_REL)
393 403
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index c9be9e4260..e86e74f408 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2550,6 +2550,12 @@ CONFIG_KEYPAD == MROBE500_PAD
2550#define MP3ENC_DONE BUTTON_POWER 2550#define MP3ENC_DONE BUTTON_POWER
2551#define MP3ENC_SELECT BUTTON_MENU 2551#define MP3ENC_SELECT BUTTON_MENU
2552 2552
2553#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
2554#define MP3ENC_PREV BUTTON_LEFT
2555#define MP3ENC_NEXT BUTTON_RIGHT
2556#define MP3ENC_DONE BUTTON_POWER
2557#define MP3ENC_SELECT BUTTON_SELECT
2558
2553#else 2559#else
2554#error No keymap defined! 2560#error No keymap defined!
2555#endif 2561#endif
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index d6b926b585..fc9bcb6ec4 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -298,6 +298,13 @@ struct mpeg_settings settings;
298#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 298#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
299#define MPEG_START_TIME_EXIT BUTTON_POWER 299#define MPEG_START_TIME_EXIT BUTTON_POWER
300 300
301#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
302#define MPEG_START_TIME_SELECT BUTTON_SELECT
303#define MPEG_START_TIME_LEFT BUTTON_LEFT
304#define MPEG_START_TIME_RIGHT BUTTON_RIGHT
305#define MPEG_START_TIME_UP BUTTON_UP
306#define MPEG_START_TIME_DOWN BUTTON_DOWN
307
301#else 308#else
302#error No keymap defined! 309#error No keymap defined!
303#endif 310#endif
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 056b46c7a1..07cf8ba8e2 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -432,6 +432,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD
432#define MPEG_PAUSE BUTTON_MENU 432#define MPEG_PAUSE BUTTON_MENU
433#define MPEG_STOP (BUTTON_MENU|BUTTON_REPEAT) 433#define MPEG_STOP (BUTTON_MENU|BUTTON_REPEAT)
434 434
435#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
436#define MPEG_MENU BUTTON_POWER
437#define MPEG_PAUSE BUTTON_SELECT
438#define MPEG_STOP BUTTON_DOWN
439#define MPEG_VOLDOWN BUTTON_VOLDOWN
440#define MPEG_VOLUP BUTTON_VOLUP
441#define MPEG_RW BUTTON_LEFT
442#define MPEG_FF BUTTON_RIGHT
443
435#else 444#else
436#error No keymap defined! 445#error No keymap defined!
437#endif 446#endif
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 07c40c2b4e..85cbf2bfb2 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -493,6 +493,17 @@
493#define OSCILLOSCOPE_ORIENTATION BUTTON_TOPLEFT 493#define OSCILLOSCOPE_ORIENTATION BUTTON_TOPLEFT
494#define OSCILLOSCOPE_GRAPHMODE BUTTON_BOTTOMLEFT 494#define OSCILLOSCOPE_GRAPHMODE BUTTON_BOTTOMLEFT
495 495
496#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
497#define OSCILLOSCOPE_QUIT BUTTON_POWER
498#define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT|BUTTON_UP)
499#define OSCILLOSCOPE_ADVMODE BUTTON_DOWN
500#define OSCILLOSCOPE_ORIENTATION BUTTON_UP
501#define OSCILLOSCOPE_PAUSE BUTTON_SELECT
502#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
503#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
504#define OSCILLOSCOPE_VOL_UP BUTTON_VOLUP
505#define OSCILLOSCOPE_VOL_DOWN BUTTON_VOLDOWN
506
496#else 507#else
497#error No keymap defined! 508#error No keymap defined!
498#endif 509#endif
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 9c4c305539..5eb9103d90 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -354,6 +354,15 @@
354#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 354#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
355#define PACMAN_MENU BUTTON_MENU 355#define PACMAN_MENU BUTTON_MENU
356 356
357#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
358#define PACMAN_UP BUTTON_UP
359#define PACMAN_DOWN BUTTON_DOWN
360#define PACMAN_LEFT BUTTON_LEFT
361#define PACMAN_RIGHT BUTTON_RIGHT
362#define PACMAN_MENU BUTTON_POWER
363#define PACMAN_1UP BUTTON_VOLUP
364#define PACMAN_COIN BUTTON_VOLDOWN
365
357#else 366#else
358 367
359#error Keymap not defined! 368#error Keymap not defined!
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 4692a1a766..dcc6176d2b 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -599,6 +599,21 @@ CONFIG_KEYPAD == MROBE500_PAD
599#define LVL_DOWN_TEXT "" 599#define LVL_DOWN_TEXT ""
600#define SELECT_TEXT "PLAY" 600#define SELECT_TEXT "PLAY"
601 601
602#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
603#define PEGBOX_RIGHT BUTTON_RIGHT
604#define PEGBOX_LEFT BUTTON_LEFT
605#define PEGBOX_UP BUTTON_UP
606#define PEGBOX_DOWN BUTTON_DOWN
607#define PEGBOX_QUIT BUTTON_POWER
608#define PEGBOX_SELECT BUTTON_SELECT
609#define PEGBOX_RESTART BUTTON_VOLUP
610
611#define QUIT_TEXT "POWER"
612#define RESTART_TEXT "VOLUP"
613#define LVL_UP_TEXT ""
614#define LVL_DOWN_TEXT ""
615#define SELECT_TEXT "SELECT"
616
602#elif CONFIG_KEYPAD == CREATIVE_ZEN_PAD 617#elif CONFIG_KEYPAD == CREATIVE_ZEN_PAD
603#define PEGBOX_RIGHT BUTTON_RIGHT 618#define PEGBOX_RIGHT BUTTON_RIGHT
604#define PEGBOX_LEFT BUTTON_LEFT 619#define PEGBOX_LEFT BUTTON_LEFT
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 4db3ad366d..6e47418e93 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -1826,7 +1826,7 @@ static inline pix_t fade_color(pix_t c, unsigned a)
1826 result >>= 8; 1826 result >>= 8;
1827 return result; 1827 return result;
1828 1828
1829#elif LCD_PIXELFORMAT == RGB888 1829#elif (LCD_PIXELFORMAT == RGB888 || LCD_PIXELFORMAT == XRGB8888) // FIXME: check this
1830 unsigned int pixel = FB_UNPACK_SCALAR_LCD(c); 1830 unsigned int pixel = FB_UNPACK_SCALAR_LCD(c);
1831 unsigned int result; 1831 unsigned int result;
1832 a = (a + 2) & 0x1fc; 1832 a = (a + 2) & 0x1fc;
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index e097480e85..016d548675 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -294,6 +294,14 @@ CONFIG_KEYPAD == MROBE500_PAD
294#define PONG_RIGHT_UP BUTTON_RIGHT 294#define PONG_RIGHT_UP BUTTON_RIGHT
295#define PONG_RIGHT_DOWN BUTTON_LEFT 295#define PONG_RIGHT_DOWN BUTTON_LEFT
296 296
297#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
298#define PONG_QUIT BUTTON_POWER
299#define PONG_PAUSE BUTTON_SELECT
300#define PONG_LEFT_UP BUTTON_UP
301#define PONG_LEFT_DOWN BUTTON_DOWN
302#define PONG_RIGHT_UP BUTTON_RIGHT
303#define PONG_RIGHT_DOWN BUTTON_LEFT
304
297#elif (CONFIG_KEYPAD == DX50_PAD) 305#elif (CONFIG_KEYPAD == DX50_PAD)
298#define PONG_QUIT (BUTTON_POWER|BUTTON_REL) 306#define PONG_QUIT (BUTTON_POWER|BUTTON_REL)
299 307
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index e681db3c16..88186b5154 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -177,7 +177,13 @@ static void zoom_drawpixel(int x, int y)
177 if(x < zoom_clipl || x >= zoom_clipr) 177 if(x < zoom_clipl || x >= zoom_clipr)
178 return; 178 return;
179 179
180#if LCD_DEPTH == 24 180#if LCD_DEPTH > 24
181 unsigned int pix = rb->lcd_get_foreground();
182 zoom_fb[y * zoom_w + x].b = RGB_UNPACK_BLUE(pix);
183 zoom_fb[y * zoom_w + x].g = RGB_UNPACK_GREEN(pix);
184 zoom_fb[y * zoom_w + x].r = RGB_UNPACK_RED(pix);
185 zoom_fb[y * zoom_w + x].x = 255;
186#elif LCD_DEPTH == 24
181 /* I hate these */ 187 /* I hate these */
182 unsigned int pix = rb->lcd_get_foreground(); 188 unsigned int pix = rb->lcd_get_foreground();
183 zoom_fb[y * zoom_w + x].b = RGB_UNPACK_BLUE(pix); 189 zoom_fb[y * zoom_w + x].b = RGB_UNPACK_BLUE(pix);
@@ -204,7 +210,13 @@ static void zoom_hline(int l, int r, int y)
204 if(r >= zoom_clipr) 210 if(r >= zoom_clipr)
205 r = zoom_clipr; 211 r = zoom_clipr;
206 212
207#if LCD_DEPTH == 24 213#if LCD_DEPTH > 24
214 fb_data pixel = { RGB_UNPACK_BLUE(rb->lcd_get_foreground()),
215 RGB_UNPACK_GREEN(rb->lcd_get_foreground()),
216 RGB_UNPACK_RED(rb->lcd_get_foreground()),
217 255
218 };
219#elif LCD_DEPTH == 24
208 fb_data pixel = { RGB_UNPACK_BLUE(rb->lcd_get_foreground()), 220 fb_data pixel = { RGB_UNPACK_BLUE(rb->lcd_get_foreground()),
209 RGB_UNPACK_GREEN(rb->lcd_get_foreground()), 221 RGB_UNPACK_GREEN(rb->lcd_get_foreground()),
210 RGB_UNPACK_RED(rb->lcd_get_foreground()) }; 222 RGB_UNPACK_RED(rb->lcd_get_foreground()) };
@@ -285,7 +297,12 @@ static void zoom_mono_bitmap(const unsigned char *bits, int x, int y, int w, int
285 { 297 {
286 if(column & 1) 298 if(column & 1)
287 { 299 {
288#if LCD_DEPTH == 24 300#if LCD_DEPTH > 24
301 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].b = RGB_UNPACK_BLUE(pix);
302 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].g = RGB_UNPACK_GREEN(pix);
303 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].r = RGB_UNPACK_RED(pix);
304 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].r = 255;
305#elif LCD_DEPTH == 24
289 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].b = RGB_UNPACK_BLUE(pix); 306 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].b = RGB_UNPACK_BLUE(pix);
290 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].g = RGB_UNPACK_GREEN(pix); 307 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].g = RGB_UNPACK_GREEN(pix);
291 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].r = RGB_UNPACK_RED(pix); 308 zoom_fb[(y + i * 8 + dy) * zoom_w + x + j].r = RGB_UNPACK_RED(pix);
@@ -625,7 +642,7 @@ static inline void plot(fb_data *fb, int w, int h,
625 fb_data *ptr = fb + y * w + x; 642 fb_data *ptr = fb + y * w + x;
626 fb_data orig = *ptr; 643 fb_data orig = *ptr;
627 unsigned long r2, g2, b2; 644 unsigned long r2, g2, b2;
628#if LCD_DEPTH != 24 645#if LCD_DEPTH < 24
629 r2 = RGB_UNPACK_RED(orig); 646 r2 = RGB_UNPACK_RED(orig);
630 g2 = RGB_UNPACK_GREEN(orig); 647 g2 = RGB_UNPACK_GREEN(orig);
631 b2 = RGB_UNPACK_BLUE(orig); 648 b2 = RGB_UNPACK_BLUE(orig);
@@ -640,8 +657,10 @@ static inline void plot(fb_data *fb, int w, int h,
640 g = ((g1 * a) + (g2 * (256 - a))) >> 8; 657 g = ((g1 * a) + (g2 * (256 - a))) >> 8;
641 b = ((b1 * a) + (b2 * (256 - a))) >> 8; 658 b = ((b1 * a) + (b2 * (256 - a))) >> 8;
642 659
643#if LCD_DEPTH != 24 660#if LCD_DEPTH < 24
644 *ptr = LCD_RGBPACK(r, g, b); 661 *ptr = LCD_RGBPACK(r, g, b);
662#elif LCD_DEPTH > 24
663 *ptr = (fb_data) {b, g, r, 255};
645#else 664#else
646 *ptr = (fb_data) {b, g, r}; 665 *ptr = (fb_data) {b, g, r};
647#endif 666#endif
@@ -1454,7 +1473,7 @@ void get_random_seed(void **randseed, int *randseedsize)
1454 1473
1455static void timer_cb(void) 1474static void timer_cb(void)
1456{ 1475{
1457#if LCD_DEPTH != 24 1476#if LCD_DEPTH < 24
1458 if(debug_settings.timerflash) 1477 if(debug_settings.timerflash)
1459 { 1478 {
1460 static bool what = false; 1479 static bool what = false;
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 37833c10f1..67897a9772 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -320,6 +320,14 @@
320#define REVERSI_BUTTON_QUIT BUTTON_POWER 320#define REVERSI_BUTTON_QUIT BUTTON_POWER
321#define REVERSI_BUTTON_MENU BUTTON_MENU 321#define REVERSI_BUTTON_MENU BUTTON_MENU
322 322
323#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
324#define REVERSI_BUTTON_UP BUTTON_UP
325#define REVERSI_BUTTON_DOWN BUTTON_DOWN
326#define REVERSI_BUTTON_LEFT BUTTON_LEFT
327#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
328#define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
329#define REVERSI_BUTTON_MENU BUTTON_POWER
330
323#else 331#else
324#error No keymap defined! 332#error No keymap defined!
325#endif 333#endif
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 14ded91961..a0814beda1 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -470,6 +470,16 @@
470#define ROCKBLOX_OFF BUTTON_POWER 470#define ROCKBLOX_OFF BUTTON_POWER
471#define ROCKBLOX_ROTATE BUTTON_MENU 471#define ROCKBLOX_ROTATE BUTTON_MENU
472 472
473#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
474#define ROCKBLOX_OFF BUTTON_POWER
475#define ROCKBLOX_LEFT BUTTON_LEFT
476#define ROCKBLOX_RIGHT BUTTON_RIGHT
477#define ROCKBLOX_DROP BUTTON_UP
478#define ROCKBLOX_RESTART (BUTTON_SELECT|BUTTON_LEFT)
479#define ROCKBLOX_ROTATE_CW BUTTON_VOLUP
480#define ROCKBLOX_ROTATE_CCW BUTTON_VOLDOWN
481#define ROCKBLOX_DOWN BUTTON_DOWN
482
473#else 483#else
474#error No keymap defined! 484#error No keymap defined!
475#endif 485#endif
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index bbcfde8442..38536d1375 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -411,6 +411,18 @@ static void setoptions (void)
411#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 411#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
412 options.MENU = BUTTON_POWER; 412 options.MENU = BUTTON_POWER;
413 413
414#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
415 options.UP = BUTTON_UP;
416 options.DOWN = BUTTON_DOWN;
417 options.LEFT = BUTTON_LEFT;
418 options.RIGHT = BUTTON_RIGHT;
419
420 options.START = BUTTON_SELECT;
421 options.MENU = BUTTON_POWER;
422 options.SELECT = BUTTON_SELECT|BUTTON_REPEAT;
423 options.A = BUTTON_VOLDOWN;
424 options.B = BUTTON_VOLUP;
425
414#else 426#else
415#error No Keymap Defined! 427#error No Keymap Defined!
416#endif 428#endif
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 97a393c260..d43c3d527f 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -322,6 +322,15 @@ CONFIG_KEYPAD == MROBE500_PAD
322#define PUZZLE_QUIT_TEXT "[POWER]" 322#define PUZZLE_QUIT_TEXT "[POWER]"
323#define PUZZLE_SHUFFLE_TEXT "[MENU]" 323#define PUZZLE_SHUFFLE_TEXT "[MENU]"
324 324
325#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
326#define PUZZLE_QUIT (BUTTON_POWER|BUTTON_REPEAT)
327#define PUZZLE_LEFT BUTTON_LEFT
328#define PUZZLE_RIGHT BUTTON_RIGHT
329#define PUZZLE_UP BUTTON_UP
330#define PUZZLE_DOWN BUTTON_DOWN
331#define PUZZLE_SHUFFLE BUTTON_POWER
332#define PUZZLE_PICTURE BUTTON_SELECT
333
325#else 334#else
326#error No keymap defined! 335#error No keymap defined!
327#endif 336#endif
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index d457d3dbd6..a73e61d9ec 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -281,6 +281,14 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
281#define SNAKE_QUIT BUTTON_POWER 281#define SNAKE_QUIT BUTTON_POWER
282#define SNAKE_PLAYPAUSE BUTTON_MENU 282#define SNAKE_PLAYPAUSE BUTTON_MENU
283 283
284#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
285#define SNAKE_QUIT BUTTON_POWER
286#define SNAKE_LEFT BUTTON_LEFT
287#define SNAKE_RIGHT BUTTON_RIGHT
288#define SNAKE_UP BUTTON_UP
289#define SNAKE_DOWN BUTTON_DOWN
290#define SNAKE_PLAYPAUSE BUTTON_SELECT
291
284#else 292#else
285#error No keymap defined! 293#error No keymap defined!
286#endif 294#endif
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 818dbfedf2..f32012e029 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -410,6 +410,15 @@ CONFIG_KEYPAD == MROBE500_PAD
410#define SNAKE2_PLAYPAUSE BUTTON_MENU 410#define SNAKE2_PLAYPAUSE BUTTON_MENU
411#define SNAKE2_PLAYPAUSE_TEXT "Menu" 411#define SNAKE2_PLAYPAUSE_TEXT "Menu"
412 412
413#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
414#define SNAKE2_LEFT BUTTON_LEFT
415#define SNAKE2_RIGHT BUTTON_RIGHT
416#define SNAKE2_UP BUTTON_UP
417#define SNAKE2_DOWN BUTTON_DOWN
418#define SNAKE2_QUIT BUTTON_POWER
419#define SNAKE2_PLAYPAUSE BUTTON_SELECT
420#define SNAKE2_PLAYPAUSE_TEXT "Select"
421
413#else 422#else
414#error No keymap defined! 423#error No keymap defined!
415#endif 424#endif
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 4903e47cf5..af369f82a6 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -416,6 +416,18 @@
416#define BUTTON_SAVE BUTTON_PLAYPAUSE 416#define BUTTON_SAVE BUTTON_PLAYPAUSE
417#define BUTTON_SAVE_NAME "Play/pause" 417#define BUTTON_SAVE_NAME "Play/pause"
418 418
419#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
420#define SOKOBAN_LEFT BUTTON_LEFT
421#define SOKOBAN_RIGHT BUTTON_RIGHT
422#define SOKOBAN_UP BUTTON_UP
423#define SOKOBAN_DOWN BUTTON_DOWN
424#define SOKOBAN_MENU BUTTON_POWER
425#define SOKOBAN_UNDO BUTTON_VOLUP
426#define SOKOBAN_REDO BUTTON_VOLDOWN
427#define SOKOBAN_PAUSE BUTTON_SELECT
428#define BUTTON_SAVE BUTTON_SELECT
429#define BUTTON_SAVE_NAME "Select"
430
419#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD 431#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
420#define SOKOBAN_LEFT BUTTON_LEFT 432#define SOKOBAN_LEFT BUTTON_LEFT
421#define SOKOBAN_RIGHT BUTTON_RIGHT 433#define SOKOBAN_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index affa4a314d..ee3742472b 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -647,6 +647,23 @@ CONFIG_KEYPAD == MROBE500_PAD
647#define HK_CUR2STACK "Option+Left" 647#define HK_CUR2STACK "Option+Left"
648#define HK_REM2STACK "Option+Right" 648#define HK_REM2STACK "Option+Right"
649 649
650#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
651#define SOL_QUIT BUTTON_POWER
652#define SOL_UP BUTTON_UP
653#define SOL_DOWN BUTTON_DOWN
654#define SOL_LEFT BUTTON_LEFT
655#define SOL_RIGHT BUTTON_RIGHT
656#define SOL_MOVE BUTTON_SELECT
657#define SOL_DRAW (BUTTON_VOLUP|BUTTON_UP)
658#define SOL_REM2CUR (BUTTON_VOLUP|BUTTON_DOWN)
659#define SOL_CUR2STACK (BUTTON_VOLUP|BUTTON_LEFT)
660#define SOL_REM2STACK (BUTTON_VOLUP|BUTTON_RIGHT)
661#define HK_MOVE "Select"
662#define HK_DRAW "Option+Up"
663#define HK_REM2CUR "Option+Down"
664#define HK_CUR2STACK "Option+Left"
665#define HK_REM2STACK "Option+Right"
666
650#elif (CONFIG_KEYPAD == CREATIVE_ZEN_PAD) 667#elif (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)
651#define SOL_QUIT BUTTON_POWER 668#define SOL_QUIT BUTTON_POWER
652#define SOL_UP BUTTON_UP 669#define SOL_UP BUTTON_UP
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 819ecf87f2..7a22de814b 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -346,6 +346,14 @@
346#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 346#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
347#define AST_QUIT BUTTON_POWER 347#define AST_QUIT BUTTON_POWER
348 348
349#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
350#define AST_QUIT BUTTON_POWER
351#define AST_THRUST BUTTON_UP
352#define AST_HYPERSPACE BUTTON_VOLUP
353#define AST_LEFT BUTTON_LEFT
354#define AST_RIGHT BUTTON_RIGHT
355#define AST_FIRE BUTTON_SELECT
356
349#else 357#else
350#error No keymap defined! 358#error No keymap defined!
351#endif 359#endif
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 3560c077f5..6d0cd65e20 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -607,6 +607,22 @@
607#define STAR_TOGGLE_CONTROL BUTTON_MENU 607#define STAR_TOGGLE_CONTROL BUTTON_MENU
608#define STAR_TOGGLE_CONTROL_NAME "MENU" 608#define STAR_TOGGLE_CONTROL_NAME "MENU"
609 609
610#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
611#define STAR_QUIT BUTTON_POWER
612#define STAR_LEFT BUTTON_LEFT
613#define STAR_RIGHT BUTTON_RIGHT
614#define STAR_UP BUTTON_UP
615#define STAR_DOWN BUTTON_DOWN
616#define STAR_TOGGLE_CONTROL BUTTON_SELECT
617#define STAR_LEVEL_UP (BUTTON_VOLUP|BUTTON_UP)
618#define STAR_LEVEL_DOWN (BUTTON_VOLUP|BUTTON_DOWN)
619#define STAR_LEVEL_REPEAT (BUTTON_VOLUP|BUTTON_SELECT)
620#define STAR_LEVEL_UP_NAME "Option+Up"
621#define STAR_LEVEL_DOWN_NAME "Option+Down"
622#define STAR_LEVEL_REPEAT_NAME "Option+Play"
623#define STAR_TOGGLE_CONTROL_NAME "Play"
624#define STAR_QUIT_NAME "Back"
625
610#else 626#else
611#error No keymap defined! 627#error No keymap defined!
612#endif 628#endif
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 3bfad97d9a..8d99178e48 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -305,6 +305,14 @@
305#define STOPWATCH_SCROLL_UP BUTTON_UP 305#define STOPWATCH_SCROLL_UP BUTTON_UP
306#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN 306#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
307 307
308#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
309#define STOPWATCH_QUIT BUTTON_POWER
310#define STOPWATCH_START_STOP BUTTON_SELECT
311#define STOPWATCH_RESET_TIMER BUTTON_LEFT
312#define STOPWATCH_LAP_TIMER BUTTON_RIGHT
313#define STOPWATCH_SCROLL_UP BUTTON_UP
314#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
315
308#else 316#else
309#error No keymap defined! 317#error No keymap defined!
310#endif 318#endif
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index ca17399e8b..8d871c7b2d 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -414,6 +414,15 @@
414#define SUDOKU_BUTTON_QUIT BUTTON_POWER 414#define SUDOKU_BUTTON_QUIT BUTTON_POWER
415#define SUDOKU_BUTTON_MENU BUTTON_MENU 415#define SUDOKU_BUTTON_MENU BUTTON_MENU
416 416
417#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
418#define SUDOKU_BUTTON_MENU BUTTON_POWER
419#define SUDOKU_BUTTON_UP BUTTON_UP
420#define SUDOKU_BUTTON_DOWN BUTTON_DOWN
421#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
422#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
423#define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
424#define SUDOKU_BUTTON_POSSIBLE BUTTON_VOLUP
425
417#else 426#else
418#error No keymap defined! 427#error No keymap defined!
419#endif 428#endif
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index 3ea41614a3..9d1b5afa88 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -540,6 +540,16 @@
540#define TV_MENU BUTTON_MENU 540#define TV_MENU BUTTON_MENU
541#define TV_BOOKMARK BUTTON_BOTTOMLEFT 541#define TV_BOOKMARK BUTTON_BOTTOMLEFT
542 542
543#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
544#define TV_QUIT BUTTON_POWER
545#define TV_SCROLL_UP BUTTON_UP
546#define TV_SCROLL_DOWN BUTTON_DOWN
547#define TV_SCREEN_LEFT BUTTON_LEFT
548#define TV_SCREEN_RIGHT BUTTON_RIGHT
549#define TV_MENU BUTTON_SELECT
550#define TV_AUTOSCROLL BUTTON_VOLDOWN
551#define TV_BOOKMARK BUTTON_VOLUP
552
543#else 553#else
544#error No keymap defined! 554#error No keymap defined!
545#endif 555#endif
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 12cc127002..8c80066c67 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -409,6 +409,18 @@
409#define LABEL_QUIT "Power" 409#define LABEL_QUIT "Power"
410#define LABEL_MENU "Menu" 410#define LABEL_MENU "Menu"
411 411
412#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
413#define VUMETER_QUIT (BUTTON_POWER|BUTTON_REL)
414#define VUMETER_MENU BUTTON_SELECT
415#define VUMETER_UP BUTTON_VOLUP
416#define VUMETER_DOWN BUTTON_VOLDOWN
417#define VUMETER_HELP BUTTON_UP
418#define LABEL_QUIT "Power"
419#define LABEL_MENU "Select"
420#define LABEL_HELP "Up"
421#define LABEL_VOLUME "Vol Up/Down"
422#define LABEL_MENU "Select"
423
412#else 424#else
413#error No keymap defined! 425#error No keymap defined!
414#endif 426#endif
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 33076df57e..f1ccaec782 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -384,6 +384,15 @@ CONFIG_KEYPAD == MROBE500_PAD
384#define BTN_STARTPAUSE BUTTON_MENU 384#define BTN_STARTPAUSE BUTTON_MENU
385#define BTN_STOPRESET (BUTTON_MENU|BUTTON_REPEAT) 385#define BTN_STOPRESET (BUTTON_MENU|BUTTON_REPEAT)
386 386
387#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
388#define BTN_DIR_UP BUTTON_UP
389#define BTN_DIR_DOWN BUTTON_DOWN
390#define BTN_DIR_LEFT BUTTON_LEFT
391#define BTN_DIR_RIGHT BUTTON_RIGHT
392#define BTN_STARTPAUSE BUTTON_SELECT
393#define BTN_QUIT BUTTON_POWER
394#define BTN_STOPRESET (BUTTON_SELECT|BUTTON_REPEAT)
395
387#else 396#else
388#error No keymap defined! 397#error No keymap defined!
389#endif 398#endif
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index ada33dafdd..f5c4a29bdf 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -334,6 +334,14 @@ CONFIG_KEYPAD == MROBE500_PAD
334#define QUIT BUTTON_POWER 334#define QUIT BUTTON_POWER
335#define PAUSE BUTTON_MENU 335#define PAUSE BUTTON_MENU
336 336
337#elif CONFIG_KEYPAD == AGPTEK_ROCKER_PAD
338#define QUIT BUTTON_POWER
339#define LEFT BUTTON_LEFT
340#define RIGHT BUTTON_RIGHT
341#define UP BUTTON_UP
342#define DOWN BUTTON_DOWN
343#define PAUSE BUTTON_SELECT
344
337#else 345#else
338#error No keymap defined! 346#error No keymap defined!
339#endif 347#endif
diff --git a/apps/plugins/xworld/sys.c b/apps/plugins/xworld/sys.c
index a240c75924..22fc92f7e2 100644
--- a/apps/plugins/xworld/sys.c
+++ b/apps/plugins/xworld/sys.c
@@ -448,7 +448,11 @@ void sys_setPalette(struct System* sys, uint8_t start, uint8_t n, const uint8_t
448 uint8_t col = buf[i * 3 + j]; 448 uint8_t col = buf[i * 3 + j];
449 c[j] = (col << 2) | (col & 3); 449 c[j] = (col << 2) | (col & 3);
450 } 450 }
451#if (LCD_DEPTH > 16) && (LCD_DEPTH <= 24) 451#if (LCD_DEPTH > 24)
452 sys->palette[i] = (fb_data) {
453 c[2], c[1], c[0], 255
454 };
455#elif (LCD_DEPTH > 16) && (LCD_DEPTH <= 24)
452 sys->palette[i] = (fb_data) { 456 sys->palette[i] = (fb_data) {
453 c[2], c[1], c[0] 457 c[2], c[1], c[0]
454 }; 458 };
@@ -621,7 +625,12 @@ void sys_copyRect(struct System* sys, uint16_t x, uint16_t y, uint16_t w, uint16
621#ifdef HAVE_LCD_COLOR 625#ifdef HAVE_LCD_COLOR
622 int r, g, b; 626 int r, g, b;
623 fb_data pix = rb->lcd_framebuffer[y * LCD_WIDTH + x]; 627 fb_data pix = rb->lcd_framebuffer[y * LCD_WIDTH + x];
624#if (LCD_DEPTH == 24) 628#if (LCD_DEPTH > 24)
629 r = 0xff - pix.r;
630 g = 0xff - pix.g;
631 b = 0xff - pix.b;
632 rb->lcd_framebuffer[y * LCD_WIDTH + x] = (fb_data) { b, g, r, 255 };
633#elif (LCD_DEPTH == 24)
625 r = 0xff - pix.r; 634 r = 0xff - pix.r;
626 g = 0xff - pix.g; 635 g = 0xff - pix.g;
627 b = 0xff - pix.b; 636 b = 0xff - pix.b;
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index 47ee8ed1e1..d10eeb67e7 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -274,6 +274,14 @@
274#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD 274#elif CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD
275#define ZX_MENU BUTTON_MENU 275#define ZX_MENU BUTTON_MENU
276 276
277#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
278#define ZX_MENU BUTTON_POWER
279#define ZX_UP BUTTON_UP
280#define ZX_DOWN BUTTON_DOWN
281#define ZX_LEFT BUTTON_LEFT
282#define ZX_RIGHT BUTTON_RIGHT
283#define ZX_SELECT BUTTON_SELECT
284
277#else 285#else
278#error Keymap not defined! 286#error Keymap not defined!
279 287
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index 7fbad173ec..2931c8ea32 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -270,6 +270,14 @@
270#define KBD_UP BUTTON_UP 270#define KBD_UP BUTTON_UP
271#define KBD_DOWN BUTTON_DOWN 271#define KBD_DOWN BUTTON_DOWN
272 272
273#elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD)
274#define KBD_SELECT BUTTON_SELECT
275#define KBD_ABORT BUTTON_POWER
276#define KBD_LEFT BUTTON_LEFT
277#define KBD_RIGHT BUTTON_RIGHT
278#define KBD_UP BUTTON_UP
279#define KBD_DOWN BUTTON_DOWN
280
273#endif 281#endif
274 282
275#ifdef HAVE_TOUCHSCREEN 283#ifdef HAVE_TOUCHSCREEN
diff --git a/tools/configure b/tools/configure
index 963bb62804..1d93fd025f 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4206,7 +4206,7 @@ fi
4206 output="rockbox.rocker" 4206 output="rockbox.rocker"
4207 bootoutput="bootloader.rocker" 4207 bootoutput="bootloader.rocker"
4208 appextra="recorder:gui:hosted" 4208 appextra="recorder:gui:hosted"
4209 plugins="" 4209 plugins="yes"
4210 swcodec="yes" 4210 swcodec="yes"
4211 # architecture, manufacturer and model for the target-tree build 4211 # architecture, manufacturer and model for the target-tree build
4212 t_cpu="hosted" 4212 t_cpu="hosted"