Upgraded libraries, fixed compatibility
This commit is contained in:
parent
f9239b3f97
commit
3d9a4c0dab
|
|
@ -32,6 +32,8 @@ We use a MAX98357A I2S 3W DAC Class D Amplifier Module
|
||||||
GND -> GND
|
GND -> GND
|
||||||
```
|
```
|
||||||
|
|
||||||
|
For sound output, we use the ESP32-audio2I2S library. Important note: Last release without PSRAM is V 3.2.1. You get OOM errors if using a later library without PSRAM.
|
||||||
|
|
||||||
### SD Card Reader
|
### SD Card Reader
|
||||||
|
|
||||||
SD Card Reader Adapter Modul
|
SD Card Reader Adapter Modul
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 8ba32081845b36042bad806e38393ddd5882797b
|
Subproject commit ee6a7cc2b89eb90e43c958ccb3674dd37d88bf2c
|
||||||
|
|
@ -9,14 +9,14 @@
|
||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[env:d1_mini32]
|
[env:d1_mini32]
|
||||||
platform = platformio/espressif32@6.11.0
|
platform = https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip
|
||||||
board = wemos_d1_mini32
|
board = wemos_d1_mini32
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps =
|
lib_deps =
|
||||||
me-no-dev/AsyncTCP@^3.3.2
|
ESP32Async/AsyncTCP@3.3.8
|
||||||
me-no-dev/ESP Async WebServer@^1.2.3
|
ESP32Async/ESPAsyncWebServer@3.7.9
|
||||||
alanswx/ESPAsyncWiFiManager@^0.31
|
alanswx/ESPAsyncWiFiManager@0.31
|
||||||
miguelbalboa/MFRC522@^1.4.10
|
miguelbalboa/MFRC522@^1.4.12
|
||||||
bblanchon/ArduinoJson@^6.21.3
|
bblanchon/ArduinoJson@^6.21.3
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
board_build.partitions = huge_app.csv
|
board_build.partitions = huge_app.csv
|
||||||
|
|
|
||||||
15
src/main.cpp
15
src/main.cpp
|
|
@ -823,7 +823,7 @@ void id_song_action(AsyncWebServerRequest *request)
|
||||||
int params = request->params();
|
int params = request->params();
|
||||||
for (int i = 0; i < params; i++)
|
for (int i = 0; i < params; i++)
|
||||||
{
|
{
|
||||||
AsyncWebParameter *p = request->getParam(i);
|
const AsyncWebParameter *p = request->getParam(i);
|
||||||
if (p->name() == "id")
|
if (p->name() == "id")
|
||||||
{
|
{
|
||||||
playSongById(atoi(p->value().c_str()));
|
playSongById(atoi(p->value().c_str()));
|
||||||
|
|
@ -840,7 +840,7 @@ void progress_action(AsyncWebServerRequest *request)
|
||||||
int params = request->params();
|
int params = request->params();
|
||||||
for (int i = 0; i < params; i++)
|
for (int i = 0; i < params; i++)
|
||||||
{
|
{
|
||||||
AsyncWebParameter *p = request->getParam(i);
|
const AsyncWebParameter *p = request->getParam(i);
|
||||||
if (p->name() == "value")
|
if (p->name() == "value")
|
||||||
{
|
{
|
||||||
audio.setAudioPlayPosition(atoi(p->value().c_str()));
|
audio.setAudioPlayPosition(atoi(p->value().c_str()));
|
||||||
|
|
@ -856,7 +856,7 @@ void volume_action(AsyncWebServerRequest *request)
|
||||||
int params = request->params();
|
int params = request->params();
|
||||||
for (int i = 0; i < params; i++)
|
for (int i = 0; i < params; i++)
|
||||||
{
|
{
|
||||||
AsyncWebParameter *p = request->getParam(i);
|
const AsyncWebParameter *p = request->getParam(i);
|
||||||
if (p->name() == "value")
|
if (p->name() == "value")
|
||||||
{
|
{
|
||||||
audio.setVolume(atoi(p->value().c_str()));
|
audio.setVolume(atoi(p->value().c_str()));
|
||||||
|
|
@ -1001,7 +1001,8 @@ void loop()
|
||||||
|
|
||||||
void loop2(void *parameter)
|
void loop2(void *parameter)
|
||||||
{
|
{
|
||||||
Serial.println("loop2 started");
|
bool loggingDone = false;
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -1017,7 +1018,13 @@ void loop2(void *parameter)
|
||||||
{
|
{
|
||||||
asyncTogglePlayPause = true;
|
asyncTogglePlayPause = true;
|
||||||
}
|
}
|
||||||
|
if (!loggingDone) {
|
||||||
|
Serial.println("loop2 started");
|
||||||
|
loggingDone = true;
|
||||||
}
|
}
|
||||||
|
vTaskDelay(1);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean buttonPressed(const uint8_t pin)
|
boolean buttonPressed(const uint8_t pin)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue