diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-mrobe500.h | 37 | ||||
-rw-r--r-- | firmware/export/lcd.h | 7 |
2 files changed, 26 insertions, 18 deletions
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index fafea48a94..90bbefe329 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h | |||
@@ -59,24 +59,21 @@ | |||
59 | /* LCD dimensions */ | 59 | /* LCD dimensions */ |
60 | #define CONFIG_LCD LCD_MROBE500 | 60 | #define CONFIG_LCD LCD_MROBE500 |
61 | 61 | ||
62 | /* choose the lcd orientation. both work */ | 62 | #if 0 |
63 | /* #define CONFIG_ORIENTATION SCREEN_PORTRAIT */ | 63 | #define LCD_NATIVE_WIDTH 480 |
64 | #define CONFIG_ORIENTATION SCREEN_PORTRAIT | 64 | #define LCD_NATIVE_HEIGHT 640 |
65 | |||
66 | #if 1 | ||
67 | #define NATIVE_MAX_WIDTH 480 | ||
68 | #define NATIVE_MAX_HEIGHT 640 | ||
69 | #else | 65 | #else |
70 | #define NATIVE_MAX_WIDTH 240 | 66 | #define LCD_NATIVE_WIDTH 240 |
71 | #define NATIVE_MAX_HEIGHT 320 | 67 | #define LCD_NATIVE_HEIGHT 320 |
72 | #endif | 68 | #endif |
73 | 69 | ||
74 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT | 70 | /* choose the lcd orientation. CONFIG_ORIENTATION defined in config.h */ |
75 | #define LCD_WIDTH NATIVE_MAX_WIDTH | 71 | #if 0 |
76 | #define LCD_HEIGHT NATIVE_MAX_HEIGHT | 72 | #define LCD_WIDTH LCD_NATIVE_WIDTH |
73 | #define LCD_HEIGHT LCD_NATIVE_HEIGHT | ||
77 | #else | 74 | #else |
78 | #define LCD_WIDTH NATIVE_MAX_HEIGHT | 75 | #define LCD_WIDTH LCD_NATIVE_HEIGHT |
79 | #define LCD_HEIGHT NATIVE_MAX_WIDTH | 76 | #define LCD_HEIGHT LCD_NATIVE_WIDTH |
80 | #endif | 77 | #endif |
81 | 78 | ||
82 | #define LCD_DEPTH 16 /* 65k colours */ | 79 | #define LCD_DEPTH 16 /* 65k colours */ |
@@ -142,16 +139,20 @@ | |||
142 | 139 | ||
143 | #define HW_SAMPR_CAPS SAMPR_CAP_44 | 140 | #define HW_SAMPR_CAPS SAMPR_CAP_44 |
144 | 141 | ||
145 | #define BATTERY_CAPACITY_DEFAULT 1100 /* default battery capacity */ | 142 | #define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ |
146 | #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ | 143 | #define BATTERY_CAPACITY_MIN 1000 /* min. capacity selectable */ |
147 | #define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ | 144 | #define BATTERY_CAPACITY_MAX 2000 /* max. capacity selectable */ |
148 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ | 145 | #define BATTERY_CAPACITY_INC 100 /* capacity increment */ |
149 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 146 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
150 | 147 | ||
148 | /* define current usage levels */ | ||
149 | #define CURRENT_NORMAL 120 /* Measured */ | ||
150 | #define CURRENT_BACKLIGHT 80 /* Over 200 mA total measured when on */ | ||
151 | #define CURRENT_RECORD 0 /* no recording */ | ||
152 | |||
151 | /* Hardware controlled charging with monitoring */ | 153 | /* Hardware controlled charging with monitoring */ |
152 | #define CONFIG_CHARGING CHARGING_MONITOR | 154 | #define CONFIG_CHARGING CHARGING_MONITOR |
153 | 155 | ||
154 | |||
155 | /* Define this if you have a Texas Instruments TSC2100 touch screen */ | 156 | /* Define this if you have a Texas Instruments TSC2100 touch screen */ |
156 | #define HAVE_TSC2100 | 157 | #define HAVE_TSC2100 |
157 | 158 | ||
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 4f35927353..e52356b8bf 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -97,8 +97,15 @@ void lcd_set_mode(int mode); | |||
97 | #define LCD_MODE_RGB565 0x00000001 | 97 | #define LCD_MODE_RGB565 0x00000001 |
98 | #define LCD_MODE_YUV 0x00000002 | 98 | #define LCD_MODE_YUV 0x00000002 |
99 | #define LCD_MODE_PAL256 0x00000004 | 99 | #define LCD_MODE_PAL256 0x00000004 |
100 | |||
101 | #if HAVE_LCD_MODES & LCD_MODE_PAL256 | ||
102 | void lcd_blit_pal256(unsigned char *src, int src_x, int src_y, int x, int y, | ||
103 | int width, int height); | ||
104 | void lcd_pal256_update_pal(fb_data *palette); | ||
105 | #endif | ||
100 | #endif | 106 | #endif |
101 | 107 | ||
108 | |||
102 | /* common functions */ | 109 | /* common functions */ |
103 | extern void lcd_write_command(int byte); | 110 | extern void lcd_write_command(int byte); |
104 | extern void lcd_write_command_e(int cmd, int data); | 111 | extern void lcd_write_command_e(int cmd, int data); |