diff options
-rw-r--r-- | apps/keymaps/keymap-touchpad.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 15 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/cowond2/button-cowond2.c | 10 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/cowond2/button-target.h | 11 |
4 files changed, 29 insertions, 9 deletions
diff --git a/apps/keymaps/keymap-touchpad.c b/apps/keymaps/keymap-touchpad.c index 48f1103cd3..7b60a80ed1 100644 --- a/apps/keymaps/keymap-touchpad.c +++ b/apps/keymaps/keymap-touchpad.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id: keymap-mr500.c 16056 2008-01-11 21:48:01Z roolku $ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2006 Jonathan Gordon | 10 | * Copyright (C) 2006 Jonathan Gordon |
11 | * | 11 | * |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 1cd10581e1..7025120bde 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -132,6 +132,8 @@ const struct button_mapping generic_directions[] = | |||
132 | { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, | 132 | { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, |
133 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | 133 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, |
134 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 134 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
135 | #warning pluginlib_action needs working keymaps for the d2 | ||
136 | /* Needs Fxing | ||
135 | { PLA_UP, BUTTON_UP, BUTTON_NONE}, | 137 | { PLA_UP, BUTTON_UP, BUTTON_NONE}, |
136 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, | 138 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, |
137 | { PLA_LEFT, BUTTON_UP, BUTTON_MENU}, | 139 | { PLA_LEFT, BUTTON_UP, BUTTON_MENU}, |
@@ -140,6 +142,7 @@ const struct button_mapping generic_directions[] = | |||
140 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 142 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
141 | { PLA_LEFT_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_MENU}, | 143 | { PLA_LEFT_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_MENU}, |
142 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_MENU}, | 144 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_MENU}, |
145 | */ | ||
143 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 146 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
144 | { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, | 147 | { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, |
145 | { PLA_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, | 148 | { PLA_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, |
@@ -230,12 +233,14 @@ const struct button_mapping generic_left_right_fire[] = | |||
230 | { PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, | 233 | { PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, |
231 | { PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, | 234 | { PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, |
232 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 235 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
236 | /* Needs fixing | ||
233 | { PLA_LEFT, BUTTON_UP, BUTTON_NONE}, | 237 | { PLA_LEFT, BUTTON_UP, BUTTON_NONE}, |
234 | { PLA_RIGHT, BUTTON_DOWN, BUTTON_NONE}, | 238 | { PLA_RIGHT, BUTTON_DOWN, BUTTON_NONE}, |
235 | { PLA_LEFT_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE}, | 239 | { PLA_LEFT_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE}, |
236 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 240 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
237 | { PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, | 241 | { PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, |
238 | { PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, | 242 | { PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, |
243 | */ | ||
239 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 244 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
240 | { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, | 245 | { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, |
241 | { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, | 246 | { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, |
@@ -354,8 +359,8 @@ const struct button_mapping generic_actions[] = | |||
354 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 359 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
355 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 360 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
356 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 361 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
357 | {PLA_START, BUTTON_UP, BUTTON_NONE}, | 362 | {PLA_START, BUTTON_MINUS, BUTTON_NONE}, |
358 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | 363 | {PLA_MENU, BUTTON_PLUS, BUTTON_NONE}, |
359 | {PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, | 364 | {PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, |
360 | {PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, | 365 | {PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, |
361 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 366 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
@@ -380,7 +385,6 @@ const struct button_mapping generic_increase_decrease[] = | |||
380 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ | 385 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ |
381 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | 386 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ |
382 | || (CONFIG_KEYPAD == ONDIO_PAD) \ | 387 | || (CONFIG_KEYPAD == ONDIO_PAD) \ |
383 | || (CONFIG_KEYPAD == COWOND2_PAD) \ | ||
384 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ | 388 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ |
385 | || (CONFIG_KEYPAD == MROBE100_PAD) | 389 | || (CONFIG_KEYPAD == MROBE100_PAD) |
386 | {PLA_INC, BUTTON_UP, BUTTON_NONE}, | 390 | {PLA_INC, BUTTON_UP, BUTTON_NONE}, |
@@ -418,6 +422,11 @@ const struct button_mapping generic_increase_decrease[] = | |||
418 | {PLA_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, | 422 | {PLA_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, |
419 | {PLA_INC_REPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 423 | {PLA_INC_REPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
420 | {PLA_DEC_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 424 | {PLA_DEC_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
425 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
426 | {PLA_INC, BUTTON_PLUS, BUTTON_NONE}, | ||
427 | {PLA_DEC, BUTTON_MINUS, BUTTON_NONE}, | ||
428 | {PLA_INC_REPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE}, | ||
429 | {PLA_DEC_REPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE}, | ||
421 | #else | 430 | #else |
422 | #error pluginlib_actions: Unsupported keypad | 431 | #error pluginlib_actions: Unsupported keypad |
423 | #endif | 432 | #endif |
diff --git a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c index 12fafe6c8c..ea37893f40 100644 --- a/firmware/target/arm/tcc780x/cowond2/button-cowond2.c +++ b/firmware/target/arm/tcc780x/cowond2/button-cowond2.c | |||
@@ -22,6 +22,16 @@ | |||
22 | #include "button.h" | 22 | #include "button.h" |
23 | #include "adc.h" | 23 | #include "adc.h" |
24 | 24 | ||
25 | static enum touchpad_mode current_mode = TOUCHPAD_POINT; | ||
26 | void touchpad_set_mode(enum touchpad_mode mode) | ||
27 | { | ||
28 | current_mode = mode; | ||
29 | } | ||
30 | enum touchpad_mode touchpad_get_mode(void) | ||
31 | { | ||
32 | return current_mode; | ||
33 | } | ||
34 | |||
25 | void button_init_device(void) | 35 | void button_init_device(void) |
26 | { | 36 | { |
27 | /* Nothing to do */ | 37 | /* Nothing to do */ |
diff --git a/firmware/target/arm/tcc780x/cowond2/button-target.h b/firmware/target/arm/tcc780x/cowond2/button-target.h index 573ab03a11..2890ef65a3 100644 --- a/firmware/target/arm/tcc780x/cowond2/button-target.h +++ b/firmware/target/arm/tcc780x/cowond2/button-target.h | |||
@@ -35,11 +35,12 @@ int button_read_device(void); | |||
35 | #define BUTTON_MINUS 0x00000004 | 35 | #define BUTTON_MINUS 0x00000004 |
36 | #define BUTTON_MENU 0x00000008 | 36 | #define BUTTON_MENU 0x00000008 |
37 | 37 | ||
38 | /* compatibility hacks | 38 | /* compatibility hacks These definatly need fixing */ |
39 | not mapped to the touchpad button areas because | 39 | #define BUTTON_LEFT BUTTON_MIDLEFT |
40 | the touchpad is not always in that mode */ | 40 | #define BUTTON_RIGHT BUTTON_MIDRIGHT |
41 | #define BUTTON_LEFT BUTTON_MINUS | 41 | #define BUTTON_SELECT BUTTON_CENTER |
42 | #define BUTTON_RIGHT BUTTON_PLUS | 42 | #define BUTTON_UP BUTTON_TOPMIDDLE |
43 | #define BUTTON_DOWN BUTTON_BOTTOMMIDDLE | ||
43 | 44 | ||
44 | /* Faked buttons based on touchscreen quadrants (not yet read) */ | 45 | /* Faked buttons based on touchscreen quadrants (not yet read) */ |
45 | /* Touchpad Screen Area Buttons */ | 46 | /* Touchpad Screen Area Buttons */ |