diff options
Diffstat (limited to 'apps/plugins')
| -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 |
6 files changed, 16 insertions, 8 deletions
diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES index ee28614..4b267c1 100644 --- a/apps/plugins/CATEGORIES +++ b/apps/plugins/CATEGORIES @@ -1,3 +1,4 @@ +autostart,apps matrix,demos alpine_cdc,apps battery_bench,apps diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 9498557..383e320 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES @@ -1,3 +1,6 @@ +autostart.c +#ifndef OLYMPUS_MROBE_100 + /* plugins common to all models */ battery_bench.c chessclock.c @@ -151,3 +154,4 @@ iriver_flash.c superdom.c #endif #endif /* m:robe 500 */ +#endif /* m:robe 100 */ diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 12b38ce..42e6331 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS @@ -1,4 +1,4 @@ -#if !defined(IRIVER_IFP7XX_SERIES) +#if !defined(IRIVER_IFP7XX_SERIES) && !defined(OLYMPUS_MROBE_100) /* For all targets */ shortcuts diff --git a/apps/plugins/lib/gray_core.c b/apps/plugins/lib/gray_core.c index d8dddb3..e28d56e 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 */ #ifndef SIMULATOR short _gray_random_buffer; /* buffer for random number generator */ -#if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX +#if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX || CONFIG_LCD == LCD_MROBE100 /* measured and interpolated curve */ -/* TODO: check for iFP */ +/* TODO: check for iFP & m:robe 100 */ static const unsigned char lcdlinear[256] = { 0, 3, 5, 8, 11, 13, 16, 18, 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 5ba5f41..0fa7e28 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 */ #ifndef SIMULATOR -#if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX +#if CONFIG_LCD == LCD_SSD1815 || CONFIG_LCD == LCD_IFP7XX || CONFIG_LCD == LCD_MROBE100 /* measured and interpolated curve */ -/* TODO: check for iFP */ +/* TODO: check for iFP & m:robe 100 */ static const unsigned char lcdlinear[256] = { 0, 3, 5, 8, 11, 13, 16, 18, 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 baf7440..d277fe6 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[] = {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, -#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) +#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) \ + || (CONFIG_KEYPAD == MROBE100_PAD) { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, @@ -193,7 +194,8 @@ const struct button_mapping generic_left_right_fire[] = { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE}, -#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) +#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) \ + || (CONFIG_KEYPAD == MROBE100_PAD) { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, @@ -286,7 +288,8 @@ const struct button_mapping generic_actions[] = {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, -#elif CONFIG_KEYPAD == IRIVER_H10_PAD +#elif CONFIG_KEYPAD == IRIVER_H10_PAD \ + || (CONFIG_KEYPAD == MROBE100_PAD) {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, {PLA_START, BUTTON_PLAY, BUTTON_NONE}, {PLA_MENU, BUTTON_FF, BUTTON_NONE}, |