Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
067807d1a6 | ||
|
|
04bf05cb05 | ||
|
|
045e450744 | ||
|
|
7b03b359ba | ||
|
|
a5d9902149 | ||
|
|
1c19413970 | ||
|
|
35e0167398 | ||
|
|
89f176b188 | ||
|
|
b78f34c1d3 | ||
|
|
f9d8fc7a61 | ||
|
|
c77b9c8503 | ||
|
|
1096585b56 | ||
|
|
17ba353f17 | ||
|
|
01e36bd39e | ||
|
|
01b8ced7e9 | ||
|
|
5f9ad13ea9 | ||
|
|
29e8b09c5a |
No files matched your search
@@ -6,6 +6,18 @@ on:
|
||||
GITEA_TOKEN:
|
||||
description: 'Token für Gitea API-Zugriff'
|
||||
required: true
|
||||
FILAMAN_SSH_PRIVATE_KEY:
|
||||
description: 'SSH Private Key für Deployment'
|
||||
required: true
|
||||
FILAMAN_SSH_HOST:
|
||||
description: 'SSH Host für Deployment'
|
||||
required: true
|
||||
FILAMAN_SSH_USER:
|
||||
description: 'SSH User für Deployment'
|
||||
required: true
|
||||
FILAMAN_SSH_FIRMWARE_PATH:
|
||||
description: 'SSH Pfad für Firmware Upload'
|
||||
required: true
|
||||
|
||||
outputs:
|
||||
version:
|
||||
@@ -212,3 +224,31 @@ jobs:
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
- name: SSH-Deploy Firmware
|
||||
if: success()
|
||||
env:
|
||||
SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }}
|
||||
SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }}
|
||||
SSH_USER: ${{ secrets.FILAMAN_SSH_USER }}
|
||||
SSH_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }}
|
||||
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# SSH-Key einrichten
|
||||
mkdir -p ~/.ssh
|
||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
||||
chmod 600 ~/.ssh/id_rsa
|
||||
ssh-keyscan -H "$SSH_HOST" >> ~/.ssh/known_hosts 2>/dev/null
|
||||
|
||||
cd .pio/build/esp32dev
|
||||
|
||||
# Full-Binary per SCP hochladen
|
||||
echo "📤 Upload filaman_full_${VERSION}.bin per SCP ..."
|
||||
scp -o StrictHostKeyChecking=no "filaman_full_${VERSION}.bin" "${SSH_USER}@${SSH_HOST}:${SSH_PATH}/filaman_full.bin"
|
||||
|
||||
echo "✅ filaman_full.bin auf ${SSH_HOST}:${SSH_PATH}/ hochgeladen."
|
||||
|
||||
# Aufräumen
|
||||
rm -f ~/.ssh/id_rsa
|
||||
@@ -6,15 +6,6 @@ on:
|
||||
RELEASE_TOKEN:
|
||||
description: 'GitHub token for release creation'
|
||||
required: true
|
||||
FTP_PASSWORD:
|
||||
description: 'FTP Password'
|
||||
required: false
|
||||
FTP_USER:
|
||||
description: 'FTP User'
|
||||
required: false
|
||||
FTP_HOST:
|
||||
description: 'FTP Host'
|
||||
required: false
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -160,29 +151,3 @@ jobs:
|
||||
echo "Error: No files found to upload"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Install lftp
|
||||
run: sudo apt-get install -y lftp
|
||||
|
||||
- name: Upload Firmware via FTP
|
||||
if: success()
|
||||
env:
|
||||
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
||||
FTP_USER: ${{ secrets.FTP_USER }}
|
||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
||||
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||
run: |
|
||||
cd .pio/build/esp32dev
|
||||
if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
|
||||
echo "All FTP credentials are present, attempting upload..."
|
||||
lftp -c "set ssl:verify-certificate no; \
|
||||
set ftp:ssl-protect-data true; \
|
||||
set ftp:ssl-force true; \
|
||||
set ssl:check-hostname false; \
|
||||
set ftp:ssl-auth TLS; \
|
||||
open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
|
||||
put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
|
||||
else
|
||||
echo "Error: Some FTP credentials are missing"
|
||||
exit 1
|
||||
fi
|
||||
@@ -32,13 +32,14 @@ jobs:
|
||||
uses: ./.github/workflows/github-release.yml
|
||||
secrets:
|
||||
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
||||
FTP_USER: ${{ secrets.FTP_USER }}
|
||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
||||
|
||||
gitea-release:
|
||||
needs: detect-provider
|
||||
if: needs.detect-provider.outputs.provider == 'gitea'
|
||||
uses: ./.github/workflows/gitea-release.yml
|
||||
secrets:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
FILAMAN_SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }}
|
||||
FILAMAN_SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }}
|
||||
FILAMAN_SSH_USER: ${{ secrets.FILAMAN_SSH_USER }}
|
||||
FILAMAN_SSH_FIRMWARE_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }}
|
||||
+1
-2
@@ -27,8 +27,7 @@ test/README
|
||||
# important
|
||||
html/bambu_credentials.json
|
||||
html/spoolman_url.json
|
||||
_local/*
|
||||
website/*
|
||||
release.sh
|
||||
wiki
|
||||
_layout
|
||||
_*
|
||||
@@ -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.
|
||||
@@ -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!
|
||||
@@ -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.
|
||||
@@ -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!
|
||||
+33
-8
@@ -57,12 +57,12 @@ Geräte sollten regelmäßig einen Heartbeat senden, um ihren Status auf "Online
|
||||
- **Request Body:**
|
||||
```json
|
||||
{
|
||||
"spool_id": 123, // Optional: Interne ID der Spule
|
||||
"tag_uuid": "E280...", // Optional: RFID Tag UID
|
||||
"tag_uuid": "sf:25:s5:...", // Optional: RFID Tag UID (bevorzugt)
|
||||
"spool_id": 123, // Optional: Interne ID der Spule (Fallback)
|
||||
"measured_weight_g": 850.5 // Aktuelles Gesamtgewicht in Gramm
|
||||
}
|
||||
```
|
||||
*Hinweis: Mindestens `spool_id` oder `tag_uuid` muss angegeben werden.*
|
||||
*Hinweis: Mindestens `tag_uuid` oder `spool_id` muss angegeben werden. `tag_uuid` hat Vorrang vor `spool_id`.*
|
||||
|
||||
- **Response:**
|
||||
```json
|
||||
@@ -80,12 +80,14 @@ Verknüpft eine Spule mit einem Lagerort.
|
||||
- **Request Body:**
|
||||
```json
|
||||
{
|
||||
"spool_id": 123, // Optional: ID der Spule
|
||||
"spool_tag_uuid": "E280...", // Optional: RFID UID der Spule
|
||||
"location_id": 1, // Optional: ID des Ortes
|
||||
"location_tag_uuid": "LOC-1" // Optional: RFID UID des Ortes
|
||||
"spool_tag_uuid": "sf:25:s5:...", // Optional: RFID UID der Spule (bevorzugt)
|
||||
"spool_id": 123, // Optional: ID der Spule (Fallback)
|
||||
"location_tag_uuid": "LOC-1" // Optional: RFID UID des Ortes (bevorzugt)
|
||||
"location_id": 1 // Optional: ID des Ortes (Fallback)
|
||||
}
|
||||
```
|
||||
*Hinweis: RFID UUIDs haben Vorrang vor IDs. Mindestens Spule und Standort müssen durch UUID oder ID identifiziert werden.*
|
||||
|
||||
- **Response:**
|
||||
```json
|
||||
{
|
||||
@@ -115,10 +117,33 @@ Das System sendet eine Anfrage an die IP des Geräts.
|
||||
- **Erwartete Response vom Gerät:**
|
||||
```json
|
||||
{
|
||||
"tag_uuid": "E2801234..." // Die UID des beschriebenen Tags
|
||||
"tag_uuid": "sf:25:s5:..." // Die UID des beschriebenen Tags
|
||||
}
|
||||
```
|
||||
|
||||
### RFID Ergebnis zurückmelden
|
||||
Das Device meldet das Ergebnis des Schreibvorgangs an das System zurück.
|
||||
|
||||
- **Endpunkt:** `POST /api/v1/devices/rfid-result`
|
||||
- **Request Body:**
|
||||
```json
|
||||
{
|
||||
"success": true,
|
||||
"tag_uuid": "sf:25:s5:a1:00",
|
||||
"spool_id": 123,
|
||||
"remaining_weight_g": 850.5
|
||||
}
|
||||
```
|
||||
*Hinweis: `remaining_weight_g` ist optional und wird beim erstmaligen Beschreiben einer neuen Spule benötigt.*
|
||||
|
||||
- **Felder:**
|
||||
- `success` (boolean): War der Schreibvorgang erfolgreich?
|
||||
- `tag_uuid` (string): Die UID des geschriebenen Tags
|
||||
- `spool_id` (int, optional): DB-ID der Spule falls vorhanden
|
||||
- `remaining_weight_g` (float, optional): Aktuelles Gewicht der Spule beim Schreibvorgang
|
||||
|
||||
- **Response:** `{"status": "ok", "message": "Processed successfully"}`
|
||||
|
||||
---
|
||||
|
||||
## 6. Fehlercodes
|
||||
|
||||
+2
-2
@@ -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
@@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "3.1.0"
|
||||
version = "3.2.4"
|
||||
to_old_version = "3.0.9"
|
||||
|
||||
##
|
||||
|
||||
+32
-10
@@ -8,6 +8,7 @@
|
||||
#include "nfc.h"
|
||||
#include "config.h"
|
||||
#include <WiFi.h>
|
||||
#include "display.h"
|
||||
|
||||
volatile filamanApiStateType filamanApiState = API_IDLE;
|
||||
bool filamanConnected = false;
|
||||
@@ -21,6 +22,7 @@ struct ApiRequest {
|
||||
float val;
|
||||
bool bool1; // success
|
||||
String str3; // error message
|
||||
float remainingWeight; // remaining weight from rfid-result
|
||||
bool active = false;
|
||||
};
|
||||
|
||||
@@ -92,19 +94,28 @@ bool sendHeartbeat() {
|
||||
}
|
||||
|
||||
bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||
Serial.printf("sendWeight: sending to API - spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), measuredWeight);
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) {
|
||||
Serial.println("ERROR: Not registered or WiFi not connected");
|
||||
return false;
|
||||
}
|
||||
HTTPClient http;
|
||||
http.setTimeout(3000);
|
||||
http.begin(filamanUrl + "/api/v1/devices/scale/weight");
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
http.addHeader("Authorization", "Device " + filamanToken);
|
||||
JsonDocument doc;
|
||||
// Only add spool_id if it's > 0 (for NTAG tags with spool ID)
|
||||
// For Bambu tags (spoolId == 0), only send tag_uuid
|
||||
if (spoolId > 0) doc["spool_id"] = spoolId;
|
||||
// Always add tag_uuid if available (this is what we want for Bambu tags)
|
||||
if (tagUuid.length() > 0) doc["tag_uuid"] = tagUuid;
|
||||
doc["measured_weight_g"] = measuredWeight;
|
||||
String payload;
|
||||
serializeJson(doc, payload);
|
||||
Serial.printf("API payload: %s\n", payload.c_str());
|
||||
int httpCode = http.POST(payload);
|
||||
Serial.printf("API response code: %d\n", httpCode);
|
||||
|
||||
if (httpCode == 200) {
|
||||
String response = http.getString();
|
||||
@@ -112,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();
|
||||
@@ -150,7 +161,7 @@ bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locat
|
||||
return (httpCode == 200);
|
||||
}
|
||||
|
||||
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage) {
|
||||
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) {
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||
HTTPClient http;
|
||||
http.setTimeout(5000);
|
||||
@@ -164,6 +175,7 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
|
||||
if (spoolId > 0) doc["spool_id"] = spoolId;
|
||||
if (locationId > 0) doc["location_id"] = locationId;
|
||||
if (errorMessage.length() > 0) doc["error_message"] = errorMessage;
|
||||
if (remainingWeight > 0) doc["remaining_weight_g"] = remainingWeight;
|
||||
|
||||
String payload;
|
||||
serializeJson(doc, payload);
|
||||
@@ -195,12 +207,12 @@ void filamanApiTask(void* pvParameters) {
|
||||
case API_REQUEST_HEARTBEAT: sendHeartbeat(); break;
|
||||
case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); break;
|
||||
case API_REQUEST_LOCATE: sendLocation(req.id1, req.str1, req.id2, req.str2); break;
|
||||
case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3); break;
|
||||
case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3, req.remainingWeight); break;
|
||||
default: break;
|
||||
}
|
||||
filamanApiState = API_IDLE;
|
||||
}
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
vTaskDelay(pdMS_TO_TICKS(100));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -227,7 +239,15 @@ void sendHeartbeatAsync() {
|
||||
}
|
||||
|
||||
void sendWeightAsync(int spoolId, String tagUuid, float weight) {
|
||||
if (!checkFilamanRegistration()) return;
|
||||
Serial.printf("sendWeightAsync: spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), weight);
|
||||
if (!checkFilamanRegistration()) {
|
||||
Serial.println("ERROR: Not registered with FilaMan, cannot send weight");
|
||||
return;
|
||||
}
|
||||
if (weight <= 0) {
|
||||
Serial.println("ERROR: Weight is 0 or negative, cannot send");
|
||||
return;
|
||||
}
|
||||
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
|
||||
for(int i=0; i<MAX_API_QUEUE; i++) if(!apiQueue[i].active) {
|
||||
apiQueue[i].type = API_REQUEST_WEIGHT;
|
||||
@@ -237,6 +257,7 @@ void sendWeightAsync(int spoolId, String tagUuid, float weight) {
|
||||
apiQueue[i].str2 = "";
|
||||
apiQueue[i].val = weight;
|
||||
apiQueue[i].active = true;
|
||||
Serial.printf("Weight queued for API (slot %d)\n", i);
|
||||
break;
|
||||
}
|
||||
xSemaphoreGive(queueMutex);
|
||||
@@ -260,7 +281,7 @@ void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String
|
||||
}
|
||||
}
|
||||
|
||||
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage) {
|
||||
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) {
|
||||
if (!checkFilamanRegistration()) return;
|
||||
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
|
||||
for(int i=0; i<MAX_API_QUEUE; i++) if(!apiQueue[i].active) {
|
||||
@@ -270,6 +291,7 @@ void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool succe
|
||||
apiQueue[i].id2 = locationId;
|
||||
apiQueue[i].bool1 = success;
|
||||
apiQueue[i].str3 = errorMessage;
|
||||
apiQueue[i].remainingWeight = remainingWeight;
|
||||
apiQueue[i].active = true;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -29,13 +29,13 @@ bool registerDevice(const String& deviceCode);
|
||||
void sendHeartbeatAsync();
|
||||
void sendWeightAsync(int spoolId, String tagUuid, float weight);
|
||||
void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
|
||||
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage);
|
||||
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight = 0);
|
||||
|
||||
// Internal blocking functions (used by async task)
|
||||
bool sendHeartbeat();
|
||||
bool sendWeight(int spoolId, String tagUuid, float weight);
|
||||
bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
|
||||
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage);
|
||||
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight = 0);
|
||||
|
||||
// Helper functions
|
||||
void saveFilamanConfig();
|
||||
|
||||
+43
-18
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
+45
-42
@@ -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,48 +184,68 @@ 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
|
||||
// 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)
|
||||
{
|
||||
// set the current tag as processed to prevent it beeing processed again
|
||||
tagProcessed = true;
|
||||
|
||||
// Get UID from nfcJsonData or similar (nfc.cpp should set it)
|
||||
// For now, use activeSpoolId if available
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
// Check if it's a Bambu tag - if so, send only UUID without spoolId
|
||||
if (isBambuTag) {
|
||||
sendWeightAsync(0, activeTagUuid, weight);
|
||||
Serial.println("Bambu weight queued for FilaMan (UUID only)");
|
||||
} else {
|
||||
// Normal NTAG: send spoolId + UUID
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
Serial.println("Weight queued for FilaMan");
|
||||
}
|
||||
weightSend = 1;
|
||||
Serial.println("Weight queued for FilaMan");
|
||||
|
||||
// Feedback to user
|
||||
pauseMainTask = 1;
|
||||
oledShowProgressBar(3, 4, "Spool Tag", "Sending...");
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
}
|
||||
|
||||
// Handle successful tag write
|
||||
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
weightSend = 1;
|
||||
Serial.println("Weight queued for FilaMan after tag write");
|
||||
|
||||
// Feedback to user
|
||||
pauseMainTask = 1;
|
||||
oledShowProgressBar(3, 4, "Tag written", "Sending...");
|
||||
// Only send weight if a valid spoolId exists (spool tag, not location tag)
|
||||
if (activeSpoolId.length() > 0 && activeSpoolId != "0") {
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
weightSend = 1;
|
||||
Serial.println("Weight queued for FilaMan after spool tag write");
|
||||
|
||||
// Feedback to user
|
||||
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();
|
||||
}
|
||||
+171
-38
@@ -22,6 +22,7 @@ String activeTagUuid = "";
|
||||
String lastSpoolId = "";
|
||||
String nfcJsonData = "";
|
||||
bool tagProcessed = false;
|
||||
bool isBambuTag = false;
|
||||
volatile bool nfcReadingTaskSuspendRequest = false;
|
||||
volatile bool nfcReadingTaskSuspendState = false;
|
||||
volatile bool nfcWriteInProgress = false; // Prevent any tag operations during write
|
||||
@@ -36,6 +37,42 @@ volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
|
||||
// 6 = reading
|
||||
// ***** PN532
|
||||
|
||||
// ##### Bambu Tag Helper Functions #####
|
||||
// Simplified: only read UID, no decryption needed (UID is always visible)
|
||||
bool detectBambuTag(const uint8_t* uid, uint8_t uidLength) {
|
||||
Serial.println("Detected Bambu Lab tag (Mifare Classic) - reading UID only");
|
||||
|
||||
// Create UID string with separators (same format as NTAG)
|
||||
String uidString = "";
|
||||
for (uint8_t i = 0; i < uidLength; i++) {
|
||||
if (uid[i] < 0x10) uidString += "0";
|
||||
uidString += String(uid[i], HEX);
|
||||
if (i < uidLength - 1) {
|
||||
uidString += ":";
|
||||
}
|
||||
}
|
||||
uidString.toUpperCase();
|
||||
|
||||
Serial.print(" UID: ");
|
||||
Serial.println(uidString);
|
||||
|
||||
isBambuTag = true;
|
||||
activeTagUuid = uidString;
|
||||
activeSpoolId = ""; // Will be resolved by FilaMan API based on tag UID
|
||||
|
||||
// Create minimal JSON for compatibility
|
||||
JsonDocument doc;
|
||||
doc["vendor"] = "Bambu Lab";
|
||||
doc["type"] = "Bambu";
|
||||
nfcJsonData = "";
|
||||
serializeJson(doc, nfcJsonData);
|
||||
|
||||
// Set normal read success state - isBambuTag flag is set for later use
|
||||
nfcReaderState = NFC_READ_SUCCESS;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// ##### Funktionen für RFID #####
|
||||
void payloadToJson(uint8_t *data) {
|
||||
const char* startJson = strchr((char*)data, '{');
|
||||
@@ -462,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;
|
||||
}
|
||||
@@ -504,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;
|
||||
}
|
||||
@@ -538,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;
|
||||
}
|
||||
@@ -556,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;
|
||||
}
|
||||
@@ -609,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;
|
||||
}
|
||||
@@ -630,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;
|
||||
}
|
||||
@@ -661,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;
|
||||
}
|
||||
@@ -680,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;
|
||||
}
|
||||
@@ -725,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;
|
||||
}
|
||||
|
||||
@@ -781,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;
|
||||
}
|
||||
@@ -794,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;
|
||||
}
|
||||
|
||||
@@ -1063,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):");
|
||||
@@ -1256,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;
|
||||
}
|
||||
@@ -1266,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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1484,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 {
|
||||
@@ -1539,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 {
|
||||
@@ -1584,31 +1662,45 @@ 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
|
||||
uint8_t uidLength;
|
||||
// yield before potentially waiting for 400ms
|
||||
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) {
|
||||
for (uint8_t i = 0; i < uidLength; i++) {
|
||||
if (uid[i] < 0x10) uidString += "0";
|
||||
uidString += String(uid[i], HEX);
|
||||
if (i < uidLength - 1) {
|
||||
uidString += ":"; // Trennzeichen hinzufügen
|
||||
}
|
||||
}
|
||||
foundNfcTag(nullptr, success);
|
||||
uidString.toUpperCase();
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1619,7 +1711,28 @@ void writeJsonToTag(void *parameter) {
|
||||
|
||||
if (success)
|
||||
{
|
||||
// Check if this is a Bambu tag (Mifare Classic has 4 byte UID, NTAG has 7 byte)
|
||||
// If so, skip writing and just send success with weight to API
|
||||
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);
|
||||
|
||||
vTaskDelay(pdMS_TO_TICKS(500));
|
||||
|
||||
// Clean up and exit
|
||||
nfcWriteInProgress = false;
|
||||
nfcReaderState = NFC_IDLE;
|
||||
free(params->payload);
|
||||
delete params;
|
||||
vTaskDelete(NULL);
|
||||
}
|
||||
|
||||
oledShowProgressBar(1, 3, "Write Tag", "Writing");
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
|
||||
// Schreibe die NDEF-Message auf den Tag
|
||||
success = ntag2xx_WriteNDEF(params->payload);
|
||||
@@ -1636,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();
|
||||
@@ -1710,9 +1824,9 @@ void writeJsonToTag(void *parameter) {
|
||||
|
||||
Serial.println("=========================================");
|
||||
|
||||
// Send success response to API with tag_uuid (with separators)
|
||||
// Send success response to API with tag_uuid and current weight
|
||||
Serial.println("Sending result to API via fire-and-forget...");
|
||||
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "");
|
||||
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "", weight);
|
||||
|
||||
// vTaskResume(RfidReaderTask); // Don't resume as it was not suspended
|
||||
vTaskDelay(pdMS_TO_TICKS(500));
|
||||
@@ -1721,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
|
||||
@@ -1733,18 +1849,18 @@ 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
|
||||
Serial.println("Sending timeout result to API via fire-and-forget...");
|
||||
sendRfidResultAsync("", params->spoolId, params->locationId, false, "Timeout - no tag found");
|
||||
}
|
||||
|
||||
sendWriteResult(nullptr, success);
|
||||
sendNfcData();
|
||||
|
||||
// Reset write protection and cleanup
|
||||
oledClearPriority();
|
||||
nfcWriteInProgress = false; // Re-enable high-level tag operations
|
||||
|
||||
// Make sure we are in a safe state
|
||||
@@ -1829,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
|
||||
@@ -1849,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;
|
||||
}
|
||||
@@ -1917,17 +2035,20 @@ 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 = "";
|
||||
for (uint8_t i = 0; i < uidLength; i++) {
|
||||
//TBD: Rework to remove all the string operations
|
||||
if (uid[i] < 0x10) uidString += "0";
|
||||
uidString += String(uid[i], HEX);
|
||||
if (i < uidLength - 1) {
|
||||
uidString += ":"; // Optional: Trennzeichen hinzufügen
|
||||
@@ -1942,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
|
||||
}
|
||||
|
||||
@@ -1989,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
|
||||
@@ -2000,21 +2122,30 @@ void scanRfidTask(void * parameter) {
|
||||
}
|
||||
else
|
||||
{
|
||||
oledShowProgressBar(1, 1, "Failure", "Tag read error");
|
||||
nfcReaderState = NFC_READ_ERROR;
|
||||
// Reset activeSpoolId when tag reading fails to prevent autoSet
|
||||
activeSpoolId = "";
|
||||
Serial.println("Tag read failed - activeSpoolId reset to prevent autoSet");
|
||||
// NTAG reading failed, try reading as Bambu Lab tag
|
||||
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");
|
||||
}
|
||||
}
|
||||
}
|
||||
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)!");
|
||||
// Reset activeSpoolId when tag type is unknown to prevent autoSet
|
||||
activeSpoolId = "";
|
||||
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
|
||||
// UID length != 7, might be a Mifare Classic (Bambu tags)
|
||||
Serial.println("Not a standard NTAG (UID length != 7), trying Bambu Lab tag...");
|
||||
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 = "";
|
||||
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2026,6 +2157,8 @@ void scanRfidTask(void * parameter) {
|
||||
activeSpoolId = "";
|
||||
activeTagUuid = "";
|
||||
tagProcessed = false;
|
||||
pauseMainTask = 0;
|
||||
oledClearPriority();
|
||||
oledShowWeight(weight);
|
||||
}
|
||||
|
||||
@@ -2034,18 +2167,18 @@ void scanRfidTask(void * parameter) {
|
||||
{
|
||||
nfcReaderState = NFC_IDLE;
|
||||
tagProcessed = false;
|
||||
isBambuTag = false;
|
||||
Serial.println("Tag nach erfolgreichem Lesen entfernt - bereit für nächsten Tag");
|
||||
}
|
||||
|
||||
// Add a pause after successful reading to prevent immediate re-reading
|
||||
if (nfcReaderState == NFC_READ_SUCCESS) {
|
||||
Serial.println("Tag erfolgreich gelesen - warte 3 Sekunden vor nächstem Scan");
|
||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||
// Reduced from 5 seconds to 3 seconds
|
||||
// After tag is processed, slow down scanning to give API time
|
||||
Serial.println("Tag processed - slowing scan to 2 seconds");
|
||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||
} else {
|
||||
// Faster scanning when no tag or idle state
|
||||
vTaskDelay(pdMS_TO_TICKS(250));
|
||||
// Faster scan interval
|
||||
vTaskDelay(pdMS_TO_TICKS(500));
|
||||
}
|
||||
|
||||
// aktualisieren der Website wenn sich der Status ändert
|
||||
|
||||
@@ -11,7 +11,9 @@ typedef enum{
|
||||
NFC_READ_ERROR,
|
||||
NFC_WRITING,
|
||||
NFC_WRITE_SUCCESS,
|
||||
NFC_WRITE_ERROR
|
||||
NFC_WRITE_ERROR,
|
||||
NFC_BAMBU_DETECTED,
|
||||
NFC_BAMBU_ERROR
|
||||
} nfcReaderStateType;
|
||||
|
||||
struct NfcWriteParameterType {
|
||||
@@ -35,7 +37,6 @@ extern String lastSpoolId;
|
||||
extern volatile nfcReaderStateType nfcReaderState;
|
||||
extern volatile bool nfcWriteInProgress;
|
||||
extern bool tagProcessed;
|
||||
extern bool isBambuTag;
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
Reference in new issue
Block a user