diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-ondavx747.h | 7 | ||||
-rw-r--r-- | firmware/export/r61509.h | 13 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx747/button-onda_vx747.c | 9 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c | 6 |
4 files changed, 20 insertions, 15 deletions
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 96057710c0..1c2be01d93 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h | |||
@@ -55,11 +55,8 @@ | |||
55 | /* LCD dimensions */ | 55 | /* LCD dimensions */ |
56 | #define CONFIG_LCD LCD_ONDAVX747 | 56 | #define CONFIG_LCD LCD_ONDAVX747 |
57 | 57 | ||
58 | /* choose the lcd orientation. both work */ | 58 | #define LCD_WIDTH 240 |
59 | #define CONFIG_ORIENTATION SCREEN_PORTRAIT | 59 | #define LCD_HEIGHT 400 |
60 | |||
61 | #define LCD_WIDTH 400 | ||
62 | #define LCD_HEIGHT 240 | ||
63 | 60 | ||
64 | #define LCD_DEPTH 16 /* 16bit colours */ | 61 | #define LCD_DEPTH 16 /* 16bit colours */ |
65 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ | 62 | #define LCD_PIXELFORMAT RGB565 /* rgb565 */ |
diff --git a/firmware/export/r61509.h b/firmware/export/r61509.h index ca966ee781..8ca3b6d00b 100644 --- a/firmware/export/r61509.h +++ b/firmware/export/r61509.h | |||
@@ -96,8 +96,17 @@ | |||
96 | #define DRIVER_OUTPUT_SS_BIT (1 << 8) | 96 | #define DRIVER_OUTPUT_SS_BIT (1 << 8) |
97 | #define DRIVER_OUTPUT_SM_BIT (1 << 10) | 97 | #define DRIVER_OUTPUT_SM_BIT (1 << 10) |
98 | 98 | ||
99 | #define SOFT_RESET_EN (1 << 0) | 99 | #define ENTRY_MODE_TRI (1 << 15) |
100 | #define SOFT_RESET_DIS (0 << 0) | 100 | #define ENTRY_MODE_DFM (1 << 14) |
101 | #define ENTRY_MODE_BGR (1 << 12) | ||
102 | #define ENTRY_MODE_HWM (1 << 9) | ||
103 | #define ENTRY_MODE_ORG (1 << 7) | ||
104 | #define ENTRY_MODE_VID (1 << 5) | ||
105 | #define ENTRY_MODE_HID (1 << 4) | ||
106 | #define ENTRY_MODE_AM (1 << 3) | ||
107 | #define ENTRY_MODE_EPF(n) (n & 3) | ||
108 | |||
109 | #define SOFT_RESET(n) (n << 0) | ||
101 | 110 | ||
102 | #define ENDIAN_CTRL_BIG | 111 | #define ENDIAN_CTRL_BIG |
103 | #define ENDIAN_CTRL_LITTLE | 112 | #define ENDIAN_CTRL_LITTLE |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-onda_vx747.c index 950fc51d69..b3c0a5fb64 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-onda_vx747.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-onda_vx747.c | |||
@@ -67,13 +67,12 @@ static int touch_to_pixels(short x, short y) | |||
67 | y -= 300; | 67 | y -= 300; |
68 | 68 | ||
69 | /* X & Y are switched */ | 69 | /* X & Y are switched */ |
70 | x /= 3200 / LCD_HEIGHT; | 70 | x /= 3200 / LCD_WIDTH; |
71 | y /= 3600 / LCD_WIDTH; | 71 | y /= 3600 / LCD_HEIGHT; |
72 | 72 | ||
73 | x = LCD_HEIGHT - x; | 73 | y = LCD_HEIGHT - y; |
74 | y = LCD_WIDTH - y; | ||
75 | 74 | ||
76 | return (y << 16) | x; | 75 | return (x << 16) | y; |
77 | } | 76 | } |
78 | 77 | ||
79 | int button_read_device(int *data) | 78 | int button_read_device(int *data) |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c index 05e4d3a9fc..871f2f0861 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/lcd-onda_vx747.c | |||
@@ -61,15 +61,15 @@ static void _display_on(void) | |||
61 | { | 61 | { |
62 | int i; | 62 | int i; |
63 | 63 | ||
64 | SLCD_SEND_COMMAND(REG_SOFT_RESET, SOFT_RESET_EN); | 64 | SLCD_SEND_COMMAND(REG_SOFT_RESET, SOFT_RESET(1)); |
65 | SLEEP(700000); | 65 | SLEEP(700000); |
66 | SLCD_SEND_COMMAND(REG_SOFT_RESET, SOFT_RESET_DIS); | 66 | SLCD_SEND_COMMAND(REG_SOFT_RESET, SOFT_RESET(0)); |
67 | SLEEP(700000); | 67 | SLEEP(700000); |
68 | SLCD_SEND_COMMAND(REG_ENDIAN_CTRL, 0); | 68 | SLCD_SEND_COMMAND(REG_ENDIAN_CTRL, 0); |
69 | 69 | ||
70 | SLCD_SEND_COMMAND(REG_DRIVER_OUTPUT, 0x100); | 70 | SLCD_SEND_COMMAND(REG_DRIVER_OUTPUT, 0x100); |
71 | SLCD_SEND_COMMAND(REG_LCD_DR_WAVE_CTRL, 0x100); | 71 | SLCD_SEND_COMMAND(REG_LCD_DR_WAVE_CTRL, 0x100); |
72 | SLCD_SEND_COMMAND(REG_ENTRY_MODE, 0x1028); | 72 | SLCD_SEND_COMMAND(REG_ENTRY_MODE, (ENTRY_MODE_BGR | ENTRY_MODE_VID | ENTRY_MODE_HID)); |
73 | SLCD_SEND_COMMAND(REG_DISP_CTRL2, 0x503); | 73 | SLCD_SEND_COMMAND(REG_DISP_CTRL2, 0x503); |
74 | SLCD_SEND_COMMAND(REG_DISP_CTRL3, 1); | 74 | SLCD_SEND_COMMAND(REG_DISP_CTRL3, 1); |
75 | SLCD_SEND_COMMAND(REG_LPCTRL, 0x10); | 75 | SLCD_SEND_COMMAND(REG_LPCTRL, 0x10); |