diff --git a/boards b/boards index 3dafb46..0e471db 160000 --- a/boards +++ b/boards @@ -1 +1 @@ -Subproject commit 3dafb46859eb818fbf22ca9b61077a8ec67f0b7a +Subproject commit 0e471dbb1a687e0df9b8f14f2365feb6f2ae9df0 diff --git a/platformio.ini b/platformio.ini index cda0ab5..314eb96 100644 --- a/platformio.ini +++ b/platformio.ini @@ -50,19 +50,17 @@ monitor_rts = 0 monitor_dtr = 0 monitor_filters = esp32_exception_decoder -# Partition scheme for OTA -board_build.partitions = min_spiffs.csv - build_flags = -Ofast -Wall -D 'BOARD_NAME="${this.board}"' - -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE - -D'LV_CONF_PATH=${platformio.include_dir}/lv_conf.h' + #-D 'CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE' + #-D 'CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG' + -D 'CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO' + -D 'LV_CONF_PATH=${platformio.include_dir}/lv_conf.h' lib_deps = https://github.com/rzeldent/esp32-smartdisplay#develop - https://github.com/schreibfaul1/ESP32-audioI2S [env:esp32-1732S019C] board = esp32-1732S019C diff --git a/src/main.cpp b/src/main.cpp index bd24e37..c1a4fd0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,13 +2,6 @@ #include #include -#include - -#define WIFI_SSID "" -#define WIFI_PASSWORD "" -#define RADIO_URL "http://www.wdr.de/wdrlive/media/einslive.m3u" - -Audio *audio; void OnButtonClicked(lv_event_t *e) { @@ -30,20 +23,6 @@ void setup() log_i("Free PSRAM: %d bytes", ESP.getPsramSize()); log_i("SDK version: %s", ESP.getSdkVersion()); -#ifdef BOARD_HAS_SPEAK - // Connect to WiFi - WiFi.begin(WIFI_SSID, WIFI_PASSWORD); - if (WiFi.waitForConnectResult() == WL_CONNECTED) - { - audio = new Audio(true, I2S_DAC_CHANNEL_LEFT_EN); - audio->forceMono(true); - audio->setVolume(10); - - while (!audio->connecttohost(RADIO_URL)) - delay(500); - } -#endif - smartdisplay_init(); auto disp = lv_disp_get_default(); @@ -58,11 +37,6 @@ ulong next_millis; void loop() { -#ifdef BOARD_HAS_SPEAK - if (audio) - audio->loop(); -#endif - auto const now = millis(); if (now > next_millis) {