diff --git a/src/LogMessages_DE.cpp b/src/LogMessages_DE.cpp index 5dba278..994c419 100644 --- a/src/LogMessages_DE.cpp +++ b/src/LogMessages_DE.cpp @@ -51,6 +51,7 @@ const char trackChangeWebstream[] PROGMEM = "Im Webradio-Modus kann nicht an den Anfang gesprungen werden."; const char endOfPlaylistReached[] PROGMEM = "Ende der Playlist erreicht."; const char trackStartatPos[] PROGMEM = "Titel wird abgespielt ab Position"; + const char waitingForTaskQueues[] PROGMEM = "Task Queue für RFID existiert noch nicht, warte..."; const char rfidScannerReady[] PROGMEM = "RFID-Tags koennen jetzt gescannt werden..."; const char rfidTagDetected[] PROGMEM = "RFID-Karte erkannt: "; const char rfid15693TagDetected[] PROGMEM = "RFID-Karte (ISO-15693) erkannt: "; diff --git a/src/LogMessages_EN.cpp b/src/LogMessages_EN.cpp index ef7182f..ee180bb 100644 --- a/src/LogMessages_EN.cpp +++ b/src/LogMessages_EN.cpp @@ -51,6 +51,7 @@ const char trackChangeWebstream[] PROGMEM = "Playing from the very beginning is not possible while webradio-mode is active."; const char endOfPlaylistReached[] PROGMEM = "Reached end of playlist."; const char trackStartatPos[] PROGMEM = "Starting track at position"; + const char waitingForTaskQueues[] PROGMEM = "Task Queue for RFID does not exist yet, waiting..."; const char rfidScannerReady[] PROGMEM = "RFID-tags can now be applied..."; const char rfidTagDetected[] PROGMEM = "RFID-tag detected: "; const char rfid15693TagDetected[] PROGMEM = "RFID-ta (ISO-15693) detected: "; diff --git a/src/RfidPn5180.cpp b/src/RfidPn5180.cpp index 3d79089..eab8f24 100644 --- a/src/RfidPn5180.cpp +++ b/src/RfidPn5180.cpp @@ -95,6 +95,12 @@ extern unsigned long Rfid_LastRfidCheckTimestamp; static byte cardId[cardIdSize], lastCardId[cardIdSize]; uint8_t uid[10]; + // wait until queues are created + while(gRfidCardQueue == NULL){ + Log_Println((char *) FPSTR(waitingForTaskQueues), LOGLEVEL_DEBUG); + vTaskDelay(50); + } + for (;;) { vTaskDelay(portTICK_RATE_MS * 10u); #ifdef PN5180_ENABLE_LPCD diff --git a/src/Web.cpp b/src/Web.cpp index e2d41ba..6a168ad 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -547,7 +547,7 @@ void onWebsocketEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsE //client connected Serial.printf("ws[%s][%u] connect\n", server->url(), client->id()); //client->printf("Hello Client %u :)", client->id()); - client->ping(); + //client->ping(); } else if (type == WS_EVT_DISCONNECT) { //client disconnected Serial.printf("ws[%s][%u] disconnect\n", server->url(), client->id()); diff --git a/src/logmessages.h b/src/logmessages.h index ffec709..728f1de 100644 --- a/src/logmessages.h +++ b/src/logmessages.h @@ -47,6 +47,7 @@ extern const char trackStart[]; extern const char trackChangeWebstream[]; extern const char endOfPlaylistReached[]; extern const char trackStartatPos[]; +extern const char waitingForTaskQueues[]; extern const char rfidScannerReady[]; extern const char rfidTagDetected[]; extern const char rfid15693TagDetected[]; diff --git a/src/main.cpp b/src/main.cpp index b90b41b..01cd8ea 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -128,6 +128,7 @@ void printWakeUpReason() { void setup() { Log_Init(); + Queues_Init(); #ifdef RFID_READER_TYPE_PN5180 Rfid_Init(); #endif @@ -210,7 +211,6 @@ void setup() { Serial.println(F("UNKNOWN")); } - Queues_Init(); #ifdef PORT_EXPANDER_ENABLE Port_Init(); #endif