diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config.h | 16 | ||||
-rw-r--r-- | firmware/export/usb.h | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index f377697b70..a3c2390f84 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -71,10 +71,11 @@ | |||
71 | #define SANSA_C200_PAD 14 | 71 | #define SANSA_C200_PAD 14 |
72 | #define ELIO_TPJ1022_PAD 15 | 72 | #define ELIO_TPJ1022_PAD 15 |
73 | #define ARCHOS_AV300_PAD 16 | 73 | #define ARCHOS_AV300_PAD 16 |
74 | #define MROBE500_PAD 17 | 74 | #define MROBE100_PAD 17 |
75 | #define GIGABEAT_S_PAD 18 | 75 | #define MROBE500_PAD 18 |
76 | #define LOGIK_DAX_PAD 19 | 76 | #define GIGABEAT_S_PAD 19 |
77 | #define IAUDIO67_PAD 20 | 77 | #define LOGIK_DAX_PAD 20 |
78 | #define IAUDIO67_PAD 21 | ||
78 | 79 | ||
79 | /* CONFIG_REMOTE_KEYPAD */ | 80 | /* CONFIG_REMOTE_KEYPAD */ |
80 | #define H100_REMOTE 1 | 81 | #define H100_REMOTE 1 |
@@ -107,8 +108,9 @@ | |||
107 | #define LCD_DSC25 16 /* as used by Archos AV300 */ | 108 | #define LCD_DSC25 16 /* as used by Archos AV300 */ |
108 | #define LCD_C200 17 /* as used by Sandisk Sansa c200 */ | 109 | #define LCD_C200 17 /* as used by Sandisk Sansa c200 */ |
109 | #define LCD_MROBE500 18 /* as used by Olympus M:Robe 500i */ | 110 | #define LCD_MROBE500 18 /* as used by Olympus M:Robe 500i */ |
110 | #define LCD_LOGIKDAX 19 /* as used by Logik DAX - SSD1815 */ | 111 | #define LCD_MROBE100 19 /* as used by Olympus M:Robe 100 */ |
111 | #define LCD_IAUDIO67 20 /* as used by iAudio 6/7 - unknown */ | 112 | #define LCD_LOGIKDAX 20 /* as used by Logik DAX - SSD1815 */ |
113 | #define LCD_IAUDIO67 21 /* as used by iAudio 6/7 - unknown */ | ||
112 | 114 | ||
113 | /* LCD_PIXELFORMAT */ | 115 | /* LCD_PIXELFORMAT */ |
114 | #define HORIZONTAL_PACKING 1 | 116 | #define HORIZONTAL_PACKING 1 |
@@ -221,6 +223,8 @@ | |||
221 | #include "config-c200.h" | 223 | #include "config-c200.h" |
222 | #elif defined(ELIO_TPJ1022) | 224 | #elif defined(ELIO_TPJ1022) |
223 | #include "config-tpj1022.h" | 225 | #include "config-tpj1022.h" |
226 | #elif defined(MROBE_100) | ||
227 | #include "config-mrobe100.h" | ||
224 | #elif defined(MROBE_500) | 228 | #elif defined(MROBE_500) |
225 | #include "config-mrobe500.h" | 229 | #include "config-mrobe500.h" |
226 | #elif defined(LOGIK_DAX) | 230 | #elif defined(LOGIK_DAX) |
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 0977ff4d7d..c2487f3563 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -50,7 +50,8 @@ | |||
50 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 50 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
51 | #define USBPOWER_BUTTON BUTTON_MENU | 51 | #define USBPOWER_BUTTON BUTTON_MENU |
52 | #define USBPOWER_BTN_IGNORE BUTTON_BACK | 52 | #define USBPOWER_BTN_IGNORE BUTTON_BACK |
53 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 53 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) || \ |
54 | (CONFIG_KEYPAD == MROBE100_PAD) | ||
54 | #define USBPOWER_BUTTON BUTTON_RIGHT | 55 | #define USBPOWER_BUTTON BUTTON_RIGHT |
55 | #define USBPOWER_BTN_IGNORE BUTTON_POWER | 56 | #define USBPOWER_BTN_IGNORE BUTTON_POWER |
56 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 57 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |