Compare commits

..
7 Commits
12 changed files with 251 additions and 71 deletions

No files matched your search

@@ -0,0 +1,9 @@
# Dokumentations-Regeln für Code-Projekte
## Handbuch und Dokumentation
Achte bitte darauf, dass du mit der aktualisierung von openmemory auch die Dokumentation und Endanwender-Handbuch
mit aktualisierst, wenn es neue Funktionen für Nutzer gibt.
- path for documentation and user manual: ~/dev/FilaMan/FilaMan-System-docu/
## Readme
Halte bitte außerdem auch die Readme Files im Repo aktuell.
+5
View File
@@ -0,0 +1,5 @@
# Nutzung von MCP Servern
### Nutze bitte möglichst immer die bereitgestellten MCP Server.
- Um die Codebasis zu erforschen, nutze jcodemunch-mcp
- Für Coding an sich, nutze context7
@@ -0,0 +1,44 @@
**# OpenMemory Rules for Code Projects**
- Use the OpenMemory/Memory tools whenever possible to store and retrieve important project knowledge.
- search openmemory before you inspect folders and files
- Goal: decisions, code changes, and bug fixes should be saved in a way that they can be reused in new sessions.
**## When Something Should Be Stored**
- **After every major code change**
- Create a brief memory note with:
- Affected files/modules
- What was changed?
- Why was it changed? (goal / requirements)
- Potential risks or TODOs
- **For every decision** (API design, architecture, important trade‑offs)
- Create a memory note of type “Decision” with:
- Context / problem
- Considered options
- Chosen option
- Justification
- **For every bug fix**
- Create a memory note of type “Bugfix” with:
- Symptom / error picture (e.g., error message)
- Cause
- Fix (which files/lines)
- What to note for the future
**## How Memories Should Be Structured**
- Use consistent project tags, e.g., `project:my-project`.
- Use type tags like `type:decision`, `type:change`, `type:bugfix`.
- If possible, link commits or exact file paths / line numbers in the note.
**## Usage in New Sessions or Tasks**
- At the start of a new session or task:
- Load the most important OpenMemory entries for the current project (e.g., last decisions, relevant bug fixes).
- Create a short overview for yourself before new suggestions are made.
- If a new error occurs:
- First check OpenMemory for previous similar errors, relevant changes or decisions before re‑analyzing the code or making a new decision.
**# Git Rules**
- **NEVER** push independently to a git repository/branch!
+14
View File
@@ -0,0 +1,14 @@
# rules for the FilaMan project
## path
- path for project: ~/dev/FilaMan/FilaMan-System-opencode
- path for project documentation and user manuel: ~/dev/FilaMan/FilaMan-System-docu
- path for Bambulab Local-Communication Plugin: ~/dev/FilaMan/FilaMan-BambuLab-Plugin
- path for BambuLab Cloud-Communication Plugin: ~/dev/FilaMan/FilaMan-BambuLabCloud-Plugin
- path for SpoolmanDB Impoft Plugin: ~/Users/manuel~/dev/FilaMan/FilaMan-SpoolmanDB-Plugin
- path for SpoolmanAPI Plugin: ~/Users/manuel~/dev/FilaMan/FilaMan-SpoolmanAPI-Plugin
## User Version Info: changelog.json
- File: frontend/src/changelog.json
- Inhalt: eine Userfreundeliche Information über Neuerungen, Änderungen oder Entfernte Funktionen für den User. Keine technischen Details oder ähnliches, Kurz und pregnant.
- Als Platzhalter für die Version wird "UNRELEASED" genutzt. Dieser wird beim bump im Workflow ersetzt.
+5
View File
@@ -0,0 +1,5 @@
# Agent rules
- sprich IMMER auf Deutsch mit mir!
- Please checkt .opencode/instructions/ for the project rules
- you have never to push to git by urself!
+2 -2
View File
@@ -92,9 +92,9 @@
.then(response => response.json())
.then(data => {
if (data.success) {
statusMessage.textContent = 'Registration successful! Rebooting...';
statusMessage.textContent = 'Registration successful!';
statusMessage.style.color = 'var(--success-text)';
setTimeout(() => fetch('/reboot'), 2000);
setTimeout(() => location.reload(), 2000);
} else {
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
statusMessage.style.color = 'var(--error-text)';
+1 -1
View File
@@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.2.3"
version = "3.2.4"
to_old_version = "3.0.9"
##
+5 -4
View File
@@ -8,6 +8,7 @@
#include "nfc.h"
#include "config.h"
#include <WiFi.h>
#include "display.h"
volatile filamanApiStateType filamanApiState = API_IDLE;
bool filamanConnected = false;
@@ -122,19 +123,19 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
DeserializationError error = deserializeJson(responseDoc, response);
if (!error && responseDoc["remaining_weight_g"].is<float>()) {
int remaining = (int)responseDoc["remaining_weight_g"].as<float>();
pauseMainTask = 1;
oledShowRemainingWeight(remaining);
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
pauseMainTask = 0;
oledClearPriority();
}
http.end();
return true;
}
else {
pauseMainTask = 1;
oledShowProgressBar(1, 1, "Failure", "API Error");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
pauseMainTask = 0;
oledClearPriority();
}
http.end();
+43 -18
View File
@@ -3,12 +3,49 @@
#include <vector>
#include "icons.h"
#include "main.h"
#include <cstring>
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
bool wifiOn = false;
bool iconToggle = false;
// Display priority management
static DisplayPriority currentPriority = DISPLAY_PRIORITY_NONE;
static unsigned long prioritySetTime = 0;
static unsigned long priorityMinDuration = 0;
bool oledCanUpdate(DisplayPriority newPriority) {
if (currentPriority == DISPLAY_PRIORITY_NONE) return true;
// Higher priority can always preempt
if (newPriority > currentPriority) return true;
// Same or lower priority: only if minimum duration has elapsed
unsigned long elapsed = millis() - prioritySetTime;
return elapsed >= priorityMinDuration;
}
void oledSetPriority(DisplayPriority priority, unsigned long minDurationMs) {
currentPriority = priority;
prioritySetTime = millis();
priorityMinDuration = minDurationMs;
}
void oledClearPriority() {
currentPriority = DISPLAY_PRIORITY_NONE;
prioritySetTime = 0;
priorityMinDuration = 0;
}
DisplayPriority oledGetCurrentPriority() {
// Auto-expire: if min duration has passed, priority is effectively NONE
if (currentPriority != DISPLAY_PRIORITY_NONE) {
unsigned long elapsed = millis() - prioritySetTime;
if (elapsed >= priorityMinDuration) {
currentPriority = DISPLAY_PRIORITY_NONE;
}
}
return currentPriority;
}
void setupDisplay() {
if (!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
Serial.println(F("SSD1306 allocation failed"));
@@ -23,23 +60,11 @@ void setupDisplay() {
}
void oledclearline() {
int x, y;
for (y = 0; y < 16; y++) {
for (x = 0; x < SCREEN_WIDTH; x++) {
display.drawPixel(x, y, BLACK);
}
}
//display.display();
display.fillRect(0, 0, SCREEN_WIDTH, 16, BLACK);
}
void oledcleardata() {
int x, y;
for (y = OLED_DATA_START; y < OLED_DATA_END; y++) {
for (x = 0; x < SCREEN_WIDTH; x++) {
display.drawPixel(x, y, BLACK);
}
}
//display.display();
display.fillRect(0, OLED_DATA_START, SCREEN_WIDTH, OLED_DATA_END - OLED_DATA_START, BLACK);
}
int oled_center_h(const String &text) {
@@ -207,16 +232,16 @@ void oledShowIcon(const char* icon) {
uint16_t iconSize = OLED_DATA_END-OLED_DATA_START;
uint16_t iconStart = (SCREEN_WIDTH - iconSize) / 2;
if (icon == "failed") {
if (strcmp(icon, "failed") == 0) {
display.drawBitmap(iconStart, OLED_DATA_START, icon_failed , iconSize, iconSize, WHITE);
}
else if (icon == "success") {
else if (strcmp(icon, "success") == 0) {
display.drawBitmap(iconStart, OLED_DATA_START, icon_success , iconSize, iconSize, WHITE);
}
else if (icon == "transfer") {
else if (strcmp(icon, "transfer") == 0) {
display.drawBitmap(iconStart, OLED_DATA_START, icon_transfer , iconSize, iconSize, WHITE);
}
else if (icon == "loading") {
else if (strcmp(icon, "loading") == 0) {
display.drawBitmap(iconStart, OLED_DATA_START, icon_loading , iconSize, iconSize, WHITE);
}
+14
View File
@@ -6,10 +6,24 @@
#include <Adafruit_SSD1306.h>
#include "config.h"
// Display message priority levels (higher = more important)
enum DisplayPriority : uint8_t {
DISPLAY_PRIORITY_NONE = 0, // No message active
DISPLAY_PRIORITY_STATUS = 1, // Weight display, idle info
DISPLAY_PRIORITY_INFO = 2, // Progress bars, boot messages
DISPLAY_PRIORITY_ACTION = 3, // NFC feedback, user actions
DISPLAY_PRIORITY_WARNING = 4 // Errors, connection issues
};
extern Adafruit_SSD1306 display;
extern bool wifiOn;
// Display priority management
bool oledCanUpdate(DisplayPriority newPriority);
void oledSetPriority(DisplayPriority priority, unsigned long minDurationMs);
void oledClearPriority();
DisplayPriority oledGetCurrentPriority();
void setupDisplay();
void oledclearline();
void oledcleardata();
+23 -31
View File
@@ -100,42 +100,24 @@ const unsigned long debounceDelay = 500; // 500 ms debounce delay
unsigned long lastConnErrorShowTime = 0;
const unsigned long connErrorShowInterval = 10000; // Show connection error every 10 seconds if exists
bool showingConnError = false;
unsigned long connErrorStartTime = 0;
const unsigned long connErrorDisplayDuration = 3000;
// ##### PROGRAM START #####
void loop() {
unsigned long currentMillis = millis();
// Handle connection errors (not registered or not connected)
if (!showingConnError && intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
if (!filamanRegistered) {
if (intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
if (!filamanRegistered && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
oledShowConnectionError("Not Registered", WiFi.localIP().toString());
showingConnError = true;
connErrorStartTime = currentMillis;
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
mainTaskWasPaused = true;
} else if (!filamanConnected) {
} else if (!filamanConnected && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
oledShowConnectionError("API Connection Lost", WiFi.localIP().toString());
showingConnError = true;
connErrorStartTime = currentMillis;
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
mainTaskWasPaused = true;
}
}
// Clear connection error after duration
if (showingConnError && currentMillis - connErrorStartTime >= connErrorDisplayDuration) {
showingConnError = false;
// Force UI refresh next cycle
lastTopRowUpdateTime = 0;
}
// Skip the rest of the loop while showing error to avoid UI overwriting
if (showingConnError) {
esp_task_wdt_reset();
return;
}
// Überprüfe den Status des Touch Sensors
if (touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
{
@@ -175,14 +157,15 @@ void loop() {
else
{
// Ausgabe der Waage auf Display
// Block weight display during NFC write operations
if(pauseMainTask == 0 && !nfcWriteInProgress)
// Block weight display during NFC write operations and higher-priority display messages
if(pauseMainTask == 0 && !nfcWriteInProgress && oledCanUpdate(DISPLAY_PRIORITY_STATUS))
{
// Use filtered weight for smooth display, but still check API weight for significant changes
int16_t displayWeight = getFilteredDisplayWeight();
if (mainTaskWasPaused || (weight != lastWeight && (nfcReaderState == NFC_IDLE || tagProcessed)))
{
(displayWeight < 2) ? ((displayWeight < -2) ? oledDisplayText("!! -0") : oledShowWeight(0)) : oledShowWeight(displayWeight);
oledSetPriority(DISPLAY_PRIORITY_STATUS, 0); // Weight can always be overwritten
}
mainTaskWasPaused = false;
}
@@ -201,18 +184,27 @@ void loop() {
if (abs(weight - lastWeight) <= 2 && weight > 5)
{
weightCounterToApi++;
// Show stable weight feedback when approaching send threshold
if (weightCounterToApi == 3 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
oledShowProgressBar(2, 4, "Spool Tag", "Weight stable");
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
}
}
else
{
// Show visual feedback when tag is present and weight is unstable
if (weightCounterToApi > 0 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
oledShowProgressBar(1, 4, "Spool Tag", "Weighing...");
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
}
weightCounterToApi = 0;
weightSend = 0;
}
}
lastWeight = weight;
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist, an FilaMan senden
if (weightCounterToApi > 1 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
if (weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
{
tagProcessed = true;
@@ -229,8 +221,8 @@ void loop() {
weightSend = 1;
// Feedback to user
pauseMainTask = 1;
oledShowProgressBar(3, 4, "Spool Tag", "Sending...");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
}
// Handle successful tag write
@@ -246,14 +238,14 @@ void loop() {
Serial.println("Weight queued for FilaMan after spool tag write");
// Feedback to user
pauseMainTask = 1;
oledShowProgressBar(3, 4, "Tag written", "Sending...");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
} else {
// Location tag written - no weight to send
Serial.println("Location tag written successfully - no weight send needed");
}
}
}
}
esp_task_wdt_reset();
}
+86 -15
View File
@@ -499,7 +499,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println();
oledDisplayText("Tag zu klein für Payload");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -541,7 +543,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
} else {
Serial.println("❌ PN532 Kommunikation fehlgeschlagen");
oledDisplayText("NFC Reset failed");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -575,7 +579,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!tagRedetected) {
Serial.println("❌ Tag konnte nach Reset nicht wiedererkannt werden");
oledDisplayText("Tag lost after reset");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -593,7 +599,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!ccReadable) {
Serial.println("❌ NFC-Interface funktioniert nach Reset immer noch nicht");
oledDisplayText("NFC still broken");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -646,7 +654,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
Serial.println("❌ KRITISCHER FEHLER: Grundlegende NDEF-Seiten nicht lesbar!");
Serial.println("Tag oder Interface ist defekt");
oledDisplayText("Tag/Interface defect");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -667,7 +677,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!nfc.ntag2xx_ReadPage(10, originalPage)) {
Serial.println("FEHLER: Kann Testseite nicht lesen für Backup");
oledDisplayText("Test page read error");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -698,14 +710,17 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!tagStillPresent) {
Serial.println("URSACHE: Tag wurde während Schreibtest entfernt!");
oledDisplayText("Tag removed");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
} else {
Serial.println("URSACHE: Tag ist vorhanden aber nicht beschreibbar");
Serial.println("Möglicherweise: Schreibschutz, Defekt, oder Interface-Problem");
oledDisplayText("Tag write protected?");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
}
Serial.println("==========================================");
vTaskDelay(pdMS_TO_TICKS(3000));
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -717,7 +732,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!nfc.ntag2xx_ReadPage(10, readBack)) {
Serial.println("FEHLER: Kann Testdaten nicht zurücklesen!");
oledDisplayText("Test verify failed");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -762,7 +779,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!initializeNdefStructure()) {
Serial.println("FEHLER: Konnte NDEF-Struktur nicht initialisieren!");
oledDisplayText("NDEF init failed");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
return 0;
}
@@ -818,7 +837,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (!interfaceStable) {
Serial.println("FEHLER: NFC-Interface ist nicht stabil genug für Schreibvorgang");
oledDisplayText("NFC Interface unstable");
vTaskDelay(pdMS_TO_TICKS(3000));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
vTaskDelay(pdMS_TO_TICKS(3000));
oledClearPriority();
return 0;
}
@@ -831,7 +852,9 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
if (tlvData == NULL) {
Serial.println("Fehler: Nicht genug Speicher für TLV-Daten vorhanden.");
oledDisplayText("Memory error");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
return 0;
}
@@ -1100,6 +1123,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
oledShowProgressBar(1, 4, "Reading", "Decoding data");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Debug: Print first 32 bytes of the raw data
Serial.println("Raw NDEF data (first 32 bytes):");
@@ -1293,6 +1317,7 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
{
oledShowProgressBar(2, 4, "Spool Tag", "Weighing");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
activeSpoolId = doc["sm_id"].as<String>();
lastSpoolId = activeSpoolId;
}
@@ -1303,15 +1328,29 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
int locId = doc["location_id"].as<int>();
int sId = lastSpoolId.toInt();
sendLocationAsync(sId, "", locId, "");
// Display feedback - location was set
oledShowProgressBar(1, 1, "Location", "Standort gesetzt");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
// Clear lastSpoolId to prevent accidental re-assignment
lastSpoolId = "";
// Mark as processed so main.cpp doesn't try to send weight
tagProcessed = true;
activeSpoolId = "";
Serial.println("Location set - lastSpoolId cleared to prevent re-assignment");
}
else
{
Serial.println("Unbekannter Tag-Inhalt.");
activeSpoolId = "";
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
}
} else {
oledShowProgressBar(4, 4, "Failure!", "API offline");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
}
}
@@ -1521,6 +1560,7 @@ bool quickSpoolIdCheck(String uidString) {
}
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
@@ -1576,6 +1616,7 @@ bool quickSpoolIdCheck(String uidString) {
}
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
@@ -1621,14 +1662,16 @@ void writeJsonToTag(void *parameter) {
sendNfcData();
vTaskDelay(pdMS_TO_TICKS(100));
// Show waiting message for tag detection
oledShowProgressBar(0, 1, "Write Tag", "Warte auf Tag");
// Show initial waiting message with countdown
oledShowProgressBar(0, 30, "Write Tag", "Warte... 30s");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Wait up to 30 seconds for tag
uint8_t success = 0;
String uidString = "";
uint8_t uidLength = 0;
unsigned long startTime = millis();
uint8_t lastSecondsShown = 30;
while (millis() - startTime < 30000) {
uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 }; // Buffer to store the returned UID
@@ -1636,6 +1679,17 @@ void writeJsonToTag(void *parameter) {
yield();
esp_task_wdt_reset();
// Update countdown display every second
unsigned long elapsed = millis() - startTime;
uint8_t remainingSeconds = (30000 - elapsed) / 1000;
if (remainingSeconds != lastSecondsShown) {
lastSecondsShown = remainingSeconds;
char countdownText[20];
snprintf(countdownText, sizeof(countdownText), "Warte... %ds", remainingSeconds);
oledShowProgressBar(elapsed / 1000, 30, "Write Tag", countdownText);
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
}
success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400);
if (success) {
@@ -1662,6 +1716,7 @@ void writeJsonToTag(void *parameter) {
if (uidLength != 7) {
Serial.println("Bambu Lab tag detected during write - skipping write, sending result with weight");
oledShowProgressBar(1, 1, "Write Tag", "Done!");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Send success to API with tag_uuid and current weight
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "", weight);
@@ -1677,6 +1732,7 @@ void writeJsonToTag(void *parameter) {
}
oledShowProgressBar(1, 3, "Write Tag", "Writing");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Schreibe die NDEF-Message auf den Tag
success = ntag2xx_WriteNDEF(params->payload);
@@ -1693,6 +1749,7 @@ void writeJsonToTag(void *parameter) {
}else{
oledShowProgressBar(1, 1, "Write Tag", "Done!");
}
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
// CRITICAL: Properly stabilize NFC interface after write operation
Serial.println();
@@ -1778,7 +1835,9 @@ void writeJsonToTag(void *parameter) {
{
Serial.println("Fehler beim Schreiben der NDEF-Message auf den Tag");
oledShowIcon("failed");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
nfcReaderState = NFC_WRITE_ERROR;
// Send error response to API
@@ -1790,7 +1849,9 @@ void writeJsonToTag(void *parameter) {
{
Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
oledShowProgressBar(1, 1, "Failure!", "No tag found");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
vTaskDelay(pdMS_TO_TICKS(2000));
oledClearPriority();
nfcReaderState = NFC_IDLE;
// Send timeout response to API
@@ -1799,6 +1860,7 @@ void writeJsonToTag(void *parameter) {
}
// Reset write protection and cleanup
oledClearPriority();
nfcWriteInProgress = false; // Re-enable high-level tag operations
// Make sure we are in a safe state
@@ -1883,6 +1945,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
Serial.println("startWriteJsonToTag: Starting task, lock acquired.");
oledShowProgressBar(0, 1, "Write Tag", "Place tag now");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
// Erstelle die Task
BaseType_t result = xTaskCreatePinnedToCore(
writeJsonToTag, // Task-Funktion
@@ -1903,6 +1966,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
}else{
Serial.printf("startWriteJsonToTag: State mismatch (State: %d)\n", nfcReaderState);
oledShowProgressBar(0, 1, "FAILURE", "NFC busy!");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
free(parameters->payload);
delete parameters;
}
@@ -1971,12 +2035,14 @@ void scanRfidTask(void * parameter) {
Serial.println("Found an ISO14443A card");
nfcReaderState = NFC_READING;
pauseMainTask = 1;
oledShowProgressBar(0, 4, "Reading", "Detecting tag");
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
// Reduced stabilization time for better responsiveness
Serial.println("Tag detected, minimal stabilization...");
vTaskDelay(pdMS_TO_TICKS(200)); // Reduced from 1000ms to 200ms
// Stabilization time for reliable tag communication
Serial.println("Tag detected, stabilizing...");
vTaskDelay(pdMS_TO_TICKS(500)); // Increased from 200ms for reliable reads
// create Tag UID string
String uidString = "";
@@ -1997,7 +2063,7 @@ void scanRfidTask(void * parameter) {
Serial.println("✓ FAST-PATH: Tag processed quickly, skipping full read");
// Set reader back to idle for next scan
nfcReaderState = NFC_READ_SUCCESS;
delay(500); // Small delay before next scan
vTaskDelay(pdMS_TO_TICKS(500)); // Small delay before next scan
continue; // Skip full tag reading and continue scan loop
}
@@ -2044,6 +2110,7 @@ void scanRfidTask(void * parameter) {
if (!decodeNdefAndReturnJson(data, uidString))
{
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
nfcReaderState = NFC_READ_ERROR;
}
else
@@ -2059,6 +2126,7 @@ void scanRfidTask(void * parameter) {
Serial.println("NTAG read failed, trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
oledShowProgressBar(1, 1, "Failure", "Tag read error");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
nfcReaderState = NFC_READ_ERROR;
activeSpoolId = "";
Serial.println("Tag read failed - activeSpoolId reset to prevent autoSet");
@@ -2072,6 +2140,7 @@ void scanRfidTask(void * parameter) {
if (!detectBambuTag(uid, uidLength)) {
//TBD: Show error here?!
oledShowProgressBar(1, 1, "Failure", "Unkown tag type");
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
// Reset activeSpoolId when tag type is unknown to prevent autoSet
activeSpoolId = "";
@@ -2088,6 +2157,8 @@ void scanRfidTask(void * parameter) {
activeSpoolId = "";
activeTagUuid = "";
tagProcessed = false;
pauseMainTask = 0;
oledClearPriority();
oledShowWeight(weight);
}