summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config-mrobe100.h2
-rw-r--r--firmware/target/arm/olympus/mrobe-100/lcd-mr100.c7
-rw-r--r--firmware/target/arm/olympus/mrobe-100/power-mr100.c6
3 files changed, 9 insertions, 6 deletions
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 @@
/* until voltages are sorted out */
#define NO_LOW_BATTERY_SHUTDOWN
+#define OLYMPUS_MROBE_100 1
+
/* For Rolo and boot loader */
#define MODEL_NUMBER 23
#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,
/* Performance function that works with an external buffer
note that by and bheight are in 4-pixel units! */
-void lcd_grey_phase_blit(const struct grey_data *data, int x, int by,
- int width, int bheight, int stride)
+void lcd_grey_phase_blit(unsigned char *values, unsigned char *phases,
+ int x, int by, int width, int bheight, int stride)
{
/* TODO: Implement lcd_grey_phase_blit() */
- (void)data;
+ (void)values;
+ (void)phases;
(void)x;
(void)by;
(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)
bool charger_inserted(void)
{
- return false;
+ return (GPIOB_INPUT_VAL & 0x02) ? false : true ;
}
void ide_power_enable(bool on)
{
(void)on;
- /* We do nothing on the iPod */
+ /* We do nothing */
}
bool ide_powered(void)
{
- /* pretend we are always powered - we don't turn it off on the ipod */
+ /* pretend we are always powered - we don't turn it off */
return true;
}