Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ed4ff8a
feature: atmolight
Joe91 May 6, 2025
7a215da
remove audio-tak
Joe91 May 15, 2025
6a310c7
rename queues and remove queues
Joe91 May 15, 2025
b683cff
place audio into ps-ram again
Joe91 May 15, 2025
0c61ee4
Merge remote-tracking branch 'original/dev' into remove_audio_task
Joe91 May 15, 2025
3e467d1
move rfid-task to core 1
Joe91 May 15, 2025
ca3531f
fix: add log for audio-level again
Joe91 May 15, 2025
144da01
some more tweaks on LED and RFID-Task (seems to remove the audio-issu…
Joe91 May 16, 2025
30ed576
also remove LED-Task
Joe91 May 16, 2025
2b6e18f
more performant main-loop
Joe91 May 16, 2025
8759985
Merge branch 'remove_audio_task' into remove_led-task
Joe91 May 16, 2025
fa2c7a5
some cleanup. No flicker at all anymore
Joe91 May 16, 2025
66555c8
separate cores more strictly
Joe91 May 16, 2025
82098d1
save wip
Joe91 May 17, 2025
5c6e3b4
separate cores more strictly
Joe91 May 17, 2025
3c43434
Merge branch 'remove_led-task' into remove_audio_task
Joe91 May 17, 2025
b1dba80
use original positioin of loop again and add pause-mechanism again
Joe91 May 18, 2025
81a237c
fix from wolle (set file pos works again)
Joe91 May 18, 2025
467cbe2
clean core-separation
Joe91 May 18, 2025
5f8591b
don't stop the leds or music anymore during upload. Reduce diffs
Joe91 May 18, 2025
d9d3e9e
fix invalid reference
Joe91 May 18, 2025
5a6964d
Merge branch 'remove_audio_task' into atmolight
Joe91 May 19, 2025
4301d8a
Revert "Merge branch 'remove_led-task' into remove_audio_task"
Joe91 May 22, 2025
45f900d
speedup web again. pausing Led-task can cause exceptions
Joe91 May 24, 2025
ee4bcb7
Merge branch 'again_with_tasks' into remove_audio_task
Joe91 May 24, 2025
143943b
finally working leds?
Joe91 Jun 19, 2025
1b8c822
update audio-lib, wait for wifi-connection for mqtt (no more errors o…
Joe91 Jun 19, 2025
32142f8
fix platformio.ini
Joe91 Jun 19, 2025
a93631f
use .git
Joe91 Jun 19, 2025
a73bbf7
Merge branch 'remove_audio_task' into atmolight
Joe91 Jun 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions html/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
"offsetpause": "Pausen-LEDs zentrieren",
"huestart": "Farbton-Start (Playlist-Fortschritt)",
"hueend": "Farbton-Ende (Playlist-Fortschritt)",
"hueatmo": "Farbton-Atmolight",
"satatmo": "Sättigung-Atmolight",
"dimmablestates": "Dimmbare Stufen",
"reverserotation": "Drehrichtung umkehren",
"offset": "Offset Start-LED"
Expand Down Expand Up @@ -219,6 +221,7 @@
"150": "Aktiviere FTP",
"151": "IP-Adresse ansagen",
"152": "Uhrzeit ansagen",
"153": "Ambient Light umschalten",
"0": "Lösche Zuordnung",
"170": "Play/Pause",
"171": "Vorheriger Titel",
Expand All @@ -239,7 +242,7 @@
}
}
},
"mqtt": {
"mqtt": {
"title": "MQTT-Einstellungen",
"enable": "MQTT aktivieren",
"clientId": {
Expand Down Expand Up @@ -344,7 +347,8 @@
"neopixel": {
"title": "Neopixel (Helligkeit)",
"restart": "Nach dem Einschalten",
"nightmode": "Im Nachtmodus"
"nightmode": "Im Nachtmodus",
"atmomode": "Im Atmolight-Modus"
},
"sleep": {
"title": "Deep Sleep",
Expand Down
6 changes: 5 additions & 1 deletion html/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
"offsetpause": "Center pause LEDs",
"huestart": "Hue-Start for playlist progress",
"hueend": "Hue-End for playlist progress",
"hueatmo": "Hue-Atmolight",
"satatmo": "Saturaion-Atmolight",
"dimmablestates": "Dimmable steps",
"reverserotation": "Reverse direction of rotation",
"offset": "Offset start LED"
Expand Down Expand Up @@ -219,6 +221,7 @@
"150": "Enable FTP",
"151": "Announce IP-Address",
"152": "Announce current time",
"153": "Toggle Ambient Light",
"0": "Remove assignment",
"170": "Toggle Play/Pause",
"171": "Previous track",
Expand Down Expand Up @@ -344,7 +347,8 @@
"neopixel": {
"title": "Neopixel (brightness)",
"restart": "After restart",
"nightmode": "For nightmode"
"nightmode": "For nightmode",
"atmomode": "For Atmolight-mode"
},
"sleep": {
"title": "Deep Sleep",
Expand Down
6 changes: 5 additions & 1 deletion html/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
"offsetpause": "LED pause centre",
"huestart": "Début de la couleur",
"hueend": "Fin de la couleur",
"hueatmo": "Couleur d'ambiance",
"satatmo": "Saturation d'ambiance",
"dimmablestates": "Étapes à gradation",
"reverserotation": "Inversion du sens de rotation",
"offset": "Début de l'offset LED"
Expand Down Expand Up @@ -219,6 +221,7 @@
"150": "Activer FTP",
"151": "Annoncer l'adresse IP",
"152": "Annoncer l'heure actuelle",
"153": "Basculement de la lumière ambiante",
"0": "Supprimer l'assignation",
"170": "Basculer Lecture/Pause",
"171": "Piste précédente",
Expand Down Expand Up @@ -344,7 +347,8 @@
"neopixel": {
"title": "Neopixel (luminosité)",
"restart": "Après le redémarrage",
"nightmode": "Pour le mode nuit"
"nightmode": "Pour le mode nuit",
"atmomode": "Pour le mode ambiance"
},
"sleep": {
"title": "Veille profonde",
Expand Down
141 changes: 89 additions & 52 deletions html/management.html

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ extra_scripts =
pre:updateSdkConfig.py
pre:processHtml.py
lib_deps =
https://github.com/schreibfaul1/ESP32-audioI2S.git#e008d56 ; v3.2.0 (15.05.2025)
https://github.com/schreibfaul1/ESP32-audioI2S.git#0443b0d ; v3.3.2
https://github.com/madhephaestus/ESP32Encoder.git#2c986e0
https://github.com/peterus/ESP-FTP-Server-Lib#554959f
https://github.com/FastLED/FastLED.git#3b63b17 ; v3.9.7
https://github.com/ESP32Async/ESPAsyncWebServer#1baee81 ; v3.7.7
https://github.com/peterus/ESP-FTP-Server-Lib.git#554959f
; https://github.com/FastLED/FastLED.git#971beb6 ; v3.10.0
https://github.com/Joe91/FastLED.git#82f7308 ; v3.10.0 + spi-workaround
https://github.com/ESP32Async/ESPAsyncWebServer.git#1baee81 ; v3.7.7
https://github.com/bblanchon/ArduinoJson.git#3252013 ; v7.4.1
https://github.com/pschatzmann/arduino-audio-tools.git#c19fbd6 ; v1.0.2
https://github.com/pschatzmann/ESP32-A2DP.git#8faaafa ; v1.8.7
Expand All @@ -43,7 +44,7 @@ lib_deps =
https://github.com/tueddy/rfid.git#caa3e6d ; avoid warnings, fork from https://github.com/miguelbalboa/rfid.git#0ff12a1
https://github.com/tuniii/LogRingBuffer.git#89d7d3e
https://github.com/tueddy/PN5180-Library.git#e6449a9 ;v2.3.5
https://github.com/SZenglein/Arduino-MAX17055_Driver#75cdfcf
https://github.com/SZenglein/Arduino-MAX17055_Driver.git#75cdfcf
https://github.com/tueddy/natsort.git#ebbf660 ; avoid warnings, fork from https://github.com/sourcefrog/natsort.git#cdd8df9

board_build.embed_txtfiles =
Expand Down
3 changes: 2 additions & 1 deletion sdkconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_AUTOSTART_ARDUINO=y
CONFIG_ARDUINO_EVENT_RUN_CORE0=y
CONFIG_ARDUINO_SERIAL_EVENT_RUN_CORE0=y
CONFIG_ARDUHAL_ESP_LOG=y
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y
Expand Down Expand Up @@ -78,7 +80,6 @@ CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
CONFIG_MBEDTLS_CAMELLIA_C=y
CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED=y
CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED=y
CONFIG_MQTT_USE_CORE_1=y
CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
Expand Down
Loading
Loading