Repositioning GFX_EXTRA_PRE_INIT() as DEV_DEVICE_INIT()

moononournation · Dec 28, 2024 · e75a849 · e75a849
1 parent 33a8de9
commit e75a849
Show file tree

Hide file tree

Showing 40 changed files with 170 additions and 168 deletions.
diff --git a/examples/ArduinoVNC/ArduinoVNC.ino b/examples/ArduinoVNC/ArduinoVNC.ino
@@ -169,15 +169,15 @@ void handle_keyboard()
 
 void setup(void)
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX VNC example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init keyboard device
   keyboard_init();
 

diff --git a/examples/AsciiTable/AsciiTable.ino b/examples/AsciiTable/AsciiTable.ino
@@ -46,15 +46,15 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 0 /* rotation */, false
 
 void setup(void)
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX AsciiTable example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/Clock/Clock.ino b/examples/Clock/Clock.ino
@@ -77,15 +77,15 @@ static int16_t *last_cached_point;
 
 void setup(void)
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX Clock example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/HelloWorld/HelloWorld.ino b/examples/HelloWorld/HelloWorld.ino
@@ -40,15 +40,15 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 0 /* rotation */, false
 
 void setup(void)
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX Hello World example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/HelloWorldGfxfont/HelloWorldGfxfont.ino b/examples/HelloWorldGfxfont/HelloWorldGfxfont.ino
@@ -45,15 +45,15 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 0 /* rotation */, false
 
 void setup(void)
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX Hello World Gfxfont example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerAnimatedGIF_GIFDEC/ImgViewerAnimatedGIF_GIFDEC.ino b/examples/ImgViewer/ImgViewerAnimatedGIF_GIFDEC/ImgViewerAnimatedGIF_GIFDEC.ino
@@ -103,15 +103,15 @@ static GifClass gifClass;
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX Animated GIF Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerAnimatedGIF_bitbank/ImgViewerAnimatedGIF_bitbank.ino b/examples/ImgViewer/ImgViewerAnimatedGIF_bitbank/ImgViewerAnimatedGIF_bitbank.ino
@@ -267,15 +267,15 @@ void GIFDraw(GIFDRAW *pDraw)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX Animated GIF Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerBmp/ImgViewerBmp.ino b/examples/ImgViewer/ImgViewerBmp/ImgViewerBmp.ino
@@ -101,15 +101,15 @@ static void bmpDrawCallback(int16_t x, int16_t y, uint16_t *bitmap, int16_t w, i
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX BMP Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerJpeg_ESP32_JPEG/ImgViewerJpeg_ESP32_JPEG.ino b/examples/ImgViewer/ImgViewerJpeg_ESP32_JPEG/ImgViewerJpeg_ESP32_JPEG.ino
@@ -139,15 +139,15 @@ _exit:
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX ESP32 SIMD JPEG Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerJpeg_JPEGDEC/ImgViewerJpeg_JPEGDEC.ino b/examples/ImgViewer/ImgViewerJpeg_JPEGDEC/ImgViewerJpeg_JPEGDEC.ino
@@ -100,15 +100,15 @@ static int jpegDrawCallback(JPEGDRAW *pDraw)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX JPEG Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerMjpeg_ESP32_JPEG/ImgViewerMjpeg_ESP32_JPEG.ino b/examples/ImgViewer/ImgViewerMjpeg_ESP32_JPEG/ImgViewerMjpeg_ESP32_JPEG.ino
@@ -72,15 +72,15 @@ static int16_t x = -1, y = -1, w = -1, h = -1;
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX Motion JPEG SIMD Decoder Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerMjpeg_JPEGDEC/ImgViewerMjpeg_JPEGDEC.ino b/examples/ImgViewer/ImgViewerMjpeg_JPEGDEC/ImgViewerMjpeg_JPEGDEC.ino
@@ -115,15 +115,15 @@ static int jpegDrawCallback(JPEGDRAW *pDraw)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX Motion JPEG Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerPROGMEM/ImgViewerPROGMEM.ino b/examples/ImgViewer/ImgViewerPROGMEM/ImgViewerPROGMEM.ino
@@ -56,15 +56,15 @@ Arduino_GFX *gfx = new Arduino_ILI9341(bus, DF_GFX_RST, 3 /* rotation */, false
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX PROGMEM Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerPng_PNGdec/ImgViewerPng_PNGdec.ino b/examples/ImgViewer/ImgViewerPng_PNGdec/ImgViewerPng_PNGdec.ino
@@ -166,15 +166,15 @@ void PNGDraw(PNGDRAW *pDraw)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX PNG Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/ImgViewer/ImgViewerTiff_G4/ImgViewerTiff_G4.ino b/examples/ImgViewer/ImgViewerTiff_G4/ImgViewerTiff_G4.ino
@@ -145,15 +145,15 @@ void TIFFDraw(TIFFDRAW *pDraw)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX TIFF Image Viewer example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/LVGL/LVGL_Arduino_v8/LVGL_Arduino_v8.ino b/examples/LVGL/LVGL_Arduino_v8/LVGL_Arduino_v8.ino
@@ -117,17 +117,17 @@ void my_touchpad_read(lv_indev_drv_t *indev_drv, lv_indev_data_t *data)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX LVGL_Arduino_v8 example ");
   String LVGL_Arduino = String('V') + lv_version_major() + "." + lv_version_minor() + "." + lv_version_patch();
   Serial.println(LVGL_Arduino);
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/LVGL/LVGL_Arduino_v9/LVGL_Arduino_v9.ino b/examples/LVGL/LVGL_Arduino_v9/LVGL_Arduino_v9.ino
@@ -118,17 +118,17 @@ void my_touchpad_read(lv_indev_t *indev, lv_indev_data_t *data)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX LVGL_Arduino_v9 example ");
   String LVGL_Arduino = String('V') + lv_version_major() + "." + lv_version_minor() + "." + lv_version_patch();
   Serial.println(LVGL_Arduino);
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/LVGL/LvglBenchmark/LvglBenchmark.ino b/examples/LVGL/LvglBenchmark/LvglBenchmark.ino
@@ -129,17 +129,17 @@ void my_touchpad_read(lv_indev_drv_t *indev_drv, lv_indev_data_t *data)
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.print("Arduino_GFX LVGL Benchmark example ");
   String LVGL_Arduino = String('V') + lv_version_major() + "." + lv_version_minor() + "." + lv_version_patch();
   Serial.println(LVGL_Arduino);
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {

diff --git a/examples/LVGL/LvglHelloNeoPixel/LvglHelloNeoPixel.ino b/examples/LVGL/LvglHelloNeoPixel/LvglHelloNeoPixel.ino
@@ -47,15 +47,15 @@ void my_disp_flush(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *color
 
 void setup()
 {
+#ifdef DEV_DEVICE_INIT
+  DEV_DEVICE_INIT();
+#endif
+
   Serial.begin(115200);
   // Serial.setDebugOutput(true);
   // while(!Serial);
   Serial.println("Arduino_GFX LVGL Hello NeoPixel example");
 
-#ifdef GFX_EXTRA_PRE_INIT
-  GFX_EXTRA_PRE_INIT();
-#endif
-
   // Init Display
   if (!gfx->begin())
   {