misc: code clean up

Author: redchenjs

components/ugfx/src/gdriver/gdriver_mk.c

@@ -9,10 +9,10 @@
 
 #undef GDISP_DRIVER_LIST
 
-#ifdef CONFIG_SCREEN_PANEL_ST7789
-    #define GDISP_DRIVER_LIST GDISPVMT_ST7789
-    #include "drivers/gdisp/ST7789/gdisp_lld_ST7789.c"
-#else
+#ifdef CONFIG_SCREEN_PANEL_ST7735
     #define GDISP_DRIVER_LIST GDISPVMT_ST7735
     #include "drivers/gdisp/ST7735/gdisp_lld_ST7735.c"
+#else
+    #define GDISP_DRIVER_LIST GDISPVMT_ST7789
+    #include "drivers/gdisp/ST7789/gdisp_lld_ST7789.c"
 #endif

main/Kconfig.projbuild

@@ -207,7 +207,7 @@ config AUDIO_OUTPUT_I2S_NUM
     int
     default 0 if AUDIO_OUTPUT_I2S0
     default 1 if AUDIO_OUTPUT_I2S1
-    depends on ENABLE_AUDIO_PROMPT
+    default 2 if !ENABLE_AUDIO_PROMPT
 
 config I2S_BCLK_PIN
     int "I2S BCLK Pin"

main/inc/user/gui.h

@@ -38,7 +38,7 @@ extern const char ani7_160x80_gif_end[] asm("_binary_ani7_160x80_gif_end");
 // ani8.gif
 extern const char ani8_160x80_gif_ptr[] asm("_binary_ani8_160x80_gif_start");
 extern const char ani8_160x80_gif_end[] asm("_binary_ani8_160x80_gif_end");
-#elif defined(CONFIG_SCREEN_PANEL_ST7789)
+#else
 // ani0.gif
 extern const char ani0_240x135_gif_ptr[] asm("_binary_ani0_240x135_gif_start");
 extern const char ani0_240x135_gif_end[] asm("_binary_ani0_240x135_gif_end");

main/src/chip/spi.c

@@ -27,7 +27,7 @@ void hspi_init(void)
         .quadhd_io_num = -1,
 #ifdef CONFIG_SCREEN_PANEL_ST7735
         .max_transfer_sz = ST7735_SCREEN_WIDTH*ST7735_SCREEN_HEIGHT*2
-#elif defined(CONFIG_SCREEN_PANEL_ST7789)
+#else
         .max_transfer_sz = ST7789_SCREEN_WIDTH*ST7789_SCREEN_HEIGHT*2
 #endif
     };
@@ -39,7 +39,7 @@ void hspi_init(void)
 #ifdef CONFIG_SCREEN_PANEL_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_SCREEN_PANEL_ST7789)
+#else
         .clock_speed_hz = 40000000,               // Clock out at 40 MHz
         .pre_cb = st7789_setpin_dc,               // Specify pre-transfer callback to handle D/C line
 #endif

main/src/user/gui.c

@@ -26,7 +26,7 @@ static const char *img_file_ptr[][2] = {
     {ani6_160x80_gif_ptr, ani6_160x80_gif_end}, // "Error"
     {ani7_160x80_gif_ptr, ani7_160x80_gif_end}, // "Config"
     {ani8_160x80_gif_ptr, ani8_160x80_gif_end}, // "Updating"
-#elif defined(CONFIG_SCREEN_PANEL_ST7789)
+#else
     {ani0_240x135_gif_ptr, ani0_240x135_gif_end}, // "WiFi"
     {ani1_240x135_gif_ptr, ani1_240x135_gif_end}, // "Loading"
     {ani2_240x135_gif_ptr, ani2_240x135_gif_end}, // "Success"