diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/bookmark.c | 2 | ||||
| -rw-r--r-- | apps/menu.h | 10 | ||||
| -rw-r--r-- | apps/recorder/keyboard.c | 10 | ||||
| -rw-r--r-- | apps/screens.c | 2 | ||||
| -rw-r--r-- | apps/settings.h | 9 | ||||
| -rw-r--r-- | apps/tree.h | 19 | ||||
| -rw-r--r-- | apps/wps.c | 20 |
7 files changed, 66 insertions, 6 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 23ccaef..785a8cf 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c @@ -670,6 +670,8 @@ static char* select_bookmark(const char* bookmark_file_name) #if CONFIG_KEYPAD == ONDIO_PAD case BUTTON_MENU | BUTTON_RIGHT: +#elif CONFIG_KEYPAD == IRIVER_H100_PAD + case BUTTON_ON | BUTTON_SELECT: #else case BUTTON_ON | BUTTON_PLAY: #endif diff --git a/apps/menu.h b/apps/menu.h index d7cdfbf..644e0c1 100644 --- a/apps/menu.h +++ b/apps/menu.h @@ -23,7 +23,15 @@ #include <stdbool.h> /* button definitions */ -#if CONFIG_KEYPAD == RECORDER_PAD +#if CONFIG_KEYPAD == IRIVER_H100_PAD +#define MENU_NEXT BUTTON_DOWN +#define MENU_PREV BUTTON_UP +#define MENU_EXIT BUTTON_LEFT +#define MENU_EXIT2 BUTTON_OFF +#define MENU_ENTER BUTTON_RIGHT +#define MENU_ENTER2 BUTTON_SELECT + +#elif CONFIG_KEYPAD == RECORDER_PAD #define MENU_NEXT BUTTON_DOWN #define MENU_PREV BUTTON_UP #define MENU_EXIT BUTTON_LEFT diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index e415166..7b954da 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -34,7 +34,15 @@ #define KEYBOARD_PAGES 3 -#if CONFIG_KEYPAD == RECORDER_PAD +#if CONFIG_KEYPAD == IRIVER_H100_PAD +#define KBD_CURSOR_RIGHT (BUTTON_ON | BUTTON_RIGHT) +#define KBD_CURSOR_LEFT (BUTTON_ON | BUTTON_LEFT) +#define KBD_SELECT BUTTON_SELECT +#define KBD_PAGE_FLIP BUTTON_MODE +#define KBD_DONE BUTTON_ON +#define KBD_ABORT BUTTON_OFF +#define KBD_BACKSPACE BUTTON_REC +#elif CONFIG_KEYPAD == RECORDER_PAD #define KBD_CURSOR_RIGHT (BUTTON_ON | BUTTON_RIGHT) #define KBD_CURSOR_LEFT (BUTTON_ON | BUTTON_LEFT) #define KBD_SELECT BUTTON_PLAY diff --git a/apps/screens.c b/apps/screens.c index 1ec53f6..771cd69 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -1136,7 +1136,7 @@ bool set_time_screen(const char* string, struct tm *tm) } #endif -#if CONFIG_KEYPAD == RECORDER_PAD +#if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == IRIVER_H100_PAD bool shutdown_screen(void) { int button; diff --git a/apps/settings.h b/apps/settings.h index 05cd5b8..8d92aa9 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -34,7 +34,14 @@ #define MAX_FILENAME 20 /* button definitions */ -#if CONFIG_KEYPAD == RECORDER_PAD +#if CONFIG_KEYPAD == IRIVER_H100_PAD +#define SETTINGS_INC BUTTON_UP +#define SETTINGS_DEC BUTTON_DOWN +#define SETTINGS_OK BUTTON_SELECT +#define SETTINGS_OK2 BUTTON_LEFT +#define SETTINGS_CANCEL BUTTON_OFF + +#elif CONFIG_KEYPAD == RECORDER_PAD #define SETTINGS_INC BUTTON_UP #define SETTINGS_DEC BUTTON_DOWN #define SETTINGS_OK BUTTON_PLAY diff --git a/apps/tree.h b/apps/tree.h index 880c26a..c2606e1 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -21,7 +21,24 @@ #include <stdbool.h> -#if CONFIG_KEYPAD == RECORDER_PAD +#if CONFIG_KEYPAD == IRIVER_H100_PAD +#define TREE_NEXT BUTTON_DOWN +#define TREE_PREV BUTTON_UP +#define TREE_EXIT BUTTON_LEFT +#define TREE_ENTER BUTTON_RIGHT +#define TREE_RUN (BUTTON_SELECT | BUTTON_REL) +#define TREE_RUN_PRE BUTTON_SELECT +#define TREE_MENU BUTTON_MODE +#define TREE_OFF BUTTON_OFF +#define TREE_WPS (BUTTON_ON | BUTTON_REL) +#define TREE_WPS_PRE BUTTON_ON +#define TREE_PGUP (BUTTON_ON | BUTTON_UP) +#define TREE_PGDN (BUTTON_ON | BUTTON_DOWN) +#define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) +#define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) +#define TREE_POWER_BTN BUTTON_ON + +#elif CONFIG_KEYPAD == RECORDER_PAD #define TREE_NEXT BUTTON_DOWN #define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT @@ -62,7 +62,25 @@ static struct mp3entry* nid3 = NULL; static char current_track_path[MAX_PATH+1]; /* button definitions */ -#if CONFIG_KEYPAD == RECORDER_PAD +#if CONFIG_KEYPAD == IRIVER_H100_PAD +#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) +#define WPS_NEXT_PRE BUTTON_RIGHT +#define WPS_PREV (BUTTON_LEFT | BUTTON_REL) +#define WPS_PREV_PRE BUTTON_LEFT +#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) +#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) +#define WPS_INCVOL BUTTON_UP +#define WPS_DECVOL BUTTON_DOWN +#define WPS_PAUSE BUTTON_ON +#define WPS_MENU (BUTTON_MODE | BUTTON_REL) +#define WPS_MENU_PRE BUTTON_MODE +#define WPS_BROWSE (BUTTON_ON | BUTTON_REL) +#define WPS_BROWSE_PRE BUTTON_ON +#define WPS_EXIT BUTTON_OFF +#define WPS_KEYLOCK (BUTTON_MODE | BUTTON_DOWN) +#define WPS_ID3 (BUTTON_MODE | BUTTON_ON) + +#elif CONFIG_KEYPAD == RECORDER_PAD #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) #define WPS_NEXT_PRE BUTTON_RIGHT #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) |