Skip to content

Commit fd776f7

Browse files
moononournationmoononournation
committed
DIRECT_MODE -> DIRECT_RENDER_MODE
1 parent 3133ce0 commit fd776f7

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎examples/LVGL/LVGL_Arduino_v8/LVGL_Arduino_v8.ino

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// #include <examples/lv_examples.h>
1212
// #include <demos/lv_demos.h>
1313

14-
// #define DIRECT_MODE // Uncomment to enable full frame buffer
14+
// #define DIRECT_RENDER_MODE // Uncomment to enable full frame buffer
1515

1616
/*******************************************************************************
1717
* Start of Arduino_GFX setting
@@ -77,7 +77,7 @@ void my_print(const char *buf)
7777
/* Display flushing */
7878
void my_disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
7979
{
80-
#ifndef DIRECT_MODE
80+
#ifndef DIRECT_RENDER_MODE
8181
uint32_t w = (area->x2 - area->x1 + 1);
8282
uint32_t h = (area->y2 - area->y1 + 1);
8383

@@ -86,7 +86,7 @@ void my_disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *c
8686
#else
8787
gfx->draw16bitRGBBitmap(area->x1, area->y1, (uint16_t *)&color_p->full, w, h);
8888
#endif
89-
#endif // #ifndef DIRECT_MODE
89+
#endif // #ifndef DIRECT_RENDER_MODE
9090

9191
lv_disp_flush_ready(disp_drv);
9292
}
@@ -152,23 +152,23 @@ void setup()
152152
screenWidth = gfx->width();
153153
screenHeight = gfx->height();
154154

155-
#ifdef DIRECT_MODE
155+
#ifdef DIRECT_RENDER_MODE
156156
bufSize = screenWidth * screenHeight;
157157
#else
158158
bufSize = screenWidth * 40;
159159
#endif
160160

161161
#ifdef ESP32
162-
#if defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
162+
#if defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
163163
disp_draw_buf = (lv_color_t *)gfx->getFramebuffer();
164-
#else // !(defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
164+
#else // !(defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
165165
disp_draw_buf = (lv_color_t *)heap_caps_malloc(bufSize * 2, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
166166
if (!disp_draw_buf)
167167
{
168168
// remove MALLOC_CAP_INTERNAL flag try again
169169
disp_draw_buf = (lv_color_t *)heap_caps_malloc(bufSize * 2, MALLOC_CAP_8BIT);
170170
}
171-
#endif // !(defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
171+
#endif // !(defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
172172
#else // !ESP32
173173
Serial.println("LVGL disp_draw_buf heap_caps_malloc failed! malloc again...");
174174
disp_draw_buf = (lv_color_t *)malloc(bufSize * 2);
@@ -188,7 +188,7 @@ void setup()
188188
disp_drv.ver_res = screenHeight;
189189
disp_drv.flush_cb = my_disp_flush;
190190
disp_drv.draw_buf = &draw_buf;
191-
#ifdef DIRECT_MODE
191+
#ifdef DIRECT_RENDER_MODE
192192
disp_drv.direct_mode = true;
193193
#endif
194194
lv_disp_drv_register(&disp_drv);
@@ -225,7 +225,7 @@ void loop()
225225
{
226226
lv_timer_handler(); /* let the GUI do its work */
227227

228-
#ifdef DIRECT_MODE
228+
#ifdef DIRECT_RENDER_MODE
229229
#if defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)
230230
gfx->flush();
231231
#else // !(defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
@@ -235,11 +235,11 @@ void loop()
235235
gfx->draw16bitRGBBitmap(0, 0, (uint16_t *)disp_draw_buf, screenWidth, screenHeight);
236236
#endif
237237
#endif // !(defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
238-
#else // !DIRECT_MODE
238+
#else // !DIRECT_RENDER_MODE
239239
#ifdef CANVAS
240240
gfx->flush();
241241
#endif
242-
#endif // !DIRECT_MODE
242+
#endif // !DIRECT_RENDER_MODE
243243

244244
delay(5);
245245
}

‎examples/LVGL/LVGL_Arduino_v9/LVGL_Arduino_v9.ino

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// #include <examples/lv_examples.h>
1212
// #include <demos/lv_demos.h>
1313

14-
// #define DIRECT_MODE // Uncomment to enable full frame buffer
14+
// #define DIRECT_RENDER_MODE // Uncomment to enable full frame buffer
1515

1616
/*******************************************************************************
1717
* Start of Arduino_GFX setting
@@ -81,12 +81,12 @@ uint32_t millis_cb(void)
8181
/* LVGL calls it when a rendered image needs to copied to the display*/
8282
void my_disp_flush(lv_display_t *disp, const lv_area_t *area, uint8_t *px_map)
8383
{
84-
#ifndef DIRECT_MODE
84+
#ifndef DIRECT_RENDER_MODE
8585
uint32_t w = lv_area_get_width(area);
8686
uint32_t h = lv_area_get_height(area);
8787

8888
gfx->draw16bitRGBBitmap(area->x1, area->y1, (uint16_t *)px_map, w, h);
89-
#endif // #ifndef DIRECT_MODE
89+
#endif // #ifndef DIRECT_RENDER_MODE
9090

9191
/*Call it to tell LVGL you are ready*/
9292
lv_disp_flush_ready(disp);
@@ -157,23 +157,23 @@ void setup()
157157
screenWidth = gfx->width();
158158
screenHeight = gfx->height();
159159

160-
#ifdef DIRECT_MODE
160+
#ifdef DIRECT_RENDER_MODE
161161
bufSize = screenWidth * screenHeight;
162162
#else
163163
bufSize = screenWidth * 40;
164164
#endif
165165

166166
#ifdef ESP32
167-
#if defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
167+
#if defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
168168
disp_draw_buf = (lv_color_t *)gfx->getFramebuffer();
169-
#else // !(defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
169+
#else // !(defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
170170
disp_draw_buf = (lv_color_t *)heap_caps_malloc(bufSize * 2, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
171171
if (!disp_draw_buf)
172172
{
173173
// remove MALLOC_CAP_INTERNAL flag try again
174174
disp_draw_buf = (lv_color_t *)heap_caps_malloc(bufSize * 2, MALLOC_CAP_8BIT);
175175
}
176-
#endif // !(defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
176+
#endif // !(defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
177177
#else // !ESP32
178178
Serial.println("LVGL disp_draw_buf heap_caps_malloc failed! malloc again...");
179179
disp_draw_buf = (lv_color_t *)malloc(bufSize * 2);
@@ -186,7 +186,7 @@ void setup()
186186
{
187187
disp = lv_display_create(screenWidth, screenHeight);
188188
lv_display_set_flush_cb(disp, my_disp_flush);
189-
#ifdef DIRECT_MODE
189+
#ifdef DIRECT_RENDER_MODE
190190
lv_display_set_buffers(disp, disp_draw_buf, NULL, bufSize * 2, LV_DISPLAY_RENDER_MODE_DIRECT);
191191
#else
192192
lv_display_set_buffers(disp, disp_draw_buf, NULL, bufSize * 2, LV_DISPLAY_RENDER_MODE_PARTIAL);
@@ -228,17 +228,17 @@ void loop()
228228
{
229229
lv_task_handler(); /* let the GUI do its work */
230230

231-
#ifdef DIRECT_MODE
231+
#ifdef DIRECT_RENDER_MODE
232232
#if defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)
233233
gfx->flush();
234234
#else // !(defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
235235
gfx->draw16bitRGBBitmap(0, 0, (uint16_t *)disp_draw_buf, screenWidth, screenHeight);
236236
#endif // !(defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
237-
#else // !DIRECT_MODE
237+
#else // !DIRECT_RENDER_MODE
238238
#ifdef CANVAS
239239
gfx->flush();
240240
#endif
241-
#endif // !DIRECT_MODE
241+
#endif // !DIRECT_RENDER_MODE
242242

243243
delay(5);
244244
}

‎examples/LVGL/LvglBenchmark/LvglBenchmark.ino

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* #define LV_FONT_DEFAULT &lv_font_montserrat_12
3333
******************************************************************************/
3434
#include "lv_demo_benchmark.h"
35-
// #define DIRECT_MODE // Uncomment to enable full frame buffer
35+
// #define DIRECT_RENDER_MODE // Uncomment to enable full frame buffer
3636

3737
/*******************************************************************************
3838
* Start of Arduino_GFX setting
@@ -89,7 +89,7 @@ lv_disp_drv_t disp_drv;
8989
/* Display flushing */
9090
void my_disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
9191
{
92-
#ifndef DIRECT_MODE
92+
#ifndef DIRECT_RENDER_MODE
9393
uint32_t w = (area->x2 - area->x1 + 1);
9494
uint32_t h = (area->y2 - area->y1 + 1);
9595

@@ -98,7 +98,7 @@ void my_disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *c
9898
#else
9999
gfx->draw16bitRGBBitmap(area->x1, area->y1, (uint16_t *)&color_p->full, w, h);
100100
#endif
101-
#endif // #ifndef DIRECT_MODE
101+
#endif // #ifndef DIRECT_RENDER_MODE
102102

103103
lv_disp_flush_ready(disp_drv);
104104
}
@@ -160,23 +160,23 @@ void setup()
160160
screenWidth = gfx->width();
161161
screenHeight = gfx->height();
162162

163-
#ifdef DIRECT_MODE
163+
#ifdef DIRECT_RENDER_MODE
164164
bufSize = screenWidth * screenHeight;
165165
#else
166166
bufSize = screenWidth * 40;
167167
#endif
168168

169169
#ifdef ESP32
170-
#if defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
170+
#if defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
171171
disp_draw_buf = (lv_color_t *)gfx->getFramebuffer();
172-
#else // !(defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
172+
#else // !(defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
173173
disp_draw_buf = (lv_color_t *)heap_caps_malloc(bufSize * 2, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT);
174174
if (!disp_draw_buf)
175175
{
176176
// remove MALLOC_CAP_INTERNAL flag try again
177177
disp_draw_buf = (lv_color_t *)heap_caps_malloc(bufSize * 2, MALLOC_CAP_8BIT);
178178
}
179-
#endif // !(defined(DIRECT_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
179+
#endif // !(defined(DIRECT_RENDER_MODE) && (defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)))
180180
#else // !ESP32
181181
Serial.println("LVGL disp_draw_buf heap_caps_malloc failed! malloc again...");
182182
disp_draw_buf = (lv_color_t *)malloc(bufSize * 2);
@@ -196,7 +196,7 @@ void setup()
196196
disp_drv.ver_res = screenHeight;
197197
disp_drv.flush_cb = my_disp_flush;
198198
disp_drv.draw_buf = &draw_buf;
199-
#ifdef DIRECT_MODE
199+
#ifdef DIRECT_RENDER_MODE
200200
disp_drv.direct_mode = true;
201201
#endif
202202
lv_disp_drv_register(&disp_drv);
@@ -218,7 +218,7 @@ void loop()
218218
{
219219
lv_timer_handler(); /* let the GUI do its work */
220220

221-
#ifdef DIRECT_MODE
221+
#ifdef DIRECT_RENDER_MODE
222222
#if defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL)
223223
gfx->flush();
224224
#else // !(defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
@@ -228,11 +228,11 @@ void loop()
228228
gfx->draw16bitRGBBitmap(0, 0, (uint16_t *)disp_draw_buf, screenWidth, screenHeight);
229229
#endif
230230
#endif // !(defined(CANVAS) || defined(RGB_PANEL) || defined(DSI_PANEL))
231-
#else // !DIRECT_MODE
231+
#else // !DIRECT_RENDER_MODE
232232
#ifdef CANVAS
233233
gfx->flush();
234234
#endif
235-
#endif // !DIRECT_MODE
235+
#endif // !DIRECT_RENDER_MODE
236236

237237
delay(5);
238238
}

0 commit comments

Comments
 (0)