summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMark Arigo <markarigo@gmail.com>2008-01-09 07:24:43 +0000
committerMark Arigo <markarigo@gmail.com>2008-01-09 07:24:43 +0000
commite66ddd754fba4171e3fd99c5a1b911ed3f9faa3f (patch)
tree918000a401ae36817091cc4561573a5578f87ba5 /apps
parentf59a327f674c36487ed04e6cf36369a622da7f40 (diff)
downloadrockbox-e66ddd754fba4171e3fd99c5a1b911ed3f9faa3f.tar.gz
rockbox-e66ddd754fba4171e3fd99c5a1b911ed3f9faa3f.zip
Initial commit for the Olympus m:robe 100 port (PP5020). The LCD driver works. The ADC driver was copied from the H10 port (they can probably be combined later), but the battery readings aren't right and it shuts down. The touch pad buttons do not work. Install the bootloader and rockbox the H10 way. Still lots of work to do.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16030 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/SOURCES2
-rw-r--r--apps/bitmaps/native/SOURCES4
-rw-r--r--apps/debug_menu.c3
-rw-r--r--apps/lang/english.lang6
4 files changed, 11 insertions, 4 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index 9b29605a83..38192316a6 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -162,4 +162,6 @@ keymaps/keymap-c200.c
162keymaps/keymap-av300.c 162keymaps/keymap-av300.c
163#elif CONFIG_KEYPAD == MROBE500_PAD 163#elif CONFIG_KEYPAD == MROBE500_PAD
164keymaps/keymap-mr500.c 164keymaps/keymap-mr500.c
165#elif CONFIG_KEYPAD == MROBE100_PAD
166keymaps/keymap-mr100.c
165#endif 167#endif
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES
index 88b60e0654..a64c209672 100644
--- a/apps/bitmaps/native/SOURCES
+++ b/apps/bitmaps/native/SOURCES
@@ -2,7 +2,11 @@
2 2
3/* Rockbox logo */ 3/* Rockbox logo */
4#if (LCD_DEPTH == 1) 4#if (LCD_DEPTH == 1)
5#if (LCD_WIDTH == 160)
6rockboxlogo.160x53x1.bmp
7#else
5rockboxlogo.112x30x1.bmp 8rockboxlogo.112x30x1.bmp
9#endif
6#elif (LCD_WIDTH == 128) && (LCD_DEPTH == 16) 10#elif (LCD_WIDTH == 128) && (LCD_DEPTH == 16)
7rockboxlogo.128x40x16.bmp 11rockboxlogo.128x40x16.bmp
8#elif (LCD_WIDTH == 132) && (LCD_DEPTH == 16) 12#elif (LCD_WIDTH == 132) && (LCD_DEPTH == 16)
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 8f24ac95f6..f5dbbf17a5 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -983,7 +983,8 @@ static bool dbg_spdif(void)
983#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD 983#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
984# define DEBUG_CANCEL BUTTON_REC 984# define DEBUG_CANCEL BUTTON_REC
985 985
986#elif CONFIG_KEYPAD == IRIVER_H10_PAD 986#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) || \
987 (CONFIG_KEYPAD == MROBE100_PAD)
987# define DEBUG_CANCEL BUTTON_REW 988# define DEBUG_CANCEL BUTTON_REW
988 989
989#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ 990#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 34eaed5343..3e918ff62e 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3888,17 +3888,17 @@
3888 <source> 3888 <source>
3889 *: none 3889 *: none
3890 e200: "Wheel Light Timeout" 3890 e200: "Wheel Light Timeout"
3891 c200,gigabeatf: "Button Light Timeout" 3891 c200,gigabeatf,mrobe100: "Button Light Timeout"
3892 </source> 3892 </source>
3893 <dest> 3893 <dest>
3894 *: none 3894 *: none
3895 e200: "Wheel Light Timeout" 3895 e200: "Wheel Light Timeout"
3896 c200,gigabeatf: "Button Light Timeout" 3896 c200,gigabeatf,mrobe100: "Button Light Timeout"
3897 </dest> 3897 </dest>
3898 <voice> 3898 <voice>
3899 *: none 3899 *: none
3900 e200: "Wheel Light Timeout" 3900 e200: "Wheel Light Timeout"
3901 c200,gigabeatf: "Button Light Timeout" 3901 c200,gigabeatf,mrobe100: "Button Light Timeout"
3902 </voice> 3902 </voice>
3903</phrase> 3903</phrase>
3904<phrase> 3904<phrase>