Merge branch 'bugfix/fix_screen' into 'master'

screen: update to improve efficiency See merge request rd/esp-iot-solution!509
lzujian · Apr 29, 2021 · 6060600 · 6060600
2 parents ab3fc13 + 5dd0f04
commit 6060600
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 283 deletions.
diff --git a/components/audio/pwm_audio/pwm_audio.c b/components/audio/pwm_audio/pwm_audio.c
@@ -29,11 +29,7 @@
 #include "pwm_audio.h"
 #include "sdkconfig.h"
 
-#ifndef CONFIG_IDF_TARGET_ESP32S2
-#ifndef CONFIG_IDF_TARGET_ESP32
-#error No defined idf target esp32 or esp32s2
-#endif
-#endif
+#if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32)
 
 static const char *TAG = "pwm_audio";
 
@@ -812,3 +808,5 @@ esp_err_t pwm_audio_deinit(void)
     g_pwm_audio_handle = NULL;
     return ESP_OK;
 }
+
+#endif
diff --git a/components/bus/i2s_lcd_esp32_driver.c b/components/bus/i2s_lcd_esp32_driver.c