Skip to content

Commit

Permalink
enable "Arduino as component" by default
Browse files Browse the repository at this point in the history
fix compiler warning
spell check
  • Loading branch information
tueddy committed Oct 5, 2023
1 parent 888a8c4 commit 9bd2ddc
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -31,15 +31,15 @@ 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
https://github.com/tueddy/FastLED.git#3.6.0_IRAM ;save some IRAM to compile with all features (https://github.com/FastLED/[email protected])
https://github.com/me-no-dev/ESPAsyncWebServer.git#1d46269
https://github.com/me-no-dev/AsyncTCP.git#ca8ac5f
https://github.com/bblanchon/[email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion src/Bluetooth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/LogMessages_DE.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)";
Expand Down
2 changes: 1 addition & 1 deletion src/values.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9bd2ddc

Please sign in to comment.