diff options
author | Jean-Louis Biasini <jlbiasini@gmail.com> | 2012-02-10 18:51:17 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-02-18 23:57:22 +0100 |
commit | e5b1b0f998f9ac16dc4a5f6be73be535f22533e4 (patch) | |
tree | 791dc2df7954abcda499ab716c55aeacd2cbe1bb | |
parent | 488f6229c0974fc9a7ff8762f1c35673b2747039 (diff) | |
download | rockbox-e5b1b0f998f9ac16dc4a5f6be73be535f22533e4.tar.gz rockbox-e5b1b0f998f9ac16dc4a5f6be73be535f22533e4.zip |
rockblox1d's plugin PLA integration (main code + manual)
1) this patch replace all keymaps with PLA ones. It also clean some optionnal
compiling that are not needed anymore througt PLA.
2) the patch also made required change to the manual in order to match code's
change.
3) it also add an alternative exit button (PLA_EXIT or PLA_CANCEL).
Change-Id: If6e78711eaab1dd2c907b418ba72c8789ceaa72b
Reviewed-on: http://gerrit.rockbox.org/105
Reviewed-by: Thomas Martitz <kugel@rockbox.org>
Tested-by: Thomas Martitz <kugel@rockbox.org>
-rw-r--r-- | apps/plugins/rockblox1d.c | 130 | ||||
-rw-r--r-- | manual/plugins/rockblox1d.tex | 19 |
2 files changed, 14 insertions, 135 deletions
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 7a50030596..6a2b013c44 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -21,123 +21,14 @@ | |||
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | 22 | ||
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | #include "lib/pluginlib_actions.h" | ||
24 | 25 | ||
25 | #if CONFIG_KEYPAD == RECORDER_PAD | 26 | /* this set the context to use with PLA */ |
26 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | 27 | static const struct button_mapping *plugin_contexts[] = { pla_main_ctx }; |
27 | #define ONEDROCKBLOX_QUIT BUTTON_OFF | 28 | #define ONEDROCKBLOX_DOWN PLA_DOWN |
28 | 29 | #define ONEDROCKBLOX_DOWN_REPEAT PLA_DOWN_REPEAT | |
29 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | 30 | #define ONEDROCKBLOX_QUIT PLA_EXIT |
30 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | 31 | #define ONEDROCKBLOX_QUIT2 PLA_CANCEL |
31 | #define ONEDROCKBLOX_QUIT BUTTON_OFF | ||
32 | |||
33 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
34 | #define ONEDROCKBLOX_DOWN BUTTON_RIGHT | ||
35 | #define ONEDROCKBLOX_QUIT BUTTON_OFF | ||
36 | |||
37 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | ||
38 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
39 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
40 | |||
41 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | ||
42 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
43 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
44 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
45 | #define ONEDROCKBLOX_QUIT (BUTTON_SELECT | BUTTON_MENU) | ||
46 | |||
47 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | ||
48 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
49 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
50 | #define ONEDROCKBLOX_QUIT BUTTON_OFF | ||
51 | |||
52 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | ||
53 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
54 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
55 | |||
56 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | ||
57 | CONFIG_KEYPAD == SANSA_C200_PAD || \ | ||
58 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | ||
59 | CONFIG_KEYPAD == SANSA_M200_PAD || \ | ||
60 | CONFIG_KEYPAD == SANSA_CONNECT_PAD | ||
61 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
62 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
63 | |||
64 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
65 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
66 | #define ONEDROCKBLOX_QUIT BUTTON_HOME | ||
67 | |||
68 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | ||
69 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | ||
70 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
71 | |||
72 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) || \ | ||
73 | (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) | ||
74 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
75 | #define ONEDROCKBLOX_QUIT BUTTON_BACK | ||
76 | |||
77 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | ||
78 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
79 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
80 | |||
81 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | ||
82 | #define ONEDROCKBLOX_DOWN BUTTON_RC_PLAY | ||
83 | #define ONEDROCKBLOX_QUIT BUTTON_RC_REC | ||
84 | |||
85 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) | ||
86 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | ||
87 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
88 | |||
89 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
90 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | ||
91 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
92 | |||
93 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | ||
94 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
95 | #define ONEDROCKBLOX_QUIT BUTTON_BACK | ||
96 | |||
97 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | ||
98 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | ||
99 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
100 | |||
101 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
102 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | ||
103 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
104 | |||
105 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
106 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | ||
107 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
108 | |||
109 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | ||
110 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | ||
111 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
112 | |||
113 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | ||
114 | #define ONEDROCKBLOX_DOWN BUTTON_DOWN | ||
115 | #define ONEDROCKBLOX_QUIT BUTTON_PLAY | ||
116 | |||
117 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | ||
118 | #define ONEDROCKBLOX_DOWN BUTTON_DOWN | ||
119 | #define ONEDROCKBLOX_QUIT BUTTON_REC | ||
120 | |||
121 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | ||
122 | #define ONEDROCKBLOX_DOWN BUTTON_FUNC | ||
123 | #define ONEDROCKBLOX_QUIT (BUTTON_REC | BUTTON_PLAY) | ||
124 | |||
125 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) | ||
126 | #define ONEDROCKBLOX_DOWN BUTTON_ENTER | ||
127 | #define ONEDROCKBLOX_QUIT BUTTON_MENU | ||
128 | |||
129 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) | ||
130 | #define ONEDROCKBLOX_DOWN BUTTON_DOWN | ||
131 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
132 | |||
133 | #elif defined(HAVE_TOUCHSCREEN) | ||
134 | |||
135 | #define ONEDROCKBLOX_DOWN BUTTON_BOTTOMMIDDLE | ||
136 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | ||
137 | |||
138 | #else | ||
139 | #error No keymap defined! | ||
140 | #endif | ||
141 | 32 | ||
142 | #define mrand(max) (short)(rb->rand()%max) | 33 | #define mrand(max) (short)(rb->rand()%max) |
143 | 34 | ||
@@ -295,14 +186,17 @@ enum plugin_status plugin_start(const void* parameter) | |||
295 | 186 | ||
296 | rb->lcd_update(); | 187 | rb->lcd_update(); |
297 | 188 | ||
298 | button = rb->button_status(); | 189 | /*We get button from PLA this way */ |
190 | button = pluginlib_getaction(TIMEOUT_NOBLOCK, plugin_contexts, | ||
191 | ARRAYLEN(plugin_contexts)); | ||
299 | 192 | ||
300 | switch(button) { | 193 | switch(button) { |
301 | case ONEDROCKBLOX_DOWN: | 194 | case ONEDROCKBLOX_DOWN: |
302 | case (ONEDROCKBLOX_DOWN|BUTTON_REPEAT): | 195 | case ONEDROCKBLOX_DOWN_REPEAT: |
303 | cycletime = 100; | 196 | cycletime = 100; |
304 | break; | 197 | break; |
305 | case ONEDROCKBLOX_QUIT: | 198 | case ONEDROCKBLOX_QUIT: |
199 | case ONEDROCKBLOX_QUIT2: | ||
306 | quit = true; | 200 | quit = true; |
307 | break; | 201 | break; |
308 | default: | 202 | default: |
diff --git a/manual/plugins/rockblox1d.tex b/manual/plugins/rockblox1d.tex index 4fc7d348a9..a8d27411b7 100644 --- a/manual/plugins/rockblox1d.tex +++ b/manual/plugins/rockblox1d.tex | |||
@@ -6,26 +6,11 @@ second dimension is missing so the user only has to move the bricks down. No | |||
6 | horizontal moving anymore and no need to rotate the brick! | 6 | horizontal moving anymore and no need to rotate the brick! |
7 | 7 | ||
8 | \begin{btnmap} | 8 | \begin{btnmap} |
9 | \opt{ONDIO_PAD}{\ButtonRight} | 9 | \PluginDown |
10 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD% | ||
11 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD% | ||
12 | ,SANSA_FUZE_PAD,SANSA_C200_PAD} | ||
13 | {\ButtonSelect} | ||
14 | \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay} | ||
15 | \opt{COWON_D2_PAD}{\ButtonMenu} | ||
16 | \opt{PBELL_VIBE500_PAD}{\ButtonDown} | ||
17 | \opt{MPIO_HD300_PAD}{\ButtonEnter} | ||
18 | \opt{HAVEREMOTEKEYMAP}{& } | 10 | \opt{HAVEREMOTEKEYMAP}{& } |
19 | & Move down faster\\ | 11 | & Move down faster\\ |
20 | 12 | ||
21 | \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} | 13 | \PluginCancel{} or \PluginExit |
22 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect} | ||
23 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD% | ||
24 | ,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD}{\ButtonPower} | ||
25 | \opt{SANSA_FUZE_PAD}{\ButtonHome} | ||
26 | \opt{GIGABEAT_S_PAD}{\ButtonBack} | ||
27 | \opt{PBELL_VIBE500_PAD}{\ButtonRec} | ||
28 | \opt{MPIO_HD300_PAD}{\ButtonMenu} | ||
29 | \opt{HAVEREMOTEKEYMAP}{& } | 14 | \opt{HAVEREMOTEKEYMAP}{& } |
30 | & Quit\\ | 15 | & Quit\\ |
31 | \end{btnmap} | 16 | \end{btnmap} |