diff options
author | Nils Wallménius <nils@rockbox.org> | 2008-10-26 12:47:43 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2008-10-26 12:47:43 +0000 |
commit | 7bb81ce689fb4e5ac9f76b041708739e63fe6d77 (patch) | |
tree | be46c93982faec79bb3abc6710de51e338aebeea | |
parent | 535764c76b2807d60532e4ef423611da363a1e1e (diff) | |
download | rockbox-7bb81ce689fb4e5ac9f76b041708739e63fe6d77.tar.gz rockbox-7bb81ce689fb4e5ac9f76b041708739e63fe6d77.zip |
Change button map for iaudio x5 and m5 to avoid using impossible button combos, delete ondio button map as it has no rtc
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18884 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/calendar.c | 14 | ||||
-rw-r--r-- | manual/plugins/calendar.tex | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 577891e456..05f10ec5d0 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -47,16 +47,6 @@ PLUGIN_HEADER | |||
47 | #define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN) | 47 | #define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN) |
48 | #define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP) | 48 | #define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP) |
49 | 49 | ||
50 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
51 | #define CALENDAR_QUIT BUTTON_OFF | ||
52 | #define CALENDAR_SELECT (BUTTON_MENU|BUTTON_REL) | ||
53 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | ||
54 | #define CALENDAR_PREV_WEEK BUTTON_UP | ||
55 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
56 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
57 | #define CALENDAR_NEXT_MONTH (BUTTON_MENU|BUTTON_DOWN) | ||
58 | #define CALENDAR_PREV_MONTH (BUTTON_MENU|BUTTON_UP) | ||
59 | |||
60 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 50 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
61 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 51 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
62 | #define CALENDAR_QUIT BUTTON_OFF | 52 | #define CALENDAR_QUIT BUTTON_OFF |
@@ -87,8 +77,8 @@ PLUGIN_HEADER | |||
87 | #define CALENDAR_PREV_WEEK BUTTON_UP | 77 | #define CALENDAR_PREV_WEEK BUTTON_UP |
88 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | 78 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT |
89 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 79 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
90 | #define CALENDAR_NEXT_MONTH (BUTTON_PLAY|BUTTON_DOWN) | 80 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY |
91 | #define CALENDAR_PREV_MONTH (BUTTON_PLAY|BUTTON_UP) | 81 | #define CALENDAR_PREV_MONTH BUTTON_REC |
92 | 82 | ||
93 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 83 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
94 | #define CALENDAR_QUIT BUTTON_POWER | 84 | #define CALENDAR_QUIT BUTTON_POWER |
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex index f22b23097a..dad95c59db 100644 --- a/manual/plugins/calendar.tex +++ b/manual/plugins/calendar.tex | |||
@@ -25,7 +25,7 @@ yearly, monthly, and weekly memos. | |||
25 | \opt{ONDIO_PAD,MROBE100_PAD}{\ButtonMenu{} + \ButtonUp{} / \ButtonDown} | 25 | \opt{ONDIO_PAD,MROBE100_PAD}{\ButtonMenu{} + \ButtonUp{} / \ButtonDown} |
26 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} / \ButtonRec} | 26 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} / \ButtonRec} |
27 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay{} / \ButtonMenu} | 27 | \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay{} / \ButtonMenu} |
28 | \opt{IAUDIO_X5_PAD}{\ButtonPlay{} + \ButtonUp{} / \ButtonDown} | 28 | \opt{IAUDIO_X5_PAD}{\ButtonRec{} / \ButtonPlay{}} |
29 | \opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown} | 29 | \opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown} |
30 | \opt{GIGABEAT_S_PAD}{\ButtonNext{} / \ButtonPrev} | 30 | \opt{GIGABEAT_S_PAD}{\ButtonNext{} / \ButtonPrev} |
31 | \opt{SANSA_E200_PAD}{\ButtonUp{} / \ButtonDown} | 31 | \opt{SANSA_E200_PAD}{\ButtonUp{} / \ButtonDown} |