diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2006-03-02 13:28:24 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2006-03-02 13:28:24 +0000 |
commit | 8d0a32eb4b4fd7108b9ebae81f93b3909c3e477f (patch) | |
tree | 27748464d24770544561ed3fcc1b446954a2ad46 /apps | |
parent | f2fe4e0c4cd4ce3fe4d35c7422ada24c0ce3af9f (diff) | |
download | rockbox-8d0a32eb4b4fd7108b9ebae81f93b3909c3e477f.tar.gz rockbox-8d0a32eb4b4fd7108b9ebae81f93b3909c3e477f.zip |
gigabeat related changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8885 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/color_picker.c | 8 | ||||
-rw-r--r-- | apps/plugins/Makefile | 4 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox.c | 10 | ||||
-rw-r--r-- | apps/plugins/fire.c | 7 | ||||
-rw-r--r-- | apps/plugins/rockboy/menu.c | 6 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 7 |
6 files changed, 40 insertions, 2 deletions
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index 8c7e1deb0b..efdbe1a0e3 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c | |||
@@ -46,6 +46,14 @@ | |||
46 | #define SLIDER_RC_OK BUTTON_RC_ON | 46 | #define SLIDER_RC_OK BUTTON_RC_ON |
47 | #define SLIDER_RC_CANCEL BUTTON_RC_STOP | 47 | #define SLIDER_RC_CANCEL BUTTON_RC_STOP |
48 | 48 | ||
49 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | ||
50 | #define SLIDER_UP BUTTON_UP | ||
51 | #define SLIDER_DOWN BUTTON_DOWN | ||
52 | #define SLIDER_LEFT BUTTON_LEFT | ||
53 | #define SLIDER_RIGHT BUTTON_RIGHT | ||
54 | #define SLIDER_OK BUTTON_POWER | ||
55 | #define SLIDER_CANCEL BUTTON_A | ||
56 | |||
49 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 57 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
50 | #define SLIDER_UP BUTTON_LEFT | 58 | #define SLIDER_UP BUTTON_LEFT |
51 | #define SLIDER_DOWN BUTTON_RIGHT | 59 | #define SLIDER_DOWN BUTTON_RIGHT |
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 32286a25df..8c72294709 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -63,7 +63,7 @@ DIRS = . | |||
63 | SUBDIRS += searchengine databox | 63 | SUBDIRS += searchengine databox |
64 | 64 | ||
65 | #for any recorder, iRiver or iPod model | 65 | #for any recorder, iRiver or iPod model |
66 | ifneq (,$(strip $(foreach tgt,RECORDER IRIVER IPOD_COLOR IPOD_VIDEO,$(findstring $(tgt),$(TARGET))))) | 66 | ifneq (,$(strip $(foreach tgt,RECORDER IRIVER IPOD_COLOR IPOD_VIDEO GIGABEAT,$(findstring $(tgt),$(TARGET))))) |
67 | ifneq (-DIRIVER_IFP7XX,$(TARGET)) | 67 | ifneq (-DIRIVER_IFP7XX,$(TARGET)) |
68 | SUBDIRS += rockboy | 68 | SUBDIRS += rockboy |
69 | endif | 69 | endif |
@@ -71,7 +71,7 @@ endif | |||
71 | 71 | ||
72 | # chessbox is too big to fit in the 32KB Archos plugin buffer, so we only | 72 | # chessbox is too big to fit in the 32KB Archos plugin buffer, so we only |
73 | # build for IRIVER and IPOD targets | 73 | # build for IRIVER and IPOD targets |
74 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO IRIVER IPOD,$(findstring $(tgt),$(TARGET))))) | 74 | ifneq (,$(strip $(foreach tgt,RECORDER ONDIO IRIVER IPOD GIGABEAT,$(findstring $(tgt),$(TARGET))))) |
75 | ifneq (-DIRIVER_IFP7XX,$(TARGET)) | 75 | ifneq (-DIRIVER_IFP7XX,$(TARGET)) |
76 | SUBDIRS += chessbox | 76 | SUBDIRS += chessbox |
77 | endif | 77 | endif |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 092de1825a..161de45e90 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -100,6 +100,16 @@ PLUGIN_HEADER | |||
100 | #define CB_LEVEL (BUTTON_MENU|BUTTON_OFF) | 100 | #define CB_LEVEL (BUTTON_MENU|BUTTON_OFF) |
101 | #define CB_QUIT BUTTON_OFF | 101 | #define CB_QUIT BUTTON_OFF |
102 | 102 | ||
103 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | ||
104 | #define CB_SELECT BUTTON_SELECT | ||
105 | #define CB_UP BUTTON_UP | ||
106 | #define CB_DOWN BUTTON_DOWN | ||
107 | #define CB_LEFT BUTTON_LEFT | ||
108 | #define CB_RIGHT BUTTON_RIGHT | ||
109 | #define CB_PLAY BUTTON_POWER | ||
110 | #define CB_LEVEL BUTTON_MENU | ||
111 | #define CB_QUIT BUTTON_A | ||
112 | |||
103 | #else | 113 | #else |
104 | #error CHESSBOX: Unsupported keypad | 114 | #error CHESSBOX: Unsupported keypad |
105 | #endif | 115 | #endif |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index a8d8d0afdb..64c9fa9371 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -77,6 +77,13 @@ static unsigned char draw_buffer[8*LCD_WIDTH]; | |||
77 | #define FIRE_INCREASE_MULT BUTTON_UP | 77 | #define FIRE_INCREASE_MULT BUTTON_UP |
78 | #define FIRE_DECREASE_MULT BUTTON_DOWN | 78 | #define FIRE_DECREASE_MULT BUTTON_DOWN |
79 | 79 | ||
80 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | ||
81 | #define FIRE_QUIT BUTTON_A | ||
82 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT | ||
83 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT | ||
84 | #define FIRE_INCREASE_MULT BUTTON_UP | ||
85 | #define FIRE_DECREASE_MULT BUTTON_DOWN | ||
86 | |||
80 | #endif | 87 | #endif |
81 | 88 | ||
82 | #define MIN_FLAME_VALUE 0 | 89 | #define MIN_FLAME_VALUE 0 |
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index 84bfeaa3cb..15f34582a6 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c | |||
@@ -16,6 +16,12 @@ | |||
16 | #define MENU_BUTTON_LEFT BUTTON_LEFT | 16 | #define MENU_BUTTON_LEFT BUTTON_LEFT |
17 | #define MENU_BUTTON_RIGHT BUTTON_RIGHT | 17 | #define MENU_BUTTON_RIGHT BUTTON_RIGHT |
18 | #define MENU_BUTTON_CANCEL BUTTON_MENU | 18 | #define MENU_BUTTON_CANCEL BUTTON_MENU |
19 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | ||
20 | #define MENU_BUTTON_UP BUTTON_UP | ||
21 | #define MENU_BUTTON_DOWN BUTTON_DOWN | ||
22 | #define MENU_BUTTON_LEFT BUTTON_LEFT | ||
23 | #define MENU_BUTTON_RIGHT BUTTON_RIGHT | ||
24 | #define MENU_BUTTON_CANCEL BUTTON_A | ||
19 | #else | 25 | #else |
20 | #define MENU_BUTTON_UP BUTTON_UP | 26 | #define MENU_BUTTON_UP BUTTON_UP |
21 | #define MENU_BUTTON_DOWN BUTTON_DOWN | 27 | #define MENU_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index da1017748f..41f06557a5 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -126,6 +126,13 @@ void setoptions (void) { | |||
126 | options.START=BUTTON_MODE; | 126 | options.START=BUTTON_MODE; |
127 | options.SELECT=(BUTTON_SELECT | BUTTON_REL); | 127 | options.SELECT=(BUTTON_SELECT | BUTTON_REL); |
128 | options.MENU=(BUTTON_SELECT | BUTTON_REPEAT); | 128 | options.MENU=(BUTTON_SELECT | BUTTON_REPEAT); |
129 | |||
130 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | ||
131 | options.A=BUTTON_VOL_UP; | ||
132 | options.B=BUTTON_VOL_DOWN; | ||
133 | options.START=BUTTON_POWER; | ||
134 | options.SELECT=BUTTON_SELECT; | ||
135 | options.MENU=BUTTON_MENU; | ||
129 | #endif | 136 | #endif |
130 | 137 | ||
131 | options.maxskip=4; | 138 | options.maxskip=4; |