update audio-lib and webserver, improve RFID-Task-Resume, pause LED-Task for upload again

Author: Joe91

platformio.ini

@@ -31,11 +31,11 @@ extra_scripts =
     pre:updateSdkConfig.py
     pre:processHtml.py
 lib_deps =
-	https://github.com/schreibfaul1/ESP32-audioI2S.git#f394a91 ; v3.3.2 + bugfix large files
+	https://github.com/schreibfaul1/ESP32-audioI2S.git#160b164 ; v3.4.0
 	https://github.com/madhephaestus/ESP32Encoder.git#2c986e0
 	https://github.com/peterus/ESP-FTP-Server-Lib.git#554959f
-	https://github.com/FastLED/FastLED.git#8abc9c6 ; v3.10.1+ fix of issue 16188
-	https://github.com/ESP32Async/ESPAsyncWebServer.git#f06bca1 ; v3.7.8
+	https://github.com/FastLED/FastLED.git#f5c78fd ; v3.10.1+ fix of issue 16188
+	https://github.com/ESP32Async/ESPAsyncWebServer.git#35ee69e ; v3.7.10
 	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

src/AudioPlayer.cpp

@@ -437,9 +437,9 @@ void AudioPlayer_Loop() {
 				gPlayProperties.currentRelPos = ((double) (audio->getFilePos() - audioDataStartPos - audio->inBufferFilled()) / (fileSize - audioDataStartPos)) * 100;
 			}
 		} else {
-			if (gPlayProperties.isWebstream && (audio->inBufferSize() > 0)) {
+			if (gPlayProperties.isWebstream && (audio->getInBufferSize() > 0)) {
 				// calc current fillbuffer percent for webstream with unknown size/end
-				gPlayProperties.currentRelPos = (double) (audio->inBufferFilled() / (double) audio->inBufferSize()) * 100;
+				gPlayProperties.currentRelPos = (double) (audio->inBufferFilled() / (double) audio->getInBufferSize()) * 100;
 			} else {
 				gPlayProperties.currentRelPos = 0;
 			}

src/Rfid.h

@@ -11,5 +11,6 @@ void Rfid_Cyclic(void);
 void Rfid_Exit(void);
 void Rfid_TaskPause(void);
 void Rfid_TaskResume(void);
+void Rfid_TaskReset(void);
 void Rfid_WakeupCheck(void);
 void Rfid_PreferenceLookupHandler(void);

src/RfidCommon.cpp

@@ -117,6 +117,7 @@ void Rfid_TaskPause(void) {
 }
 void Rfid_TaskResume(void) {
 #if defined(RFID_READER_ENABLED)
+	Rfid_TaskReset(); // Reset state machine to initial state
 	vTaskResume(rfidTaskHandle);
 #endif
 }

src/RfidMfrc522.cpp

@@ -64,6 +64,10 @@ void Rfid_Init(void) {
 	#endif
 }
 
+void Rfid_TaskReset(void) {
+	Rfid_LastRfidCheckTimestamp = millis();
+}
+
 void Rfid_Task(void *parameter) {
 	uint8_t control = 0x00;
 

src/RfidPn5180.cpp

@@ -43,6 +43,7 @@ extern TwoWire i2cBusTwo;
 #ifdef RFID_READER_TYPE_PN5180
 static void Rfid_Task(void *parameter);
 TaskHandle_t rfidTaskHandle;
+uint8_t stateMachine = RFID_PN5180_STATE_INIT;
 
 	#ifdef PN5180_ENABLE_LPCD
 void Rfid_EnableLpcd(void);
@@ -106,6 +107,10 @@ void Rfid_Cyclic(void) {
 	// Not necessary as cyclic stuff performed by task Rfid_Task()
 }
 
+void Rfid_TaskReset(void) {
+	stateMachine = RFID_PN5180_NFC14443_STATE_RESET;
+}
+
 void Rfid_Task(void *parameter) {
 	static PN5180ISO14443 nfc14443(RFID_CS, RFID_BUSY, RFID_RST);
 	static PN5180ISO15693 nfc15693(RFID_CS, RFID_BUSY, RFID_RST);
@@ -114,7 +119,6 @@ void Rfid_Task(void *parameter) {
 	byte lastValidcardId[cardIdSize];
 	bool cardAppliedCurrentRun = false;
 	bool cardAppliedLastRun = false;
-	uint8_t stateMachine = RFID_PN5180_STATE_INIT;
 	static byte cardId[cardIdSize], lastCardId[cardIdSize];
 	uint8_t uid[10];
 	bool showDisablePrivacyNotification = true;

src/Web.cpp

@@ -443,7 +443,7 @@ void webserverStart(void) {
 				if (!index) {
 					// pause some tasks to get more free CPU time for the upload
 					// Audio_TaskPause();
-					// Led_TaskPause();
+					Led_TaskPause();
 					Rfid_TaskPause();
 					Update.begin();
 					Log_Println(fwStart, LOGLEVEL_NOTICE);
@@ -455,7 +455,7 @@ void webserverStart(void) {
 				if (final) {
 					Update.end(true);
 					// resume the paused tasks
-					// Led_TaskResume();
+					Led_TaskResume();
 					// Audio_TaskResume();
 					Rfid_TaskResume();
 					Log_Println(fwEnd, LOGLEVEL_NOTICE);
@@ -1640,7 +1640,7 @@ void explorerHandleFileStorageTask(void *parameter) {
 
 	// pause some tasks to get more free CPU time for the upload
 	// Audio_TaskPause();
-	// Led_TaskPause();
+	Led_TaskPause();
 	Rfid_TaskPause();
 
 	for (;;) {
@@ -1677,7 +1677,7 @@ void explorerHandleFileStorageTask(void *parameter) {
 				Log_Println(webTxCanceled, LOGLEVEL_ERROR);
 				free(parameter);
 				// resume the paused tasks
-				// Led_TaskResume();
+				Led_TaskResume();
 				// Audio_TaskResume();
 				Rfid_TaskResume();
 				// destroy double buffer memory, since the upload was interrupted
@@ -1692,7 +1692,7 @@ void explorerHandleFileStorageTask(void *parameter) {
 	}
 	free(parameter);
 	// resume the paused tasks
-	// Led_TaskResume();
+	Led_TaskResume();
 	// Audio_TaskResume();
 	Rfid_TaskResume();
 	// send signal to upload function to terminate