devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Add button mappings and support for iAudio X5, also simplified a bit of code.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9545 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Zakk Roberts 2006-04-07 00:17:34 +00:00
parent 17b17be607
commit a7b593055f
2 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/SOURCES
View file

@ -71,9 +71,7 @@ wormlet.c
#endif #endif
#ifdef CONFIG_RTC #ifdef CONFIG_RTC
#if CONFIG_KEYPAD != IAUDIO_X5_PAD
clock.c clock.c
#endif
#if CONFIG_KEYPAD == RECORDER_PAD /* Recorder models only for now */ #if CONFIG_KEYPAD == RECORDER_PAD /* Recorder models only for now */
calendar.c calendar.c
#endif #endif

43
apps/plugins/clock.c
View file

@ -162,6 +162,24 @@ PLUGIN_HEADER
#define MENU_BUTTON_TEXT "NAVI" #define MENU_BUTTON_TEXT "NAVI"
#define COUNTER_BUTTON_TEXT "PLAY" #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 #endif
/************ /************
@ -2694,36 +2712,37 @@ void counter_settings(void)
else else
{ {
if(cursorpos == 3) 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) if(target_hour < 9)
target_hour++; target_hour++;
else else
target_hour = 0; target_hour = 0;
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) #else
if(target_hour > 0) if(target_hour > 0)
target_hour--; target_hour--;
else else
target_hour = 9; target_hour = 9;
#endif #endif
else if(cursorpos == 4) 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) if(target_minute < 59)
target_minute++; target_minute++;
else else
target_minute = 0; target_minute = 0;
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) #else
if(target_minute > 0) if(target_minute > 0)
target_minute--; target_minute--;
else else
target_minute = 59; target_minute = 59;
#endif #endif
else 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) if(target_second < 59)
target_second++; target_second++;
else else
target_second = 0; target_second = 0;
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) #else
if(target_second > 0) if(target_second > 0)
target_second--; target_second--;
else else
@ -2742,36 +2761,36 @@ void counter_settings(void)
else else
{ {
if(cursorpos == 3) 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) if(target_hour > 0)
target_hour--; target_hour--;
else else
target_hour = 9; target_hour = 9;
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) #else
if(target_hour < 9) if(target_hour < 9)
target_hour++; target_hour++;
else else
target_hour = 0; target_hour = 0;
#endif #endif
else if(cursorpos == 4) 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) if(target_minute > 0)
target_minute--; target_minute--;
else else
target_minute = 59; target_minute = 59;
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) #else
if(target_minute < 59) if(target_minute < 59)
target_minute++; target_minute++;
else else
target_minute = 0; target_minute = 0;
#endif #endif
else 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) if(target_second > 0)
target_second--; target_second--;
else else
target_second = 59; target_second = 59;
#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) #else
if(target_second < 59) if(target_second < 59)
target_second++; target_second++;
else else