misc: code clean up

Author: redchenjs

components/ugfx/src/gdriver/gdriver_mk.c

@@ -9,12 +9,12 @@
 
 #undef GDISP_DRIVER_LIST
 
-#ifdef CONFIG_VFX_OUTPUT_ST7789
-    #define GDISP_DRIVER_LIST GDISPVMT_ST7789
-    #include "drivers/gdisp/ST7789/gdisp_lld_ST7789.c"
-#elif defined(CONFIG_VFX_OUTPUT_ST7735)
+#ifdef CONFIG_VFX_OUTPUT_ST7735
     #define GDISP_DRIVER_LIST GDISPVMT_ST7735
     #include "drivers/gdisp/ST7735/gdisp_lld_ST7735.c"
+#elif defined(CONFIG_VFX_OUTPUT_ST7789)
+    #define GDISP_DRIVER_LIST GDISPVMT_ST7789
+    #include "drivers/gdisp/ST7789/gdisp_lld_ST7789.c"
 #else
     #define GDISP_DRIVER_LIST GDISPVMT_CUBE0414
     #include "drivers/gdisp/CUBE0414/gdisp_lld_CUBE0414.c"

main/src/chip/spi.c

@@ -26,28 +26,28 @@ void hspi_init(void)
         .sclk_io_num = CONFIG_SPI_SCLK_PIN,
         .quadwp_io_num = -1,
         .quadhd_io_num = -1,
-#ifdef CONFIG_VFX_OUTPUT_CUBE0414
-        .max_transfer_sz = CUBE0414_X*CUBE0414_Y*CUBE0414_Z*3
-#elif defined(CONFIG_VFX_OUTPUT_ST7735)
+#ifdef CONFIG_VFX_OUTPUT_ST7735
         .max_transfer_sz = ST7735_SCREEN_WIDTH*ST7735_SCREEN_HEIGHT*2
 #elif defined(CONFIG_VFX_OUTPUT_ST7789)
         .max_transfer_sz = ST7789_SCREEN_WIDTH*ST7789_SCREEN_HEIGHT*2
+#else
+        .max_transfer_sz = CUBE0414_X*CUBE0414_Y*CUBE0414_Z*3
 #endif
     };
     ESP_ERROR_CHECK(spi_bus_initialize(HSPI_HOST, &buscfg, 1));
 
     spi_device_interface_config_t devcfg = {
         .mode = 0,                                // SPI mode 0
         .spics_io_num = CONFIG_SPI_CS_PIN,        // CS pin
-#ifdef CONFIG_VFX_OUTPUT_CUBE0414
-        .clock_speed_hz = 40000000,               // Clock out at 40 MHz
-        .pre_cb = cube0414_setpin_dc,             // Specify pre-transfer callback to handle D/C line
-#elif defined(CONFIG_VFX_OUTPUT_ST7735)
+#ifdef CONFIG_VFX_OUTPUT_ST7735
         .clock_speed_hz = 26000000,               // Clock out at 26 MHz
         .pre_cb = st7735_setpin_dc,               // Specify pre-transfer callback to handle D/C line
 #elif defined(CONFIG_VFX_OUTPUT_ST7789)
         .clock_speed_hz = 40000000,               // Clock out at 40 MHz
         .pre_cb = st7789_setpin_dc,               // Specify pre-transfer callback to handle D/C line
+#else
+        .clock_speed_hz = 40000000,               // Clock out at 40 MHz
+        .pre_cb = cube0414_setpin_dc,             // Specify pre-transfer callback to handle D/C line
 #endif
         .queue_size = 2,                          // We want to be able to queue 2 transactions at a time
         .flags = SPI_DEVICE_3WIRE | SPI_DEVICE_HALFDUPLEX