display: update sdkconfig define

Author: redchenjs

components/ugfx/src/gdriver/gdriver_mk.c

@@ -7,13 +7,13 @@
 
 #include "gdriver.c"
 
-#if defined(CONFIG_OLED_PANEL_SSD1331)
+#if defined(CONFIG_SCREEN_PANEL_SSD1331)
 
 #undef GDISP_DRIVER_LIST
 #define GDISP_DRIVER_LIST GDISPVMT_SSD1331
 #include "../../drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c"
 
-#elif defined(CONFIG_OLED_PANEL_SSD1351)
+#elif defined(CONFIG_SCREEN_PANEL_SSD1351)
 
 #undef GDISP_DRIVER_LIST
 #define GDISP_DRIVER_LIST GDISPVMT_SSD1351

main/inc/tasks/gui_task.h

@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#if defined(CONFIG_OLED_PANEL_SSD1331)
+#if defined(CONFIG_SCREEN_PANEL_SSD1331)
 // ani0_96x64.gif
 extern const uint8_t ani0_96x64_gif_ptr[] asm("_binary_ani0_96x64_gif_start");
 extern const uint8_t ani0_96x64_gif_end[] asm("_binary_ani0_96x64_gif_end");
@@ -23,7 +23,7 @@ extern const uint8_t ani2_96x64_gif_end[] asm("_binary_ani2_96x64_gif_end");
 // ani3_96x64.gif
 extern const uint8_t ani3_96x64_gif_ptr[] asm("_binary_ani3_96x64_gif_start");
 extern const uint8_t ani3_96x64_gif_end[] asm("_binary_ani3_96x64_gif_end");
-#elif defined(CONFIG_OLED_PANEL_SSD1351)
+#elif defined(CONFIG_SCREEN_PANEL_SSD1351)
 // ani0_128x128.gif
 extern const uint8_t ani0_128x128_gif_ptr[] asm("_binary_ani0_128x128_gif_start");
 extern const uint8_t ani0_128x128_gif_end[] asm("_binary_ani0_128x128_gif_end");

main/src/device/spi.c

@@ -6,11 +6,8 @@
  */
 
 #include "driver/spi_master.h"
-#if defined(CONFIG_OLED_PANEL_SSD1331)
 #include "driver/ssd1331.h"
-#elif defined(CONFIG_OLED_PANEL_SSD1351)
 #include "driver/ssd1351.h"
-#endif
 
 spi_device_handle_t spi1;
 
@@ -24,20 +21,20 @@ void spi1_init(void)
         .sclk_io_num=5,
         .quadwp_io_num=-1,
         .quadhd_io_num=-1,
-#if defined(CONFIG_OLED_PANEL_SSD1331)
+#if defined(CONFIG_SCREEN_PANEL_SSD1331)
         .max_transfer_sz=96*64*2
-#elif defined(CONFIG_OLED_PANEL_SSD1351)
+#elif defined(CONFIG_SCREEN_PANEL_SSD1351)
         .max_transfer_sz=128*128*2
 #endif
     };
     spi_device_interface_config_t devcfg={
         .clock_speed_hz=20000000,               // Clock out at 20 MHz
         .mode=0,                                // SPI mode 0
         .spics_io_num=27,                       // CS pin
-#if defined(CONFIG_OLED_PANEL_SSD1331)
+#if defined(CONFIG_SCREEN_PANEL_SSD1331)
         .queue_size=3,                          // We want to be able to queue 3 transactions at a time
         .pre_cb=ssd1331_setpin_dc,              // Specify pre-transfer callback to handle D/C line
-#elif defined(CONFIG_OLED_PANEL_SSD1351)
+#elif defined(CONFIG_SCREEN_PANEL_SSD1351)
         .queue_size=6,                          // We want to be able to queue 6 transactions at a time
         .pre_cb=ssd1351_setpin_dc,              // Specify pre-transfer callback to handle D/C line
 #endif

main/src/system/init.c

@@ -16,16 +16,20 @@
 void device_init(void)
 {
     bt0_init();
-#if defined(CONFIG_OLED_PANEL_SSD1331) || defined(CONFIG_OLED_PANEL_SSD1351)
+#if !defined(CONFIG_SCREEN_PANEL_NONE)
     spi1_init();
 #endif
     i2s0_init();
+#if !defined(CONFIG_I2S_OUTPUT_INTERNAL_DAC) && !defined(CONFIG_I2S_OUTPUT_PDM)
     gpio0_init();
+#endif
     spiffs0_init();
 }
 
 void driver_init(void)
 {
+#if !defined(CONFIG_I2S_OUTPUT_INTERNAL_DAC)
     led_init();
+#endif
 }
 

main/src/system/task.c

@@ -15,10 +15,12 @@
 
 void task_init(void)
 {
-#if defined(CONFIG_OLED_PANEL_SSD1331) || defined(CONFIG_OLED_PANEL_SSD1351)
+#if !defined(CONFIG_SCREEN_PANEL_NONE)
     xTaskCreate(gui_task, "gui_task", 2048, NULL, 5, NULL);
 #endif
     xTaskCreate(mp3_player_task, "mp3_player_task", 8192, NULL, 5, NULL);
     xTaskCreate(bt_speaker_task, "bt_speaker_task", 2560, NULL, 5, NULL);
+#if !defined(CONFIG_I2S_OUTPUT_INTERNAL_DAC) && !defined(CONFIG_I2S_OUTPUT_PDM)
     xTaskCreate(led_indicator_task, "led_indicator_task", 1024, NULL, 5, NULL);
+#endif
 }

main/src/tasks/gui_task.c

@@ -14,12 +14,12 @@
 #define TAG "gui_task"
 
 static const uint8_t *img_file_ptr[][2] = {
-#if defined(CONFIG_OLED_PANEL_SSD1331)
+#if defined(CONFIG_SCREEN_PANEL_SSD1331)
                                             {ani0_96x64_gif_ptr, ani0_96x64_gif_end}, // "Bluetooth"
                                             {ani1_96x64_gif_ptr, ani1_96x64_gif_end}, // "Standby"
                                             {ani2_96x64_gif_ptr, ani2_96x64_gif_end}, // "Pause"
                                             {ani3_96x64_gif_ptr, ani3_96x64_gif_end}  // "Playing"
-#elif defined(CONFIG_OLED_PANEL_SSD1351)
+#elif defined(CONFIG_SCREEN_PANEL_SSD1351)
                                             {ani0_128x128_gif_ptr, ani0_128x128_gif_end}, // "Bluetooth"
                                             {ani1_128x128_gif_ptr, ani1_128x128_gif_end}, // "Standby"
                                             {ani2_128x128_gif_ptr, ani2_128x128_gif_end}, // "Pause"
@@ -30,7 +30,7 @@ uint8_t img_file_index = 0;
 
 void gui_show_image(uint8_t filename_index)
 {
-#if defined(CONFIG_OLED_PANEL_SSD1331) || defined(CONFIG_OLED_PANEL_SSD1351)
+#if defined(CONFIG_SCREEN_PANEL_SSD1331) || defined(CONFIG_SCREEN_PANEL_SSD1351)
     if (filename_index >= (sizeof(img_file_ptr) / 2)) {
         ESP_LOGE(TAG, "invalid filename index");
         return;