Skip to content

Commit 87ca032

Browse files
32teeth32teeth
committed
Sun 3 Jan 2021 17:49:29 EST
1 parent 28ff351 commit 87ca032

File tree

127 files changed

+34409
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+34409
-195
lines changed

‎Components/emulator-launcher-odroid-go/components/hardware/Kconfig.projbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ menu "Retro ESP32 Configuration"
55
help
66
LCD Screen Driver
77

8-
config LCD_DRIVER_CHIP_ST7789
8+
config LCD_DRIVER_CHIP_CUTE_ESP32
99
bool "Cute ESP32 - 2\" [ST7789]"
1010

1111
config LCD_DRIVER_CHIP_ODROID_GO
@@ -14,7 +14,7 @@ menu "Retro ESP32 Configuration"
1414
config LCD_DRIVER_CHIP_RETRO_ESP32
1515
bool "Retro ESP32 - 2.6\" [ILI9342]"
1616

17-
config LCD_DRIVER_CHIP_RETRO_ESP32_V2
17+
config LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
1818
bool "Retro ESP32 V2 - 2.6\" [ILI9342C]"
1919

2020
endchoice

‎Components/emulator-launcher-odroid-go/components/hardware/src/display.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
9595
#endif
9696

9797
/*
98-
CONFIG_LCD_DRIVER_CHIP_ST7789
98+
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
9999
*/
100-
#ifdef CONFIG_LCD_DRIVER_CHIP_ST7789
100+
#ifdef CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
101101

102102
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
103103
{TFT_CMD_SWRESET, {0}, 0x80},
@@ -129,7 +129,10 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
129129
/*
130130
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
131131
*/
132-
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_V2)
132+
/*
133+
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
134+
*/
135+
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT)
133136
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
134137
// VCI=2.8V
135138
//************* Start Initial Sequence **********//
@@ -143,7 +146,6 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
143146
{0xC0, {0x1B}, 1}, //Power control //VRH[5:0]
144147
{0xC1, {0x12}, 1}, //Power control //SAP[2:0];BT[3:0]
145148
{0xC5, {0x32, 0x3C}, 2}, //VCM control
146-
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
147149
{0x3A, {0x55}, 1},
148150
{0xB1, {0x00, 0x1B}, 2}, // Frame Rate Control (1B=70, 1F=61, 10=119)
149151
{0xB6, {0x0A, 0xA2}, 2}, // Display Function Control
@@ -158,10 +160,12 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
158160
{0x2A, {0x00, 0x00, 0x00, 0xEF}, 4},
159161
{0x2B, {0x00, 0x00, 0x00, 0x3F}, 4},
160162

161-
// ILI9342 Specific
162-
{0x36, {0x40|0x80|0x08}, 1}, // <-- ROTATE
163+
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
164+
{0x36, {(MADCTL_MX | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
165+
#endif
163166

164167
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
168+
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
165169
{0x21, {0}, 0x80}, // <-- INVERT COLORS
166170
#endif
167171

‎Components/frodo-go/components/odroid/Kconfig.projbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ menu "Retro ESP32 Configuration"
55
help
66
LCD Screen Driver
77

8-
config LCD_DRIVER_CHIP_ST7789
8+
config LCD_DRIVER_CHIP_CUTE_ESP32
99
bool "Cute ESP32 - 2\" [ST7789]"
1010

1111
config LCD_DRIVER_CHIP_ODROID_GO
@@ -14,7 +14,7 @@ menu "Retro ESP32 Configuration"
1414
config LCD_DRIVER_CHIP_RETRO_ESP32
1515
bool "Retro ESP32 - 2.6\" [ILI9342]"
1616

17-
config LCD_DRIVER_CHIP_RETRO_ESP32_V2
17+
config LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
1818
bool "Retro ESP32 V2 - 2.6\" [ILI9342C]"
1919

2020
endchoice

‎Components/frodo-go/components/odroid/odroid_display.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
136136
#endif
137137

138138
/*
139-
CONFIG_LCD_DRIVER_CHIP_ST7789
139+
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
140140
*/
141-
#ifdef CONFIG_LCD_DRIVER_CHIP_ST7789
141+
#ifdef CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
142142

143143
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
144144
{TFT_CMD_SWRESET, {0}, 0x80},
@@ -170,7 +170,10 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
170170
/*
171171
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
172172
*/
173-
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_V2)
173+
/*
174+
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
175+
*/
176+
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT)
174177
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
175178
// VCI=2.8V
176179
//************* Start Initial Sequence **********//
@@ -184,7 +187,6 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
184187
{0xC0, {0x1B}, 1}, //Power control //VRH[5:0]
185188
{0xC1, {0x12}, 1}, //Power control //SAP[2:0];BT[3:0]
186189
{0xC5, {0x32, 0x3C}, 2}, //VCM control
187-
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
188190
{0x3A, {0x55}, 1},
189191
{0xB1, {0x00, 0x1B}, 2}, // Frame Rate Control (1B=70, 1F=61, 10=119)
190192
{0xB6, {0x0A, 0xA2}, 2}, // Display Function Control
@@ -199,10 +201,12 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
199201
{0x2A, {0x00, 0x00, 0x00, 0xEF}, 4},
200202
{0x2B, {0x00, 0x00, 0x00, 0x3F}, 4},
201203

202-
// ILI9342 Specific
203-
{0x36, {0x40|0x80|0x08}, 1}, // <-- ROTATE
204+
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
205+
{0x36, {(MADCTL_MX | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
206+
#endif
204207

205208
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
209+
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
206210
{0x21, {0}, 0x80}, // <-- INVERT COLORS
207211
#endif
208212

‎Components/go-play/odroid-go-common/components/odroid/Kconfig.projbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ menu "Retro ESP32 Configuration"
55
help
66
LCD Screen Driver
77

8-
config LCD_DRIVER_CHIP_ST7789
8+
config LCD_DRIVER_CHIP_CUTE_ESP32
99
bool "Cute ESP32 - 2\" [ST7789]"
1010

1111
config LCD_DRIVER_CHIP_ODROID_GO
@@ -14,7 +14,7 @@ menu "Retro ESP32 Configuration"
1414
config LCD_DRIVER_CHIP_RETRO_ESP32
1515
bool "Retro ESP32 - 2.6\" [ILI9342]"
1616

17-
config LCD_DRIVER_CHIP_RETRO_ESP32_V2
17+
config LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
1818
bool "Retro ESP32 V2 - 2.6\" [ILI9342C]"
1919

2020
endchoice

‎Components/go-play/odroid-go-common/components/odroid/odroid_display.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
136136
#endif
137137

138138
/*
139-
CONFIG_LCD_DRIVER_CHIP_ST7789
139+
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
140140
*/
141-
#ifdef CONFIG_LCD_DRIVER_CHIP_ST7789
141+
#ifdef CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
142142

143143
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
144144
{TFT_CMD_SWRESET, {0}, 0x80},
@@ -170,7 +170,10 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
170170
/*
171171
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
172172
*/
173-
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_V2)
173+
/*
174+
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
175+
*/
176+
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT)
174177
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
175178
// VCI=2.8V
176179
//************* Start Initial Sequence **********//
@@ -184,7 +187,6 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
184187
{0xC0, {0x1B}, 1}, //Power control //VRH[5:0]
185188
{0xC1, {0x12}, 1}, //Power control //SAP[2:0];BT[3:0]
186189
{0xC5, {0x32, 0x3C}, 2}, //VCM control
187-
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
188190
{0x3A, {0x55}, 1},
189191
{0xB1, {0x00, 0x1B}, 2}, // Frame Rate Control (1B=70, 1F=61, 10=119)
190192
{0xB6, {0x0A, 0xA2}, 2}, // Display Function Control
@@ -199,10 +201,12 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
199201
{0x2A, {0x00, 0x00, 0x00, 0xEF}, 4},
200202
{0x2B, {0x00, 0x00, 0x00, 0x3F}, 4},
201203

202-
// ILI9342 Specific
203-
{0x36, {0x40|0x80|0x08}, 1}, // <-- ROTATE
204+
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
205+
{0x36, {(MADCTL_MX | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
206+
#endif
204207

205208
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
209+
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
206210
{0x21, {0}, 0x80}, // <-- INVERT COLORS
207211
#endif
208212

‎Components/gogo/components/odroid/Kconfig.projbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ menu "Retro ESP32 Configuration"
55
help
66
LCD Screen Driver
77

8-
config LCD_DRIVER_CHIP_ST7789
8+
config LCD_DRIVER_CHIP_CUTE_ESP32
99
bool "Cute ESP32 - 2\" [ST7789]"
1010

1111
config LCD_DRIVER_CHIP_ODROID_GO
@@ -14,7 +14,7 @@ menu "Retro ESP32 Configuration"
1414
config LCD_DRIVER_CHIP_RETRO_ESP32
1515
bool "Retro ESP32 - 2.6\" [ILI9342]"
1616

17-
config LCD_DRIVER_CHIP_RETRO_ESP32_V2
17+
config LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
1818
bool "Retro ESP32 V2 - 2.6\" [ILI9342C]"
1919

2020
endchoice

‎Components/gogo/components/odroid/odroid_display.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
136136
#endif
137137

138138
/*
139-
CONFIG_LCD_DRIVER_CHIP_ST7789
139+
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
140140
*/
141-
#ifdef CONFIG_LCD_DRIVER_CHIP_ST7789
141+
#ifdef CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
142142

143143
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
144144
{TFT_CMD_SWRESET, {0}, 0x80},
@@ -170,7 +170,10 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
170170
/*
171171
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
172172
*/
173-
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_V2)
173+
/*
174+
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
175+
*/
176+
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT)
174177
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
175178
// VCI=2.8V
176179
//************* Start Initial Sequence **********//
@@ -184,7 +187,6 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
184187
{0xC0, {0x1B}, 1}, //Power control //VRH[5:0]
185188
{0xC1, {0x12}, 1}, //Power control //SAP[2:0];BT[3:0]
186189
{0xC5, {0x32, 0x3C}, 2}, //VCM control
187-
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
188190
{0x3A, {0x55}, 1},
189191
{0xB1, {0x00, 0x1B}, 2}, // Frame Rate Control (1B=70, 1F=61, 10=119)
190192
{0xB6, {0x0A, 0xA2}, 2}, // Display Function Control
@@ -199,10 +201,12 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
199201
{0x2A, {0x00, 0x00, 0x00, 0xEF}, 4},
200202
{0x2B, {0x00, 0x00, 0x00, 0x3F}, 4},
201203

202-
// ILI9342 Specific
203-
{0x36, {0x40|0x80|0x08}, 1}, // <-- ROTATE
204+
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
205+
{0x36, {(MADCTL_MX | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
206+
#endif
204207

205208
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
209+
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
206210
{0x21, {0}, 0x80}, // <-- INVERT COLORS
207211
#endif
208212

‎Components/handy-go/components/odroid/Kconfig.projbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ menu "Retro ESP32 Configuration"
55
help
66
LCD Screen Driver
77

8-
config LCD_DRIVER_CHIP_ST7789
8+
config LCD_DRIVER_CHIP_CUTE_ESP32
99
bool "Cute ESP32 - 2\" [ST7789]"
1010

1111
config LCD_DRIVER_CHIP_ODROID_GO
@@ -14,7 +14,7 @@ menu "Retro ESP32 Configuration"
1414
config LCD_DRIVER_CHIP_RETRO_ESP32
1515
bool "Retro ESP32 - 2.6\" [ILI9342]"
1616

17-
config LCD_DRIVER_CHIP_RETRO_ESP32_V2
17+
config LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
1818
bool "Retro ESP32 V2 - 2.6\" [ILI9342C]"
1919

2020
endchoice

‎Components/handy-go/components/odroid/odroid_display.c

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
139139
#endif
140140

141141
/*
142-
CONFIG_LCD_DRIVER_CHIP_ST7789
142+
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
143143
*/
144-
#ifdef CONFIG_LCD_DRIVER_CHIP_ST7789
144+
#ifdef CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32
145145

146146
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
147147
{TFT_CMD_SWRESET, {0}, 0x80},
@@ -173,7 +173,10 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
173173
/*
174174
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
175175
*/
176-
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_V2)
176+
/*
177+
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
178+
*/
179+
#if defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32) || defined(CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT)
177180
DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
178181
// VCI=2.8V
179182
//************* Start Initial Sequence **********//
@@ -187,7 +190,6 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
187190
{0xC0, {0x1B}, 1}, //Power control //VRH[5:0]
188191
{0xC1, {0x12}, 1}, //Power control //SAP[2:0];BT[3:0]
189192
{0xC5, {0x32, 0x3C}, 2}, //VCM control
190-
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
191193
{0x3A, {0x55}, 1},
192194
{0xB1, {0x00, 0x1B}, 2}, // Frame Rate Control (1B=70, 1F=61, 10=119)
193195
{0xB6, {0x0A, 0xA2}, 2}, // Display Function Control
@@ -202,10 +204,12 @@ DRAM_ATTR static const ili_init_cmd_t ili_init_cmds[] = {
202204
{0x2A, {0x00, 0x00, 0x00, 0xEF}, 4},
203205
{0x2B, {0x00, 0x00, 0x00, 0x3F}, 4},
204206

205-
// ILI9342 Specific
206-
{0x36, {0x40|0x80|0x08}, 1}, // <-- ROTATE
207+
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
208+
{0x36, {(MADCTL_MX | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
209+
#endif
207210

208211
#ifdef CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32
212+
{0x36, {(MADCTL_MV | MADCTL_MY | TFT_RGB_BGR)}, 1}, // Memory Access Control
209213
{0x21, {0}, 0x80}, // <-- INVERT COLORS
210214
#endif
211215

@@ -446,9 +450,11 @@ void send_reset_drawing(int left, int top, int width, int height)
446450
}
447451

448452
ili_cmd(0x2C); //memory write
449-
if (height > 1) {
450-
ili_cmd(0x3C); //memory write continue
451-
}
453+
#if defined (CONFIG_LCD_DRIVER_CHIP_ODROID_GO) || defined (CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32)
454+
if (height > 1) {
455+
ili_cmd(0x3C); //memory write continue
456+
}
457+
#endif
452458
}
453459

454460
void send_continue_line(uint16_t *line, int width, int lineCount)

‎Components/odroid-go-firmware/main/Kconfig.projbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ menu "Retro ESP32 Configuration"
55
help
66
LCD Screen Driver
77

8-
config LCD_DRIVER_CHIP_ST7789
8+
config LCD_DRIVER_CHIP_CUTE_ESP32
99
bool "Cute ESP32 - 2\" [ST7789]"
1010

1111
config LCD_DRIVER_CHIP_ODROID_GO
@@ -14,7 +14,7 @@ menu "Retro ESP32 Configuration"
1414
config LCD_DRIVER_CHIP_RETRO_ESP32
1515
bool "Retro ESP32 - 2.6\" [ILI9342]"
1616

17-
config LCD_DRIVER_CHIP_RETRO_ESP32_V2
17+
config LCD_DRIVER_CHIP_RETRO_ESP32_NEXT
1818
bool "Retro ESP32 V2 - 2.6\" [ILI9342C]"
1919

2020
endchoice

0 commit comments

Comments
 (0)