From 09f4c43f8941421344a7821295087696304fbf83 Mon Sep 17 00:00:00 2001
From: Jan Philipp Ecker <info@jan-ecker.eu>
Date: Tue, 5 Aug 2025 19:43:05 +0200
Subject: [PATCH] Fixes types and some issues in the new graphics

Fixes further issues with the new graphics. Fixes some typos. Adds progress bar for upgrade process.
---
 src/api.cpp   |  6 +-----
 src/nfc.cpp   | 17 +++++------------
 src/ota.cpp   |  2 +-
 src/scale.cpp |  2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/api.cpp b/src/api.cpp
index 9bba672..4b65f4b 100644
--- a/src/api.cpp
+++ b/src/api.cpp
@@ -154,9 +154,6 @@ void sendToApi(void *parameter) {
                 remainingWeight = 0;
                 break;
             }
-            
-            // TBD: really required?
-            vTaskDelay(3000 / portTICK_PERIOD_MS);
         }
         doc.clear();
     } else {
@@ -170,8 +167,7 @@ void sendToApi(void *parameter) {
             oledShowProgressBar(1, 1, "Failure!", "Octoprint update");
             break;
         case API_REQUEST_BAMBU_UPDATE:
-            // TBD: rework error
-            oledShowMessage("Spoolman update failed");
+            oledShowProgressBar(1, 1, "Failure!", "Bambu update");
             break;
         }
         Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));
diff --git a/src/nfc.cpp b/src/nfc.cpp
index 1638328..fe1a486 100644
--- a/src/nfc.cpp
+++ b/src/nfc.cpp
@@ -258,9 +258,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
       {
         Serial.println("Keine SPOOL-ID gefunden.");
         activeSpoolId = "";
-        // TBD: this path has not been tested!
-        oledShowMessage("Unknown Spool");
-        vTaskDelay(2000 / portTICK_PERIOD_MS);
+        oledShowProgressBar(1, 1, "Failure", "Unkown tag");
       }
     }else{
       oledShowProgressBar(octoEnabled?5:4, octoEnabled?5:4, "Failure!", "Spoolman unavailable");
@@ -314,9 +312,6 @@ void writeJsonToTag(void *parameter) {
       Serial.println("CP 3.2");
     }
 
-    //TBD: Is this required?
-    //if (i == 0) oledShowMessage("Waiting for NFC-Tag");
-
     yield();
     esp_task_wdt_reset();
     vTaskDelay(pdMS_TO_TICKS(1));
@@ -468,7 +463,7 @@ void scanRfidTask(void * parameter) {
 
             if (!decodeNdefAndReturnJson(data)) 
             {
-              oledShowProgressBar(1, 1, "Failure", "Unkown Tag");
+              oledShowProgressBar(1, 1, "Failure", "Unknown tag");
               nfcReaderState = NFC_READ_ERROR;
             }
             else 
@@ -480,13 +475,14 @@ void scanRfidTask(void * parameter) {
           }
           else
           {
-            oledShowProgressBar(1, 1, "Failure", "Tag Read Error");
+            oledShowProgressBar(1, 1, "Failure", "Tag read error");
             nfcReaderState = NFC_READ_ERROR;
           }
         }
         else
         {
           //TBD: Show error here?!
+          oledShowProgressBar(1, 1, "Failure", "Unkown tag type");
           Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
         }
       }
@@ -515,11 +511,8 @@ void startNfc() {
   unsigned long versiondata = nfc.getFirmwareVersion();  // Lese Versionsnummer der Firmware aus
   if (! versiondata) {                                   // Wenn keine Antwort kommt
     Serial.println("Kann kein RFID Board finden !");            // Sende Text "Kann kein..." an seriellen Monitor
-    //delay(5000);
-    //ESP.restart();
-    //TBD: rework this
     oledShowMessage("No RFID Board found");
-    delay(2000);
+    vTaskDelay(2000 / portTICK_PERIOD_MS);
   }
   else {
     Serial.print("Chip PN5 gefunden"); Serial.println((versiondata >> 24) & 0xFF, HEX); // Sende Text und Versionsinfos an seriellen
diff --git a/src/ota.cpp b/src/ota.cpp
index d22bc6a..a98b949 100644
--- a/src/ota.cpp
+++ b/src/ota.cpp
@@ -224,7 +224,7 @@ void handleUpdate(AsyncWebServer &server) {
             static int lastProgress = -1;
             if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
                 sendUpdateProgress(currentProgress, "uploading");
-                oledShowMessage("Update: " + String(currentProgress) + "%");
+                oledShowProgressBar(currentProgress, 100, "Update", "Download");
                 vTaskDelay(50 / portTICK_PERIOD_MS);
                 lastProgress = currentProgress;
             }
diff --git a/src/scale.cpp b/src/scale.cpp
index 994601f..4be30c7 100644
--- a/src/scale.cpp
+++ b/src/scale.cpp
@@ -234,7 +234,7 @@ uint8_t calibrate_scale() {
     {
       Serial.println("Calibration value is invalid. Please recalibrate.");
 
-      oledShowMessage("Calibration ERROR Try again");
+      oledShowProgressBar(3, 3, "Failure", "Calibration error");
 
       for (uint16_t i = 0; i < 50000; i++) {
         yield();