Skip to content

Commit 12a01d6

Browse files
Lzw655Lzw655
committed
Merge branch 'bugfix/waveshare_85_inverted_colors' into 'master'
Closes #240 See merge request ae_group/ESP32_Display_Panel!19
2 parents 4c23160 + c6b8946 commit 12a01d6

File tree

2 files changed

+192
-2
lines changed

2 files changed

+192
-2
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ChangeLog
22

3-
## v1.0.4 - 2025-07-13
3+
## v1.0.4 - 2025-09-19
44

55
### Enhancements:
66

@@ -10,6 +10,8 @@
1010
### Bugfixes:
1111

1212
* fix(repo): update dependent esp-lib-utils version for Arduino
13+
* fix(board): fixing error on inverted colors (may still need bitshifting in LVGL) @martinroger (#238)
14+
* fix(board): fix screen initialization code for BOARD_ESP32_S3_TOUCH_LCD_1_85 @ggc121238 (#239)
1315

1416
## v1.0.3 - 2025-07-07
1517

‎src/board/supported/waveshare/BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85.h‎

Lines changed: 189 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,201 @@
9494

9595
#endif // ESP_PANEL_BOARD_LCD_BUS_TYPE
9696

97+
#define ESP_PANEL_BOARD_LCD_VENDOR_INIT_CMD() \
98+
{ \
99+
{0xF0, (uint8_t []){0x28}, 1, 0},\
100+
{0xF2, (uint8_t []){0x28}, 1, 0},\
101+
{0x73, (uint8_t []){0xF0}, 1, 0},\
102+
{0x7C, (uint8_t []){0xD1}, 1, 0},\
103+
{0x83, (uint8_t []){0xE0}, 1, 0},\
104+
{0x84, (uint8_t []){0x61}, 1, 0},\
105+
{0xF2, (uint8_t []){0x82}, 1, 0},\
106+
{0xF0, (uint8_t []){0x00}, 1, 0},\
107+
{0xF0, (uint8_t []){0x01}, 1, 0},\
108+
{0xF1, (uint8_t []){0x01}, 1, 0},\
109+
{0xB0, (uint8_t []){0x56}, 1, 0},\
110+
{0xB1, (uint8_t []){0x4D}, 1, 0},\
111+
{0xB2, (uint8_t []){0x24}, 1, 0},\
112+
{0xB4, (uint8_t []){0x87}, 1, 0},\
113+
{0xB5, (uint8_t []){0x44}, 1, 0},\
114+
{0xB6, (uint8_t []){0x8B}, 1, 0},\
115+
{0xB7, (uint8_t []){0x40}, 1, 0},\
116+
{0xB8, (uint8_t []){0x86}, 1, 0},\
117+
{0xBA, (uint8_t []){0x00}, 1, 0},\
118+
{0xBB, (uint8_t []){0x08}, 1, 0},\
119+
{0xBC, (uint8_t []){0x08}, 1, 0},\
120+
{0xBD, (uint8_t []){0x00}, 1, 0},\
121+
{0xC0, (uint8_t []){0x80}, 1, 0},\
122+
{0xC1, (uint8_t []){0x10}, 1, 0},\
123+
{0xC2, (uint8_t []){0x37}, 1, 0},\
124+
{0xC3, (uint8_t []){0x80}, 1, 0},\
125+
{0xC4, (uint8_t []){0x10}, 1, 0},\
126+
{0xC5, (uint8_t []){0x37}, 1, 0},\
127+
{0xC6, (uint8_t []){0xA9}, 1, 0},\
128+
{0xC7, (uint8_t []){0x41}, 1, 0},\
129+
{0xC8, (uint8_t []){0x01}, 1, 0},\
130+
{0xC9, (uint8_t []){0xA9}, 1, 0},\
131+
{0xCA, (uint8_t []){0x41}, 1, 0},\
132+
{0xCB, (uint8_t []){0x01}, 1, 0},\
133+
{0xD0, (uint8_t []){0x91}, 1, 0},\
134+
{0xD1, (uint8_t []){0x68}, 1, 0},\
135+
{0xD2, (uint8_t []){0x68}, 1, 0},\
136+
{0xF5, (uint8_t []){0x00, 0xA5}, 2, 0},\
137+
{0xDD, (uint8_t []){0x4F}, 1, 0},\
138+
{0xDE, (uint8_t []){0x4F}, 1, 0},\
139+
{0xF1, (uint8_t []){0x10}, 1, 0},\
140+
{0xF0, (uint8_t []){0x00}, 1, 0},\
141+
{0xF0, (uint8_t []){0x02}, 1, 0},\
142+
{0xE0, (uint8_t []){0xF0, 0x0A, 0x10, 0x09, 0x09, 0x36, 0x35, 0x33, 0x4A, 0x29, 0x15, 0x15, 0x2E, 0x34}, 14, 0},\
143+
{0xE1, (uint8_t []){0xF0, 0x0A, 0x0F, 0x08, 0x08, 0x05, 0x34, 0x33, 0x4A, 0x39, 0x15, 0x15, 0x2D, 0x33}, 14, 0},\
144+
{0xF0, (uint8_t []){0x10}, 1, 0},\
145+
{0xF3, (uint8_t []){0x10}, 1, 0},\
146+
{0xE0, (uint8_t []){0x07}, 1, 0},\
147+
{0xE1, (uint8_t []){0x00}, 1, 0},\
148+
{0xE2, (uint8_t []){0x00}, 1, 0},\
149+
{0xE3, (uint8_t []){0x00}, 1, 0},\
150+
{0xE4, (uint8_t []){0xE0}, 1, 0},\
151+
{0xE5, (uint8_t []){0x06}, 1, 0},\
152+
{0xE6, (uint8_t []){0x21}, 1, 0},\
153+
{0xE7, (uint8_t []){0x01}, 1, 0},\
154+
{0xE8, (uint8_t []){0x05}, 1, 0},\
155+
{0xE9, (uint8_t []){0x02}, 1, 0},\
156+
{0xEA, (uint8_t []){0xDA}, 1, 0},\
157+
{0xEB, (uint8_t []){0x00}, 1, 0},\
158+
{0xEC, (uint8_t []){0x00}, 1, 0},\
159+
{0xED, (uint8_t []){0x0F}, 1, 0},\
160+
{0xEE, (uint8_t []){0x00}, 1, 0},\
161+
{0xEF, (uint8_t []){0x00}, 1, 0},\
162+
{0xF8, (uint8_t []){0x00}, 1, 0},\
163+
{0xF9, (uint8_t []){0x00}, 1, 0},\
164+
{0xFA, (uint8_t []){0x00}, 1, 0},\
165+
{0xFB, (uint8_t []){0x00}, 1, 0},\
166+
{0xFC, (uint8_t []){0x00}, 1, 0},\
167+
{0xFD, (uint8_t []){0x00}, 1, 0},\
168+
{0xFE, (uint8_t []){0x00}, 1, 0},\
169+
{0xFF, (uint8_t []){0x00}, 1, 0},\
170+
{0x60, (uint8_t []){0x40}, 1, 0},\
171+
{0x61, (uint8_t []){0x04}, 1, 0},\
172+
{0x62, (uint8_t []){0x00}, 1, 0},\
173+
{0x63, (uint8_t []){0x42}, 1, 0},\
174+
{0x64, (uint8_t []){0xD9}, 1, 0},\
175+
{0x65, (uint8_t []){0x00}, 1, 0},\
176+
{0x66, (uint8_t []){0x00}, 1, 0},\
177+
{0x67, (uint8_t []){0x00}, 1, 0},\
178+
{0x68, (uint8_t []){0x00}, 1, 0},\
179+
{0x69, (uint8_t []){0x00}, 1, 0},\
180+
{0x6A, (uint8_t []){0x00}, 1, 0},\
181+
{0x6B, (uint8_t []){0x00}, 1, 0},\
182+
{0x70, (uint8_t []){0x40}, 1, 0},\
183+
{0x71, (uint8_t []){0x03}, 1, 0},\
184+
{0x72, (uint8_t []){0x00}, 1, 0},\
185+
{0x73, (uint8_t []){0x42}, 1, 0},\
186+
{0x74, (uint8_t []){0xD8}, 1, 0},\
187+
{0x75, (uint8_t []){0x00}, 1, 0},\
188+
{0x76, (uint8_t []){0x00}, 1, 0},\
189+
{0x77, (uint8_t []){0x00}, 1, 0},\
190+
{0x78, (uint8_t []){0x00}, 1, 0},\
191+
{0x79, (uint8_t []){0x00}, 1, 0},\
192+
{0x7A, (uint8_t []){0x00}, 1, 0},\
193+
{0x7B, (uint8_t []){0x00}, 1, 0},\
194+
{0x80, (uint8_t []){0x48}, 1, 0},\
195+
{0x81, (uint8_t []){0x00}, 1, 0},\
196+
{0x82, (uint8_t []){0x06}, 1, 0},\
197+
{0x83, (uint8_t []){0x02}, 1, 0},\
198+
{0x84, (uint8_t []){0xD6}, 1, 0},\
199+
{0x85, (uint8_t []){0x04}, 1, 0},\
200+
{0x86, (uint8_t []){0x00}, 1, 0},\
201+
{0x87, (uint8_t []){0x00}, 1, 0},\
202+
{0x88, (uint8_t []){0x48}, 1, 0},\
203+
{0x89, (uint8_t []){0x00}, 1, 0},\
204+
{0x8A, (uint8_t []){0x08}, 1, 0},\
205+
{0x8B, (uint8_t []){0x02}, 1, 0},\
206+
{0x8C, (uint8_t []){0xD8}, 1, 0},\
207+
{0x8D, (uint8_t []){0x04}, 1, 0},\
208+
{0x8E, (uint8_t []){0x00}, 1, 0},\
209+
{0x8F, (uint8_t []){0x00}, 1, 0},\
210+
{0x90, (uint8_t []){0x48}, 1, 0},\
211+
{0x91, (uint8_t []){0x00}, 1, 0},\
212+
{0x92, (uint8_t []){0x0A}, 1, 0},\
213+
{0x93, (uint8_t []){0x02}, 1, 0},\
214+
{0x94, (uint8_t []){0xDA}, 1, 0},\
215+
{0x95, (uint8_t []){0x04}, 1, 0},\
216+
{0x96, (uint8_t []){0x00}, 1, 0},\
217+
{0x97, (uint8_t []){0x00}, 1, 0},\
218+
{0x98, (uint8_t []){0x48}, 1, 0},\
219+
{0x99, (uint8_t []){0x00}, 1, 0},\
220+
{0x9A, (uint8_t []){0x0C}, 1, 0},\
221+
{0x9B, (uint8_t []){0x02}, 1, 0},\
222+
{0x9C, (uint8_t []){0xDC}, 1, 0},\
223+
{0x9D, (uint8_t []){0x04}, 1, 0},\
224+
{0x9E, (uint8_t []){0x00}, 1, 0},\
225+
{0x9F, (uint8_t []){0x00}, 1, 0},\
226+
{0xA0, (uint8_t []){0x48}, 1, 0},\
227+
{0xA1, (uint8_t []){0x00}, 1, 0},\
228+
{0xA2, (uint8_t []){0x05}, 1, 0},\
229+
{0xA3, (uint8_t []){0x02}, 1, 0},\
230+
{0xA4, (uint8_t []){0xD5}, 1, 0},\
231+
{0xA5, (uint8_t []){0x04}, 1, 0},\
232+
{0xA6, (uint8_t []){0x00}, 1, 0},\
233+
{0xA7, (uint8_t []){0x00}, 1, 0},\
234+
{0xA8, (uint8_t []){0x48}, 1, 0},\
235+
{0xA9, (uint8_t []){0x00}, 1, 0},\
236+
{0xAA, (uint8_t []){0x07}, 1, 0},\
237+
{0xAB, (uint8_t []){0x02}, 1, 0},\
238+
{0xAC, (uint8_t []){0xD7}, 1, 0},\
239+
{0xAD, (uint8_t []){0x04}, 1, 0},\
240+
{0xAE, (uint8_t []){0x00}, 1, 0},\
241+
{0xAF, (uint8_t []){0x00}, 1, 0},\
242+
{0xB0, (uint8_t []){0x48}, 1, 0},\
243+
{0xB1, (uint8_t []){0x00}, 1, 0},\
244+
{0xB2, (uint8_t []){0x09}, 1, 0},\
245+
{0xB3, (uint8_t []){0x02}, 1, 0},\
246+
{0xB4, (uint8_t []){0xD9}, 1, 0},\
247+
{0xB5, (uint8_t []){0x04}, 1, 0},\
248+
{0xB6, (uint8_t []){0x00}, 1, 0},\
249+
{0xB7, (uint8_t []){0x00}, 1, 0},\
250+
{0xB8, (uint8_t []){0x48}, 1, 0},\
251+
{0xB9, (uint8_t []){0x00}, 1, 0},\
252+
{0xBA, (uint8_t []){0x0B}, 1, 0},\
253+
{0xBB, (uint8_t []){0x02}, 1, 0},\
254+
{0xBC, (uint8_t []){0xDB}, 1, 0},\
255+
{0xBD, (uint8_t []){0x04}, 1, 0},\
256+
{0xBE, (uint8_t []){0x00}, 1, 0},\
257+
{0xBF, (uint8_t []){0x00}, 1, 0},\
258+
{0xC0, (uint8_t []){0x10}, 1, 0},\
259+
{0xC1, (uint8_t []){0x47}, 1, 0},\
260+
{0xC2, (uint8_t []){0x56}, 1, 0},\
261+
{0xC3, (uint8_t []){0x65}, 1, 0},\
262+
{0xC4, (uint8_t []){0x74}, 1, 0},\
263+
{0xC5, (uint8_t []){0x88}, 1, 0},\
264+
{0xC6, (uint8_t []){0x99}, 1, 0},\
265+
{0xC7, (uint8_t []){0x01}, 1, 0},\
266+
{0xC8, (uint8_t []){0xBB}, 1, 0},\
267+
{0xC9, (uint8_t []){0xAA}, 1, 0},\
268+
{0xD0, (uint8_t []){0x10}, 1, 0},\
269+
{0xD1, (uint8_t []){0x47}, 1, 0},\
270+
{0xD2, (uint8_t []){0x56}, 1, 0},\
271+
{0xD3, (uint8_t []){0x65}, 1, 0},\
272+
{0xD4, (uint8_t []){0x74}, 1, 0},\
273+
{0xD5, (uint8_t []){0x88}, 1, 0},\
274+
{0xD6, (uint8_t []){0x99}, 1, 0},\
275+
{0xD7, (uint8_t []){0x01}, 1, 0},\
276+
{0xD8, (uint8_t []){0xBB}, 1, 0},\
277+
{0xD9, (uint8_t []){0xAA}, 1, 0},\
278+
{0xF3, (uint8_t []){0x01}, 1, 0},\
279+
{0xF0, (uint8_t []){0x00}, 1, 0},\
280+
{0x21, (uint8_t []){0x00}, 1, 0},\
281+
{0x11, (uint8_t []){0x00}, 1, 120},\
282+
{0x29, (uint8_t []){0x00}, 1, 0},\
283+
}
284+
97285
/**
98286
* @brief LCD color configuration
99287
*/
100288
#define ESP_PANEL_BOARD_LCD_COLOR_BITS (ESP_PANEL_LCD_COLOR_BITS_RGB565)
101289
// ESP_PANEL_LCD_COLOR_BITS_RGB565/RGB666/RGB888
102290
#define ESP_PANEL_BOARD_LCD_COLOR_BGR_ORDER (0) // 0: RGB, 1: BGR
103-
#define ESP_PANEL_BOARD_LCD_COLOR_INEVRT_BIT (0) // 0/1
291+
#define ESP_PANEL_BOARD_LCD_COLOR_INEVRT_BIT (1) // 0/1
104292

105293
/**
106294
* @brief LCD transformation configuration

0 commit comments

Comments
 (0)