diff options
-rw-r--r-- | firmware/export/config-creativezvm.h | 2 | ||||
-rw-r--r-- | firmware/export/config-mrobe500.h | 4 | ||||
-rw-r--r-- | firmware/export/config.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index f5ec33317e..509bbc97a1 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h | |||
@@ -54,7 +54,7 @@ | |||
54 | #define CONFIG_LCD LCD_CREATIVEZVM | 54 | #define CONFIG_LCD LCD_CREATIVEZVM |
55 | 55 | ||
56 | /* choose the lcd orientation. both work */ | 56 | /* choose the lcd orientation. both work */ |
57 | #define CONFIG_ORIENTATION SCREEN_PORTAIT | 57 | #define CONFIG_ORIENTATION SCREEN_PORTRAIT |
58 | 58 | ||
59 | #define LCD_WIDTH 320 | 59 | #define LCD_WIDTH 320 |
60 | #define LCD_HEIGHT 240 | 60 | #define LCD_HEIGHT 240 |
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index c8c14acfb0..3b1f7896f5 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h | |||
@@ -54,10 +54,10 @@ | |||
54 | #define CONFIG_LCD LCD_MROBE500 | 54 | #define CONFIG_LCD LCD_MROBE500 |
55 | 55 | ||
56 | /* choose the lcd orientation. both work */ | 56 | /* choose the lcd orientation. both work */ |
57 | /* #define CONFIG_ORIENTATION SCREEN_PORTAIT */ | 57 | /* #define CONFIG_ORIENTATION SCREEN_PORTRAIT */ |
58 | #define CONFIG_ORIENTATION SCREEN_LANDSCAPE | 58 | #define CONFIG_ORIENTATION SCREEN_LANDSCAPE |
59 | 59 | ||
60 | #if CONFIG_ORIENTATION == SCREEN_PORTAIT | 60 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
61 | #define LCD_WIDTH 480 | 61 | #define LCD_WIDTH 480 |
62 | #define LCD_HEIGHT 640 | 62 | #define LCD_HEIGHT 640 |
63 | #else | 63 | #else |
diff --git a/firmware/export/config.h b/firmware/export/config.h index f4e38ce73c..565f8950ff 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -128,7 +128,7 @@ | |||
128 | #define RGB565SWAPPED 3553 | 128 | #define RGB565SWAPPED 3553 |
129 | 129 | ||
130 | /* CONFIG_ORIENTATION */ | 130 | /* CONFIG_ORIENTATION */ |
131 | #define SCREEN_PORTAIT 0 | 131 | #define SCREEN_PORTRAIT 0 |
132 | #define SCREEN_LANDSCAPE 1 | 132 | #define SCREEN_LANDSCAPE 1 |
133 | #define SCREEN_SQUARE 2 | 133 | #define SCREEN_SQUARE 2 |
134 | 134 | ||
@@ -281,7 +281,7 @@ | |||
281 | 281 | ||
282 | #ifndef CONFIG_ORIENTATION | 282 | #ifndef CONFIG_ORIENTATION |
283 | #if LCD_HEIGHT > LCD_WIDTH | 283 | #if LCD_HEIGHT > LCD_WIDTH |
284 | #define CONFIG_ORIENTATION SCREEN_PORTAIT | 284 | #define CONFIG_ORIENTATION SCREEN_PORTRAIT |
285 | #elif LCD_HEIGHT < LCD_WIDTH | 285 | #elif LCD_HEIGHT < LCD_WIDTH |
286 | #define CONFIG_ORIENTATION SCREEN_LANDSCAPE | 286 | #define CONFIG_ORIENTATION SCREEN_LANDSCAPE |
287 | #else | 287 | #else |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index a96f9c4f5f..14a9febe59 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | |||
@@ -323,7 +323,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
323 | if (height <= 0) | 323 | if (height <= 0) |
324 | return; /* nothing left to do */ | 324 | return; /* nothing left to do */ |
325 | 325 | ||
326 | #if CONFIG_ORIENTATION == SCREEN_PORTAIT | 326 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
327 | dst = (fb_data *)FRAME + LCD_WIDTH*y + x; | 327 | dst = (fb_data *)FRAME + LCD_WIDTH*y + x; |
328 | src = &lcd_framebuffer[y][x]; | 328 | src = &lcd_framebuffer[y][x]; |
329 | 329 | ||
@@ -363,7 +363,7 @@ void lcd_update(void) | |||
363 | { | 363 | { |
364 | if (!display_on || direct_fb_access) | 364 | if (!display_on || direct_fb_access) |
365 | return; | 365 | return; |
366 | #if CONFIG_ORIENTATION == SCREEN_PORTAIT | 366 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
367 | lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0], | 367 | lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0], |
368 | LCD_WIDTH*LCD_HEIGHT, 1); | 368 | LCD_WIDTH*LCD_HEIGHT, 1); |
369 | #else | 369 | #else |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c index d1fd2eb702..0f90c755ed 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c | |||
@@ -72,7 +72,7 @@ static int touch_to_pixels(short val_x, short val_y) | |||
72 | { | 72 | { |
73 | short x,y; | 73 | short x,y; |
74 | 74 | ||
75 | #if CONFIG_ORIENTATION == SCREEN_PORTAIT | 75 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
76 | x=val_x; | 76 | x=val_x; |
77 | y=val_y; | 77 | y=val_y; |
78 | #else | 78 | #else |
@@ -103,7 +103,7 @@ void button_init_device(void) | |||
103 | /* GIO is the power button, set as input */ | 103 | /* GIO is the power button, set as input */ |
104 | IO_GIO_DIR0 |= 0x01; | 104 | IO_GIO_DIR0 |= 0x01; |
105 | 105 | ||
106 | #if CONFIG_ORIENTATION == SCREEN_PORTAIT | 106 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
107 | topleft.val_x = 200; | 107 | topleft.val_x = 200; |
108 | topleft.val_y = 3900; | 108 | topleft.val_y = 3900; |
109 | 109 | ||
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index 241b82983c..52eb823896 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | |||
@@ -101,7 +101,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
101 | if (height <= 0) | 101 | if (height <= 0) |
102 | return; /* nothing left to do */ | 102 | return; /* nothing left to do */ |
103 | 103 | ||
104 | #if CONFIG_ORIENTATION == SCREEN_PORTAIT | 104 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
105 | dst = (fb_data *)FRAME + LCD_WIDTH*y + x; | 105 | dst = (fb_data *)FRAME + LCD_WIDTH*y + x; |
106 | src = &lcd_framebuffer[y][x]; | 106 | src = &lcd_framebuffer[y][x]; |
107 | 107 | ||
@@ -146,7 +146,7 @@ void lcd_update(void) | |||
146 | { | 146 | { |
147 | if (!lcd_on) | 147 | if (!lcd_on) |
148 | return; | 148 | return; |
149 | #if CONFIG_ORIENTATION == SCREEN_PORTAIT | 149 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
150 | lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0], | 150 | lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0], |
151 | LCD_WIDTH*LCD_HEIGHT, 1); | 151 | LCD_WIDTH*LCD_HEIGHT, 1); |
152 | #else | 152 | #else |