diff options
-rw-r--r-- | apps/plugins/CATEGORIES | 1 | ||||
-rw-r--r-- | apps/plugins/SOURCES | 4 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS | 2 | ||||
-rw-r--r-- | apps/plugins/lib/gray_core.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/grey_core.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 9 | ||||
-rw-r--r-- | firmware/export/config-mrobe100.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/lcd-mr100.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/power-mr100.c | 6 | ||||
-rwxr-xr-x | tools/configure | 2 |
10 files changed, 26 insertions, 15 deletions
diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES index ee28614da0..4b267c162b 100644 --- a/apps/plugins/CATEGORIES +++ b/apps/plugins/CATEGORIES | |||
@@ -1,3 +1,4 @@ | |||
1 | autostart,apps | ||
1 | matrix,demos | 2 | matrix,demos |
2 | alpine_cdc,apps | 3 | alpine_cdc,apps |
3 | battery_bench,apps | 4 | battery_bench,apps |
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 94985579bc..383e32092a 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -1,3 +1,6 @@ | |||
1 | autostart.c | ||
2 | #ifndef OLYMPUS_MROBE_100 | ||
3 | |||
1 | /* plugins common to all models */ | 4 | /* plugins common to all models */ |
2 | battery_bench.c | 5 | battery_bench.c |
3 | chessclock.c | 6 | chessclock.c |
@@ -151,3 +154,4 @@ iriver_flash.c | |||
151 | superdom.c | 154 | superdom.c |
152 | #endif | 155 | #endif |
153 | #endif /* m:robe 500 */ | 156 | #endif /* m:robe 500 */ |
157 | #endif /* m:robe 100 */ | ||
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 12b38cea75..42e6331b06 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -1,4 +1,4 @@ | |||
1 | #if !defined(IRIVER_IFP7XX_SERIES) | 1 | #if !defined(IRIVER_IFP7XX_SERIES) && !defined(OLYMPUS_MROBE_100) |
2 | 2 | ||
3 | /* For all targets */ | 3 | /* For all targets */ |
4 | shortcuts | 4 | shortcuts |
diff --git a/apps/plugins/lib/gray_core.c b/apps/plugins/lib/gray_core.c index d8dddb3240..e28d56e84d 100644 --- a/apps/plugins/lib/gray_core.c +++ b/apps/plugins/lib/gray_core.c | |||
@@ -40,9 +40,9 @@ struct _gray_info _gray_info; /* global info structure */ | |||
40 | #ifndef SIMULATOR | 40 | #ifndef SIMULATOR |
41 | short _gray_random_buffer; /* buffer for random number generator */ | 41 | short _gray_random_buffer; /* buffer for random number generator */ |
42 | 42 | ||
43 | #if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX | 43 | #if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX || CONFIG_LCD == LCD_MROBE100 |
44 | /* measured and interpolated curve */ | 44 | /* measured and interpolated curve */ |
45 | /* TODO: check for iFP */ | 45 | /* TODO: check for iFP & m:robe 100 */ |
46 | static const unsigned char lcdlinear[256] = { | 46 | static const unsigned char lcdlinear[256] = { |
47 | 0, 3, 5, 8, 11, 13, 16, 18, | 47 | 0, 3, 5, 8, 11, 13, 16, 18, |
48 | 21, 23, 26, 28, 31, 33, 36, 38, | 48 | 21, 23, 26, 28, 31, 33, 36, 38, |
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index 5ba5f41404..0fa7e28eb9 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c | |||
@@ -36,9 +36,9 @@ struct _grey_info _grey_info; /* global info structure */ | |||
36 | 36 | ||
37 | #ifndef SIMULATOR | 37 | #ifndef SIMULATOR |
38 | 38 | ||
39 | #if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX | 39 | #if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX || CONFIG_LCD == LCD_MROBE100 |
40 | /* measured and interpolated curve */ | 40 | /* measured and interpolated curve */ |
41 | /* TODO: check for iFP */ | 41 | /* TODO: check for iFP & m:robe 100 */ |
42 | static const unsigned char lcdlinear[256] = { | 42 | static const unsigned char lcdlinear[256] = { |
43 | 0, 3, 5, 8, 11, 13, 16, 18, | 43 | 0, 3, 5, 8, 11, 13, 16, 18, |
44 | 21, 23, 26, 28, 31, 33, 36, 38, | 44 | 21, 23, 26, 28, 31, 33, 36, 38, |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index baf7440397..d277fe6d0d 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -111,7 +111,8 @@ const struct button_mapping generic_directions[] = | |||
111 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 111 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
112 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 112 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
113 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 113 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
114 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 114 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) \ |
115 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
115 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, | 116 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, |
116 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, | 117 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, |
117 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 118 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
@@ -193,7 +194,8 @@ const struct button_mapping generic_left_right_fire[] = | |||
193 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 194 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
194 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 195 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
195 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, | 196 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, |
196 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 197 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) \ |
198 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
197 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 199 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
198 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 200 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
199 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 201 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -286,7 +288,8 @@ const struct button_mapping generic_actions[] = | |||
286 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | 288 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, |
287 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 289 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
288 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 290 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
289 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 291 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD \ |
292 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
290 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 293 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
291 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 294 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
292 | {PLA_MENU, BUTTON_FF, BUTTON_NONE}, | 295 | {PLA_MENU, BUTTON_FF, BUTTON_NONE}, |
diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 3e0093446e..f0c82a5c48 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h | |||
@@ -7,6 +7,8 @@ | |||
7 | /* until voltages are sorted out */ | 7 | /* until voltages are sorted out */ |
8 | #define NO_LOW_BATTERY_SHUTDOWN | 8 | #define NO_LOW_BATTERY_SHUTDOWN |
9 | 9 | ||
10 | #define OLYMPUS_MROBE_100 1 | ||
11 | |||
10 | /* For Rolo and boot loader */ | 12 | /* For Rolo and boot loader */ |
11 | #define MODEL_NUMBER 23 | 13 | #define MODEL_NUMBER 23 |
12 | #define MODEL_NAME "Olympus m:robe MR-100" | 14 | #define MODEL_NAME "Olympus m:robe MR-100" |
diff --git a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c index bf751f47a9..c7977e63fc 100644 --- a/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/lcd-mr100.c | |||
@@ -132,11 +132,12 @@ void lcd_blit(const unsigned char* data, int x, int by, int width, | |||
132 | 132 | ||
133 | /* Performance function that works with an external buffer | 133 | /* Performance function that works with an external buffer |
134 | note that by and bheight are in 4-pixel units! */ | 134 | note that by and bheight are in 4-pixel units! */ |
135 | void lcd_grey_phase_blit(const struct grey_data *data, int x, int by, | 135 | void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases, |
136 | int width, int bheight, int stride) | 136 | int x, int by, int width, int bheight, int stride) |
137 | { | 137 | { |
138 | /* TODO: Implement lcd_grey_phase_blit() */ | 138 | /* TODO: Implement lcd_grey_phase_blit() */ |
139 | (void)data; | 139 | (void)values; |
140 | (void)phases; | ||
140 | (void)x; | 141 | (void)x; |
141 | (void)by; | 142 | (void)by; |
142 | (void)width; | 143 | (void)width; |
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c index 1fb2ecb958..54b7030646 100644 --- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c | |||
@@ -37,19 +37,19 @@ void power_init(void) | |||
37 | 37 | ||
38 | bool charger_inserted(void) | 38 | bool charger_inserted(void) |
39 | { | 39 | { |
40 | return false; | 40 | return (GPIOB_INPUT_VAL & 0x02) ? false : true ; |
41 | } | 41 | } |
42 | 42 | ||
43 | void ide_power_enable(bool on) | 43 | void ide_power_enable(bool on) |
44 | { | 44 | { |
45 | (void)on; | 45 | (void)on; |
46 | /* We do nothing on the iPod */ | 46 | /* We do nothing */ |
47 | } | 47 | } |
48 | 48 | ||
49 | 49 | ||
50 | bool ide_powered(void) | 50 | bool ide_powered(void) |
51 | { | 51 | { |
52 | /* pretend we are always powered - we don't turn it off on the ipod */ | 52 | /* pretend we are always powered - we don't turn it off */ |
53 | return true; | 53 | return true; |
54 | } | 54 | } |
55 | 55 | ||
diff --git a/tools/configure b/tools/configure index 6dc23258dc..89d38b3a66 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1308,7 +1308,7 @@ EOF | |||
1308 | appextra="recorder:gui" | 1308 | appextra="recorder:gui" |
1309 | archosrom="" | 1309 | archosrom="" |
1310 | flash="" | 1310 | flash="" |
1311 | plugins="" | 1311 | plugins="yes" |
1312 | swcodec="yes" | 1312 | swcodec="yes" |
1313 | boottool="$rootdir/tools/scramble -mi4v2 -model=m100 -type=RBBL" | 1313 | boottool="$rootdir/tools/scramble -mi4v2 -model=m100 -type=RBBL" |
1314 | bootoutput="pp5020.mi4" | 1314 | bootoutput="pp5020.mi4" |