3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

Remove unused parameter of sendNfcData()

Browse Source 
Removes unused client parameter of the sendNfcData function.
This commit is contained in:
Jan Philipp Ecker
2025-08-02 23:05:56 +02:00
parent c450df59aa
commit 85a9bcf8bd
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nfc.cpp
View File

@@ -269,7 +269,7 @@ void writeJsonToTag(void *parameter) {
//pauseBambuMqttTask = true; //pauseBambuMqttTask = true;
// aktualisieren der Website wenn sich der Status ändert // aktualisieren der Website wenn sich der Status ändert
sendNfcData(nullptr); sendNfcData();
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);
oledShowMessage("Waiting for NFC-Tag"); oledShowMessage("Waiting for NFC-Tag");
@@ -311,7 +311,7 @@ void writeJsonToTag(void *parameter) {
vTaskDelay(1000 / portTICK_PERIOD_MS); vTaskDelay(1000 / portTICK_PERIOD_MS);
nfcReaderState = NFC_WRITE_SUCCESS; nfcReaderState = NFC_WRITE_SUCCESS;
// aktualisieren der Website wenn sich der Status ändert // aktualisieren der Website wenn sich der Status ändert
sendNfcData(nullptr); sendNfcData();
pauseBambuMqttTask = false; pauseBambuMqttTask = false;
if (updateSpoolTagId(uidString, payload)) { if (updateSpoolTagId(uidString, payload)) {
@@ -343,7 +343,7 @@ void writeJsonToTag(void *parameter) {
} }
sendWriteResult(nullptr, success); sendWriteResult(nullptr, success);
sendNfcData(nullptr); sendNfcData();
vTaskResume(RfidReaderTask); vTaskResume(RfidReaderTask);
pauseBambuMqttTask = false; pauseBambuMqttTask = false;
@@ -459,7 +459,7 @@ void scanRfidTask(void * parameter) {
} }
// aktualisieren der Website wenn sich der Status ändert // aktualisieren der Website wenn sich der Status ändert
sendNfcData(nullptr); sendNfcData();
} }
yield(); yield();
} }

6
src/website.cpp
View File

@@ -34,7 +34,7 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
Serial.println("Neuer Client verbunden!"); Serial.println("Neuer Client verbunden!");
// Sende die AMS-Daten an den neuen Client // Sende die AMS-Daten an den neuen Client
if (!bambuDisabled) sendAmsData(client); if (!bambuDisabled) sendAmsData(client);
sendNfcData(client); sendNfcData();
foundNfcTag(client, 0); foundNfcTag(client, 0);
sendWriteResult(client, 3); sendWriteResult(client, 3);
@@ -150,11 +150,11 @@ void sendWriteResult(AsyncWebSocketClient *client, uint8_t success) {
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) { void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) {
if (success == lastSuccess) return; if (success == lastSuccess) return;
ws.textAll("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(success) + "}}"); ws.textAll("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(success) + "}}");
sendNfcData(nullptr); sendNfcData();
lastSuccess = success; lastSuccess = success;
} }
void sendNfcData(AsyncWebSocketClient *client) { void sendNfcData() {
if (lastnfcReaderState == nfcReaderState) return; if (lastnfcReaderState == nfcReaderState) return;
// TBD: Why is there no status for reading the tag? // TBD: Why is there no status for reading the tag?
switch(nfcReaderState){ switch(nfcReaderState){

2
src/website.h
View File

@@ -24,7 +24,7 @@ void setupWebserver(AsyncWebServer &server);
// WebSocket-Funktionen // WebSocket-Funktionen
void sendAmsData(AsyncWebSocketClient *client); void sendAmsData(AsyncWebSocketClient *client);
void sendNfcData(AsyncWebSocketClient *client); void sendNfcData();
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success); void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);
void sendWriteResult(AsyncWebSocketClient *client, uint8_t success); void sendWriteResult(AsyncWebSocketClient *client, uint8_t success);