summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-10-26 12:47:43 +0000
committerNils Wallménius <nils@rockbox.org>2008-10-26 12:47:43 +0000
commit7bb81ce689fb4e5ac9f76b041708739e63fe6d77 (patch)
treebe46c93982faec79bb3abc6710de51e338aebeea
parent535764c76b2807d60532e4ef423611da363a1e1e (diff)
downloadrockbox-7bb81ce689fb4e5ac9f76b041708739e63fe6d77.zip
rockbox-7bb81ce689fb4e5ac9f76b041708739e63fe6d77.tar.gz
rockbox-7bb81ce689fb4e5ac9f76b041708739e63fe6d77.tar.bz2
rockbox-7bb81ce689fb4e5ac9f76b041708739e63fe6d77.tar.xz
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.c14
-rw-r--r--manual/plugins/calendar.tex2
2 files changed, 3 insertions, 13 deletions
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 577891e..05f10ec 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -47,16 +47,6 @@ PLUGIN_HEADER
#define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN)
#define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP)
-#elif CONFIG_KEYPAD == ONDIO_PAD
-#define CALENDAR_QUIT BUTTON_OFF
-#define CALENDAR_SELECT (BUTTON_MENU|BUTTON_REL)
-#define CALENDAR_NEXT_WEEK BUTTON_DOWN
-#define CALENDAR_PREV_WEEK BUTTON_UP
-#define CALENDAR_NEXT_DAY BUTTON_RIGHT
-#define CALENDAR_PREV_DAY BUTTON_LEFT
-#define CALENDAR_NEXT_MONTH (BUTTON_MENU|BUTTON_DOWN)
-#define CALENDAR_PREV_MONTH (BUTTON_MENU|BUTTON_UP)
-
#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
(CONFIG_KEYPAD == IRIVER_H300_PAD)
#define CALENDAR_QUIT BUTTON_OFF
@@ -87,8 +77,8 @@ PLUGIN_HEADER
#define CALENDAR_PREV_WEEK BUTTON_UP
#define CALENDAR_NEXT_DAY BUTTON_RIGHT
#define CALENDAR_PREV_DAY BUTTON_LEFT
-#define CALENDAR_NEXT_MONTH (BUTTON_PLAY|BUTTON_DOWN)
-#define CALENDAR_PREV_MONTH (BUTTON_PLAY|BUTTON_UP)
+#define CALENDAR_NEXT_MONTH BUTTON_PLAY
+#define CALENDAR_PREV_MONTH BUTTON_REC
#elif CONFIG_KEYPAD == GIGABEAT_PAD
#define CALENDAR_QUIT BUTTON_POWER
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index f22b230..dad95c5 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -25,7 +25,7 @@ yearly, monthly, and weekly memos.
\opt{ONDIO_PAD,MROBE100_PAD}{\ButtonMenu{} + \ButtonUp{} / \ButtonDown}
\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} / \ButtonRec}
\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay{} / \ButtonMenu}
- \opt{IAUDIO_X5_PAD}{\ButtonPlay{} + \ButtonUp{} / \ButtonDown}
+ \opt{IAUDIO_X5_PAD}{\ButtonRec{} / \ButtonPlay{}}
\opt{GIGABEAT_PAD,SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
\opt{GIGABEAT_S_PAD}{\ButtonNext{} / \ButtonPrev}
\opt{SANSA_E200_PAD}{\ButtonUp{} / \ButtonDown}