Removal of support for non-PSRAM HALs + ESP32-A1S

.github/workflows/test-builds.yml

@@ -19,13 +19,8 @@ jobs:
     strategy:
       matrix:
         variant:
-          - esp32-a1s
-          - lolin32
-          - lolin_d32
           - lolin_d32_pro
           - lolin_d32_pro_sdmmc_pe
-          - nodemcu-32s
-          - az-delivery-devkit-v4
           - ttgo_t8
           - complete
 

README.md

@@ -43,11 +43,6 @@ signal of it: I did all my tests with
 [UDA1334](https://www.adafruit.com/product/3678),
 [MS6324](https://forum.espuino.de/t/kopfhoererplatine-basierend-auf-ms6324-und-tda1308/1099/) and
 [PCM5102a](https://github.com/biologist79/ESPuino/tree/master/PCBs/Headphone%20with%20PCM5102a%20and%20TDA1308).
-General advice: ESPuino makes use of library
-[ESP32-audioI2S](https://github.com/schreibfaul1/ESP32-audioI2S/); so everything that's supposed to
-work with this library should work with ESPuino, too (but maybe not right out-of-the-box).
-Especially this is true for
-[ES8388](https://github.com/schreibfaul1/ESP32-audioI2S/blob/master/examples/ESP32_ES8388/ESP32_ES8388.ino).
 
 ## Hardware setup
 
@@ -58,7 +53,6 @@ being the latest generation. Furthermore you need a ESP32-develboard like (or an
 pin compatible):
 
 - [D32 pro LiFePO4](https://forum.espuino.de/t/esp32-develboard-d32-pro-lifepo4/1109)
-- [E32 LiPo](https://forum.espuino.de/t/esp32-develboard-e32-lipo/1135)
 - [Wemos Lolin D32 pro](https://www.wemos.cc/en/latest/d32/d32_pro.html)
 
 > :warning: **Due to memory restrictions meanwhile it's mandatory to use ESP32 with
@@ -97,13 +91,12 @@ run ESPuino properly.
   lolin_d32_pro_sdmmc_pe).
 - Edit `src/settings.h` according your needs.
 - Edit board-specific (`HAL`) config-file (e.g. `settings-lolin_d32_pro_sdmmc_pe.h` for Lolin
-  D32/D32 pro). If you're running a board that is not listed there: start with `settings-custom.h`
+  D32 pro). If you're running a board that is not listed there: start with `settings-custom.h`
   and change it according your needs.
 - Connect your develboard via USB, click the alien-head icon in the left sidebar, choose the project
   task that matches your desired HAL and run `Upload and Monitor`. All libraries necessary are
   fetched automatically and compilation of the code gets started. After that, your ESP32 is flashed
-  with the firmware. Depending on your develboard it might be necessary to push a button in order to
-  allow ESP32 to enter flash mode (not necessary für Lolin32, D32 und D32 pro).
+  with the firmware.
 - Now have a look at the serial output at the bottom of Visual Studio Code's window. At the first
   run there might appear a few error messages (related to missing entries in NVS). Don't worry, this
   is just normal. However, make sure the SD card is detected as this is mandatory!

changelog.md

@@ -1,14 +1,11 @@
 # Changelog
 
-
 ## DEV-branch
 
+* 29.09.2024: Removal of support for non-PSRAM HALs (Lolin32, LolinD32, DevkitC) and ESP32-A1S
 * 29.09.2024: Prepare for Arduino 3.0.5
 * 27.09.2024: PlatformIO package 6.9.0
 
-
-
-
 ## Version 2.3 (23.09.2024)
 
 * 19.09.2024: Document the virtual cards in the UI #333, thanks to @caco3 !
@@ -25,8 +22,8 @@
 * 20.05.2024: PlatformIO package 6.7.0 (Arduino 2.0.16, ESP-IDF 4.4.7)
 * 20.05.2024: Disable bluetooth support for A1S (IRAM too small)
 * 09.05.2024: Upgrade to Bootstrap v5.0 + Web-UI Enhancements (#328), thanks to @caco3 !
-* 23.04.2024: Enhance UI minification (#323), thanks to @caco3 ! 
-* 22.04.2024: Added virtual RFID-Cards (#319), thanks to @caco3 ! 
+* 23.04.2024: Enhance UI minification (#323), thanks to @caco3 !
+* 22.04.2024: Added virtual RFID-Cards (#319), thanks to @caco3 !
 * 18.04.2024: Correct calculation of newFilePos for SEEK_POS_PERCENT, thanks to @sfields!
 * 18.04.2024: Correct calculation of gPlayProperties.currentRelPos, thanks to @sfields!
 * 18.04.2024: Get title from-VORBISCOMMENT and ID3, thanks to @sfields!
@@ -39,13 +36,13 @@
 * 28.03.2024: Fix some warnings with upcoming Arduino 3 (ESP-IDF v5.1)
 * 16.03.2024: Reduce memory usage by measurement of JSON payload length
 * 15.03.2024: MQTT receive: Bug fix and avoid payload copy (#309), thanks to @eikel
-* 15.03.2024: Add coverimage support for ogg, vorbis, opus (and some flac), thanks to @sfields ! 
+* 15.03.2024: Add coverimage support for ogg, vorbis, opus (and some flac), thanks to @sfields !
 * 19.02.2024: Add coverimage support for M4A files in Web-UI
-* 18.02.2024: Add coverimage support for flac files in Web-UI, thanks to @sfields ! 
-* 15.02.2024: Rework playlist generation (#275), thanks to @laszloh ! 
+* 18.02.2024: Add coverimage support for flac files in Web-UI, thanks to @sfields !
+* 15.02.2024: Rework playlist generation (#275), thanks to @laszloh !
 * 15.02.2024: Update sorting strings (#306), thanks to @freddy36 !
-* 15.02.2024: Set title and navbar heading to hostname (#305), thanks to @freddy36 ! 
-* 15.02.2024: Include mac address in info (#304), thanks to @freddy36 !  
+* 15.02.2024: Set title and navbar heading to hostname (#305), thanks to @freddy36 !
+* 15.02.2024: Include mac address in info (#304), thanks to @freddy36 !
 * 12.02.2024: Use natural sort (#296), thanks to @freddy36 !
 * 09.02.2024: Remove explorerCreateParentDirectories (#301), thanks to @freddy36 !
 * 08.02.2024: Remove convertFilenameToAscii (#298), Playlist fixes (#299), thanks to @freddy36 !
@@ -63,7 +60,6 @@
 * 21.01.2024: Build (tag 2.2) is broken when NEOPIXEL_ENABLE is not set #289, thanks to @RolinBert !
 * 21.01.2024: PN5180: Save about 500 Bytes of RAM
 
-
 ## Version 2.2 (17.01.2024)
 
 * 14.01.2024: Modify CMD_DIMM_LEDS_NIGHTMODE to toggle night light mode (#287), thanks to @laszloh !
@@ -76,31 +72,31 @@
 * 29.12.2023: /rfid endpoint: List all assigned nvs entries (#280)
 * 29.12.2023: Enhanced capabilities for task runtime debugging
 * 28.12.2023: Bugfix 1: DONT_ACCEPT_SAME_RFID_TWICE_ENABLE and web frontend, thanks to @sfields !
-* 28.12.2023: Add configuration for critical (shutoff) voltage in Web-UI, thanks to @SZenglein ! 
+* 28.12.2023: Add configuration for critical (shutoff) voltage in Web-UI, thanks to @SZenglein !
 * 28.12.2023: New official PlatformIO package 6.5.0 (Arduino 2.0.14, ESP-IDF 4.4.6)
 * 28.12.2023: Improve port expander handling (#283), thanks to @r-schmidt !
 * 23.12.2023: Update audio library, avoid waiting in i2s_channel_write() to have more time in other tasks #636
 * 22.12.2023: Web-UI: Preselection of root folder after load to avoid nasty warning when uploading files
-* 17.12.2023: Update audio library, fixes click-noise seeking in file 
-* 13.12.2023: Immediately go to sleep if battery is critical (#274), thanks to @SZenglein ! 
-* 12.12.2023: Long press behaviour, execute cmd directly after longpress-time (#279), thanks to @Joe91 ! 
+* 17.12.2023: Update audio library, fixes click-noise seeking in file
+* 13.12.2023: Immediately go to sleep if battery is critical (#274), thanks to @SZenglein !
+* 12.12.2023: Long press behaviour, execute cmd directly after longpress-time (#279), thanks to @Joe91 !
 * 12.12.2023: Fix false-positive error (Audio playback timeout)
 * 10.12.2023: Distribute vTaskDelay() in main loop to avoid rare audio dropouts
-* 10.12.2023: Fix wrong states on PE output pins (and SD-card failure on restart) #278, thanks to @36b6fp6s ! 
+* 10.12.2023: Fix wrong states on PE output pins (and SD-card failure on restart) #278, thanks to @36b6fp6s !
 * 09.12.2023: Fix webstream playlist abort when track fails (#276), thanks to @laszloh !
 * 07.12.2023: Show RC522 firmware version at startup, same as PN5180
 * 04.12.2023: fix stuttering sound with some WAV & MP3 files, thanks to @wolle !
 * 04.12.2023: change trackprogress communication from websocket to http to improve stability
-* 04.12.2023: Remove some convertAsciiToUtf8() #272 
+* 04.12.2023: Remove some convertAsciiToUtf8() #272
 * 30.11.2023: Fix a nullptr access after trying to replay an invalid filename (#271), thanks to Olaf!
 * 29.11.2023: Updated audio library to play more MP3s, faster track change & delivery of the cover image
 * 25.11.2023: Save some cpu time in audio task by only updating the playtime statistics every 250ms
-* 22.11.2023: Web-UI: Search for files feature #268 
+* 22.11.2023: Web-UI: Search for files feature #268
 * 21.11.2023: New command CMD_TOGGLE_MODE to switch Normal => BT-Sink => BT-Source
 * 21.11.2023: Bugfix: Some commands e.g. Play/Pause did not work in BT-Source mode
 * 21.11.2023: Faster pairing animation in BT-Source mode to better distinguish between the two BT modes
 * 19.11.2023: Give audiotask a higher task priority, fixes crackling sound
-* 19.11.2023: bugfix_same_rfid_twice init #262, see Github comments 
+* 19.11.2023: bugfix_same_rfid_twice init #262, see Github comments
 * 17.11.2023: Show track progress, current playtime & duration in web-ui (#267)
 * 16.11.2023: Fix delay with getLocalTime()
 * 14.11.2023: Multi Wlan improvements (#266), thanks to @laszloh !
@@ -109,7 +105,6 @@
 * 08.11.2023: Better logging for boards without PSRAM, fewer logs when compiling with NO_SDCARD
 * 07.11.2023: Set timezone after startup, thanks to @Joe91 !
 
-
 ## Version 2.1 (07.11.2023)
 
 * 04.11.2023: LPCD: wakeup check for ISO-14443 cards also with IRQ connected to port-expander

platformio.ini

@@ -68,36 +68,6 @@ build_unflags =
     -std=gnu++11
     -Werror=all
 
-[env:esp32-a1s]
-board = esp-wrover-kit
-lib_deps =
-    ${env.lib_deps}
-    https://github.com/kkloesener/AC101.git
-build_flags = ${env.build_flags}
-              -DHAL=2
-              -DBOARD_HAS_PSRAM
-              -mfix-esp32-psram-cache-issue
-              -DLOG_BUFFER_SIZE=10240
-board_upload.maximum_size = 16777216
-board_upload.flash_size = 16MB
-
-[env:lolin32]
-;https://docs.platformio.org/en/latest/boards/espressif32/lolin32.html
-board = lolin32
-build_flags = ${env.build_flags}
-              -DHAL=1
-
-[env:lolin_d32]
-;https://docs.platformio.org/en/latest/boards/espressif32/lolin_d32.html
-board = lolin_d32
-build_flags = ${env.build_flags}
-              -DHAL=3
-
-[env:lolin_d32_sdmmc_pe]
-;https://docs.platformio.org/en/latest/boards/espressif32/lolin_d32.html
-board = lolin_d32
-build_flags = ${env.build_flags}
-              -DHAL=9
 
 [env:lolin_d32_pro]
 ;https://docs.platformio.org/en/latest/boards/espressif32/lolin_d32_pro.html
@@ -125,16 +95,6 @@ build_flags = ${env.build_flags}
 board_upload.maximum_size = 16777216
 board_upload.flash_size = 16MB
 
-[env:nodemcu-32s]
-;https://docs.platformio.org/en/latest/boards/espressif32/nodemcu-32s.html
-board = nodemcu-32s
-
-[env:az-delivery-devkit-v4]
-;https://docs.platformio.org/en/latest/boards/espressif32/az-delivery-devkit-v4.html
-board = az-delivery-devkit-v4
-build_flags = ${env.build_flags}
-              -DHAL=8
-
 
 [env:ttgo_t8]
 ;https://docs.platformio.org/en/latest/boards/espressif32/esp-wrover-kit.html

src/main.cpp

@@ -58,12 +58,6 @@ uint32_t bootCount = 0;
 
 ////////////
 
-#if (HAL == 2)
-	#include "AC101.h"
-static TwoWire i2cBusOne = TwoWire(0);
-static AC101 ac(&i2cBusOne);
-#endif
-
 // I2C
 #ifdef I2C_2_ENABLE
 TwoWire i2cBusTwo = TwoWire(1);
@@ -161,21 +155,6 @@ void setup() {
 
 	Led_Init();
 
-// Only used for ESP32-A1S-Audiokit
-#if (HAL == 2)
-	i2cBusOne.begin(IIC_DATA, IIC_CLK, 40000);
-
-	while (not ac.begin()) {
-		Log_Println("AC101 Failed!", LOGLEVEL_ERROR);
-		delay(1000);
-	}
-	Log_Println("AC101 via I2C - OK!", LOGLEVEL_NOTICE);
-
-	pinMode(22, OUTPUT);
-	digitalWrite(22, HIGH);
-	ac.SetVolumeHeadphone(80);
-#endif
-
 	// Needs power first
 	SdCard_Init();