From 9bd2ddc89b25c7d7434580f5a74549579ef7116e Mon Sep 17 00:00:00 2001 From: tueddy Date: Thu, 5 Oct 2023 21:27:17 +0200 Subject: [PATCH] enable "Arduino as component" by default fix compiler warning spell check --- changelog.md | 1 + platformio.ini | 8 ++++---- src/Bluetooth.cpp | 2 +- src/LogMessages_DE.cpp | 2 +- src/values.h | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/changelog.md b/changelog.md index 9fde3b64..ede1c8cd 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ ## DEV-branch +* 05.10.2023: Enable "Arduino as component" by default * 02.10.2023: Optimize Arduino as component (Disable BLE, BT-HFP & SPI ethernet) * 25.09.2023: Handle unicode characters in NVS backup, write UTF-8 BOM in backup.txt * 23.09.2023: Fix some log messages, update FTP & A2DP libraries diff --git a/platformio.ini b/platformio.ini index 1569baf6..70c485b9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,8 +19,8 @@ board_build.partitions = custom_4mb_noota.csv platform = espressif32@^6.3.2 ;platform = espressif32 ;platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream -framework = arduino -;framework = arduino, espidf +;framework = arduino +framework = arduino, espidf monitor_speed = 115200 monitor_filters = esp32_exception_decoder ;monitor_port = /dev/cu.SLAB_USBtoUART @@ -31,7 +31,7 @@ extra_scripts = pre:updateSdkConfig.py pre:processHtml.py lib_deps = - https://github.com/schreibfaul1/ESP32-audioI2S.git + https://github.com/schreibfaul1/ESP32-audioI2S.git#224373c https://github.com/madhephaestus/ESP32Encoder.git#61aef9c https://github.com/knolleary/pubsubclient.git#2d228f2 https://github.com/peterus/ESP-FTP-Server-Lib#554959f @@ -39,7 +39,7 @@ lib_deps = https://github.com/me-no-dev/ESPAsyncWebServer.git#1d46269 https://github.com/me-no-dev/AsyncTCP.git#ca8ac5f https://github.com/bblanchon/ArduinoJson.git@6.21.3 - https://github.com/pschatzmann/ESP32-A2DP.git#fc8a0ea + https://github.com/pschatzmann/ESP32-A2DP.git#3b0cc1a https://github.com/Arduino-IRremote/Arduino-IRremote.git#ed94895 https://github.com/kkloesener/MFRC522_I2C.git#121a27e https://github.com/miguelbalboa/rfid.git#ba72b92 diff --git a/src/Bluetooth.cpp b/src/Bluetooth.cpp index 4d4febb9..1180b0ca 100644 --- a/src/Bluetooth.cpp +++ b/src/Bluetooth.cpp @@ -172,7 +172,7 @@ void Bluetooth_Init(void) { // bluetooth in sink mode (player acts as a BT-Speaker) a2dp_sink = new BluetoothA2DPSink(); i2s_pin_config_t pin_config = { - #ifdef ESP_IDF_4 + #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0) .mck_io_num = 0, #endif .bck_io_num = I2S_BCLK, diff --git a/src/LogMessages_DE.cpp b/src/LogMessages_DE.cpp index 55987ab8..da0545d6 100644 --- a/src/LogMessages_DE.cpp +++ b/src/LogMessages_DE.cpp @@ -225,7 +225,7 @@ const char hpOn[] = "Kopfhörer eingeschaltet"; const char hpOff[] = "Kopfhörer ausgeschaltet"; const char webTxCanceled[] = "Der Webtransfer wurde aufgrund von Inaktivität beendet."; - const char tryToPickRandomDir[] = "Versuche ein zufälliges Unterzeichnis zu finden aus: %s"; + const char tryToPickRandomDir[] = "Versuche ein zufälliges Unterverzeichnis zu finden aus: %s"; const char pickedRandomDir[] = "Zufällig ausgewähltes Unterverzeichnis: %s"; const char wrongWakeUpGpio[] = "Der gewählte GPIO ist nicht vom Typ RTC und unterstützt daher das Aufwecken des ESP32 nicht! (GPIO: %u)"; const char currentlyPlaying[] = "'%s' wird abgespielt (%d von %d)"; diff --git a/src/values.h b/src/values.h index 570dd61b..3ebaecda 100644 --- a/src/values.h +++ b/src/values.h @@ -89,4 +89,4 @@ #define EN 2 // Debug -#define PRINT_TASK_STATS 900 // Prints task stats (only debugging; needs modification of platformio.ini (https://forum.espuino.de/t/rfid-mit-oder-ohne-task/353/21)) +#define PRINT_TASK_STATS 900 // Prints task stats for debugging, needs CONFIG_FREERTOS_USE_TRACE_FACILITY=y and CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y in sdkconfig.defaults