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.
This commit is contained in:
Jan Philipp Ecker
2025-08-05 19:43:05 +02:00
parent ec0e544f30
commit 09f4c43f89
4 changed files with 8 additions and 19 deletions

View File

@@ -154,9 +154,6 @@ void sendToApi(void *parameter) {
remainingWeight = 0; remainingWeight = 0;
break; break;
} }
// TBD: really required?
vTaskDelay(3000 / portTICK_PERIOD_MS);
} }
doc.clear(); doc.clear();
} else { } else {
@@ -170,8 +167,7 @@ void sendToApi(void *parameter) {
oledShowProgressBar(1, 1, "Failure!", "Octoprint update"); oledShowProgressBar(1, 1, "Failure!", "Octoprint update");
break; break;
case API_REQUEST_BAMBU_UPDATE: case API_REQUEST_BAMBU_UPDATE:
// TBD: rework error oledShowProgressBar(1, 1, "Failure!", "Bambu update");
oledShowMessage("Spoolman update failed");
break; break;
} }
Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode)); Serial.println("Fehler beim Senden an Spoolman! HTTP Code: " + String(httpCode));

View File

@@ -258,9 +258,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage) {
{ {
Serial.println("Keine SPOOL-ID gefunden."); Serial.println("Keine SPOOL-ID gefunden.");
activeSpoolId = ""; activeSpoolId = "";
// TBD: this path has not been tested! oledShowProgressBar(1, 1, "Failure", "Unkown tag");
oledShowMessage("Unknown Spool");
vTaskDelay(2000 / portTICK_PERIOD_MS);
} }
}else{ }else{
oledShowProgressBar(octoEnabled?5:4, octoEnabled?5:4, "Failure!", "Spoolman unavailable"); oledShowProgressBar(octoEnabled?5:4, octoEnabled?5:4, "Failure!", "Spoolman unavailable");
@@ -314,9 +312,6 @@ void writeJsonToTag(void *parameter) {
Serial.println("CP 3.2"); Serial.println("CP 3.2");
} }
//TBD: Is this required?
//if (i == 0) oledShowMessage("Waiting for NFC-Tag");
yield(); yield();
esp_task_wdt_reset(); esp_task_wdt_reset();
vTaskDelay(pdMS_TO_TICKS(1)); vTaskDelay(pdMS_TO_TICKS(1));
@@ -468,7 +463,7 @@ void scanRfidTask(void * parameter) {
if (!decodeNdefAndReturnJson(data)) if (!decodeNdefAndReturnJson(data))
{ {
oledShowProgressBar(1, 1, "Failure", "Unkown Tag"); oledShowProgressBar(1, 1, "Failure", "Unknown tag");
nfcReaderState = NFC_READ_ERROR; nfcReaderState = NFC_READ_ERROR;
} }
else else
@@ -480,13 +475,14 @@ void scanRfidTask(void * parameter) {
} }
else else
{ {
oledShowProgressBar(1, 1, "Failure", "Tag Read Error"); oledShowProgressBar(1, 1, "Failure", "Tag read error");
nfcReaderState = NFC_READ_ERROR; nfcReaderState = NFC_READ_ERROR;
} }
} }
else else
{ {
//TBD: Show error here?! //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)!"); 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 unsigned long versiondata = nfc.getFirmwareVersion(); // Lese Versionsnummer der Firmware aus
if (! versiondata) { // Wenn keine Antwort kommt if (! versiondata) { // Wenn keine Antwort kommt
Serial.println("Kann kein RFID Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor 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"); oledShowMessage("No RFID Board found");
delay(2000); vTaskDelay(2000 / portTICK_PERIOD_MS);
} }
else { else {
Serial.print("Chip PN5 gefunden"); Serial.println((versiondata >> 24) & 0xFF, HEX); // Sende Text und Versionsinfos an seriellen Serial.print("Chip PN5 gefunden"); Serial.println((versiondata >> 24) & 0xFF, HEX); // Sende Text und Versionsinfos an seriellen

View File

@@ -224,7 +224,7 @@ void handleUpdate(AsyncWebServer &server) {
static int lastProgress = -1; static int lastProgress = -1;
if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) { if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
sendUpdateProgress(currentProgress, "uploading"); sendUpdateProgress(currentProgress, "uploading");
oledShowMessage("Update: " + String(currentProgress) + "%"); oledShowProgressBar(currentProgress, 100, "Update", "Download");
vTaskDelay(50 / portTICK_PERIOD_MS); vTaskDelay(50 / portTICK_PERIOD_MS);
lastProgress = currentProgress; lastProgress = currentProgress;
} }

View File

@@ -234,7 +234,7 @@ uint8_t calibrate_scale() {
{ {
Serial.println("Calibration value is invalid. Please recalibrate."); 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++) { for (uint16_t i = 0; i < 50000; i++) {
yield(); yield();