diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-06-12 11:30:08 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-06-12 15:31:30 +0000 |
commit | 58cb467583e3d24fb677f19ddaaba92ad534940c (patch) | |
tree | 4691bf36dcf92606391029bc093bd8a43385233d | |
parent | fa93391600f52e457f514676f5707f3dc09f3045 (diff) | |
download | rockbox-58cb467583e3d24fb677f19ddaaba92ad534940c.tar.gz rockbox-58cb467583e3d24fb677f19ddaaba92ad534940c.zip |
xduoox3ii: Add UI Simulator bitmap, keymap, and fix offsets.
Change-Id: I8e322b93653cb43b010dfd5c0f566ea1c4c7b7ff
-rw-r--r-- | firmware/target/hosted/sdl/sim-ui-defines.h | 8 | ||||
-rw-r--r-- | uisimulator/bitmaps/UI-xduoox3ii.bmp | bin | 0 -> 540122 bytes | |||
-rw-r--r-- | uisimulator/buttonmap/SOURCES | 2 | ||||
-rw-r--r-- | uisimulator/buttonmap/xduoo-x3ii.c | 81 |
4 files changed, 87 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index 1e96383682..23825f318b 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h | |||
@@ -531,10 +531,10 @@ | |||
531 | 531 | ||
532 | #elif defined(XDUOO_X3II) | 532 | #elif defined(XDUOO_X3II) |
533 | #define UI_TITLE "xDuoo X3ii" | 533 | #define UI_TITLE "xDuoo X3ii" |
534 | #define UI_WIDTH 322 /* width of GUI window */ | 534 | #define UI_WIDTH 299 /* width of GUI window */ |
535 | #define UI_HEIGHT 609 /* height of GUI window */ | 535 | #define UI_HEIGHT 600 /* height of GUI window */ |
536 | #define UI_LCD_POSX 43 | 536 | #define UI_LCD_POSX 28 |
537 | #define UI_LCD_POSY 62 | 537 | #define UI_LCD_POSY 56 |
538 | 538 | ||
539 | #elif defined(XDUOO_X20) | 539 | #elif defined(XDUOO_X20) |
540 | #define UI_TITLE "xDuoo X20" | 540 | #define UI_TITLE "xDuoo X20" |
diff --git a/uisimulator/bitmaps/UI-xduoox3ii.bmp b/uisimulator/bitmaps/UI-xduoox3ii.bmp new file mode 100644 index 0000000000..7f4321a904 --- /dev/null +++ b/uisimulator/bitmaps/UI-xduoox3ii.bmp | |||
Binary files differ | |||
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES index 4e331f4b85..130727254c 100644 --- a/uisimulator/buttonmap/SOURCES +++ b/uisimulator/buttonmap/SOURCES | |||
@@ -85,6 +85,8 @@ sony-nwza860.c | |||
85 | agptek-rocker.c | 85 | agptek-rocker.c |
86 | #elif CONFIG_KEYPAD == XDUOO_X3_PAD | 86 | #elif CONFIG_KEYPAD == XDUOO_X3_PAD |
87 | xduoo-x3.c | 87 | xduoo-x3.c |
88 | #elif CONFIG_KEYPAD == XDUOO_X3II_PAD | ||
89 | xduoo-x3ii.c | ||
88 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) | 90 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) |
89 | ihifi2.c | 91 | ihifi2.c |
90 | #endif | 92 | #endif |
diff --git a/uisimulator/buttonmap/xduoo-x3ii.c b/uisimulator/buttonmap/xduoo-x3ii.c new file mode 100644 index 0000000000..20638a155a --- /dev/null +++ b/uisimulator/buttonmap/xduoo-x3ii.c | |||
@@ -0,0 +1,81 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2016 by Roman Stolyarov | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | |||
23 | #include <SDL.h> | ||
24 | #include "button.h" | ||
25 | #include "buttonmap.h" | ||
26 | |||
27 | int key_to_button(int keyboard_button) | ||
28 | { | ||
29 | int new_btn = BUTTON_NONE; | ||
30 | switch (keyboard_button) | ||
31 | { | ||
32 | case SDLK_KP4: | ||
33 | case SDLK_UP: | ||
34 | new_btn = BUTTON_PREV; | ||
35 | break; | ||
36 | case SDLK_KP1: | ||
37 | case SDLK_DOWN: | ||
38 | new_btn = BUTTON_NEXT; | ||
39 | break; | ||
40 | case SDLK_KP3: | ||
41 | case SDLK_KP_ENTER: | ||
42 | case SDLK_SPACE: | ||
43 | case SDLK_RETURN: | ||
44 | new_btn = BUTTON_PLAY; | ||
45 | break; | ||
46 | case SDLK_KP5: | ||
47 | case SDLK_END: | ||
48 | case SDLK_BACKSPACE: | ||
49 | new_btn = BUTTON_OPTION; | ||
50 | break; | ||
51 | case SDLK_KP7: | ||
52 | case SDLK_ESCAPE: | ||
53 | new_btn = BUTTON_POWER; | ||
54 | break; | ||
55 | case SDLK_KP9: | ||
56 | case SDLK_HOME: | ||
57 | new_btn = BUTTON_HOME; | ||
58 | break; | ||
59 | case SDLK_KP_MINUS: | ||
60 | case SDLK_PAGEUP: | ||
61 | new_btn = BUTTON_VOL_UP; | ||
62 | break; | ||
63 | case SDLK_KP_PLUS: | ||
64 | case SDLK_PAGEDOWN: | ||
65 | new_btn = BUTTON_VOL_DOWN; | ||
66 | break; | ||
67 | } | ||
68 | return new_btn; | ||
69 | } | ||
70 | |||
71 | struct button_map bm[] = { | ||
72 | { SDLK_KP4, 214, 537, 20, "Prev" }, | ||
73 | { SDLK_KP1, 241, 488, 20, "Next" }, | ||
74 | { SDLK_KP3, 150, 488, 30, "Play" }, | ||
75 | { SDLK_KP5, 60, 488, 20, "Back" }, | ||
76 | { SDLK_KP7, 0, 60, 25, "Power" }, | ||
77 | { SDLK_KP9, 86, 537, 20, "Home" }, | ||
78 | { SDLK_KP_MINUS, 0, 120, 25, "Vol Up" }, | ||
79 | { SDLK_KP_PLUS, 0, 200, 25, "Vol Dn" }, | ||
80 | { 0, 0, 0, 0, "None" } | ||
81 | }; | ||