diff options
| author | Zakk Roberts <midk@rockbox.org> | 2006-04-07 00:17:34 +0000 |
|---|---|---|
| committer | Zakk Roberts <midk@rockbox.org> | 2006-04-07 00:17:34 +0000 |
| commit | a7b593055f54e56aa9ee3cc896b158f486f9ec6b (patch) | |
| tree | 13f7554d046ff337ee8cebd4675b730f1ffea211 /apps/plugins/clock.c | |
| parent | 17b17be6070a6302bf9c6e2f994af9b81c5ec700 (diff) | |
| download | rockbox-a7b593055f54e56aa9ee3cc896b158f486f9ec6b.zip rockbox-a7b593055f54e56aa9ee3cc896b158f486f9ec6b.tar.gz rockbox-a7b593055f54e56aa9ee3cc896b158f486f9ec6b.tar.bz2 rockbox-a7b593055f54e56aa9ee3cc896b158f486f9ec6b.tar.xz | |
Add button mappings and support for iAudio X5, also simplified a bit of code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9545 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/clock.c')
| -rw-r--r-- | apps/plugins/clock.c | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index 0bb5193..81caafc 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c @@ -162,6 +162,24 @@ PLUGIN_HEADER #define MENU_BUTTON_TEXT "NAVI" #define COUNTER_BUTTON_TEXT "PLAY" +#elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) + +#define COUNTER_TOGGLE_BUTTON (BUTTON_PLAY|BUTTON_REL) +#define COUNTER_RESET_BUTTON (BUTTON_PLAY|BUTTON_REPEAT) +#define MENU_BUTTON BUTTON_SELECT +#define EXIT_BUTTON BUTTON_POWER +#define MOVE_UP_BUTTON BUTTON_UP +#define MOVE_DOWN_BUTTON BUTTON_DOWN +#define CHANGE_UP_BUTTON BUTTON_RIGHT +#define CHANGE_DOWN_BUTTON BUTTON_LEFT + +#define YESTEXT "Select" +#define NAVI_BUTTON_TEXT_LEFT "LEFT" +#define NAVI_BUTTON_TEXT_RIGHT "RIGHT" +#define EXIT_BUTTON_TEXT "POWER" +#define MENU_BUTTON_TEXT "SELECT" +#define COUNTER_BUTTON_TEXT "PLAY" + #endif /************ @@ -2694,36 +2712,37 @@ void counter_settings(void) else { if(cursorpos == 3) -#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) +#if (CONFIG_KEYPAD != IPOD_3G_PAD) && (CONFIG_KEYPAD != IPOD_4G_PAD) if(target_hour < 9) target_hour++; else target_hour = 0; -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#else if(target_hour > 0) target_hour--; else target_hour = 9; #endif else if(cursorpos == 4) -#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) + +#if (CONFIG_KEYPAD != IPOD_3G_PAD) && (CONFIG_KEYPAD != IPOD_4G_PAD) if(target_minute < 59) target_minute++; else target_minute = 0; -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#else if(target_minute > 0) target_minute--; else target_minute = 59; #endif else -#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) +#if (CONFIG_KEYPAD != IPOD_3G_PAD) && (CONFIG_KEYPAD != IPOD_4G_PAD) if(target_second < 59) target_second++; else target_second = 0; -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#else if(target_second > 0) target_second--; else @@ -2742,36 +2761,36 @@ void counter_settings(void) else { if(cursorpos == 3) -#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) +#if (CONFIG_KEYPAD != IPOD_3G_PAD) && (CONFIG_KEYPAD != IPOD_4G_PAD) if(target_hour > 0) target_hour--; else target_hour = 9; -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#else if(target_hour < 9) target_hour++; else target_hour = 0; #endif else if(cursorpos == 4) -#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) +#if (CONFIG_KEYPAD != IPOD_3G_PAD) && (CONFIG_KEYPAD != IPOD_4G_PAD) if(target_minute > 0) target_minute--; else target_minute = 59; -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#else if(target_minute < 59) target_minute++; else target_minute = 0; #endif else -#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) +#if (CONFIG_KEYPAD != IPOD_3G_PAD) && (CONFIG_KEYPAD != IPOD_4G_PAD) if(target_second > 0) target_second--; else target_second = 59; -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) +#else if(target_second < 59) target_second++; else |