merge: sync devel with main

devel was 16 commits behind main and had diverged with the
esp32-s3-devkitc-1 board support (PR #14) that never made it back to
main. Merges main into devel so both stay on the same feature/fix
baseline; resolves the platformio.ini conflict by keeping devel's
shared [env] section (used by both esp32dev and esp32-s3-devkitc-1)
and carrying forward main's AsyncTCP watchdog fix
(-DCONFIG_ASYNC_TCP_USE_WDT=0).
This commit is contained in:
ManuelW77 committed 2026-08-20 09:32:41 +02:00
commit 4054a96067
11 files changed
+664 -90

No files matched your search

+1 -1
View File
@@ -35,7 +35,7 @@ jobs:
gitea-release:
needs: detect-provider
if: needs.detect-provider.outputs.provider == 'gitea'
if: needs.detect-provider.outputs.provider == 'gitea' && !contains(github.ref_name, '-beta')
uses: ./.github/workflows/gitea-release.yml
secrets:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+380
View File
@@ -0,0 +1,380 @@
{
"name": ".opencode",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"dependencies": {
"@opencode-ai/plugin": "1.15.10"
}
},
"node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
"integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
]
},
"node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
"integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"darwin"
]
},
"node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
"integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
"cpu": [
"arm"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
"integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
"cpu": [
"arm64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
"integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"linux"
]
},
"node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
"integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
"cpu": [
"x64"
],
"license": "MIT",
"optional": true,
"os": [
"win32"
]
},
"node_modules/@opencode-ai/plugin": {
"version": "1.15.10",
"resolved": "https://registry.npmjs.org/@opencode-ai/plugin/-/plugin-1.15.10.tgz",
"integrity": "sha512-V2p7CvpBtKWB+FID7Dl1y0Ci02zUT40A9b2RD9R9BOiuD8ZcKhHWov+irN0xVJA0Eg6OhEBfA0lPKRn1FNKPlw==",
"license": "MIT",
"dependencies": {
"@opencode-ai/sdk": "1.15.10",
"effect": "4.0.0-beta.66",
"zod": "4.1.8"
},
"peerDependencies": {
"@opentui/core": ">=0.2.15",
"@opentui/keymap": ">=0.2.15",
"@opentui/solid": ">=0.2.15"
},
"peerDependenciesMeta": {
"@opentui/core": {
"optional": true
},
"@opentui/keymap": {
"optional": true
},
"@opentui/solid": {
"optional": true
}
}
},
"node_modules/@opencode-ai/sdk": {
"version": "1.15.10",
"resolved": "https://registry.npmjs.org/@opencode-ai/sdk/-/sdk-1.15.10.tgz",
"integrity": "sha512-CUhpmMGGOqzvPnNNjjWmEIodAfP6Qnuki2ChIUKWYF7UImZ4zUcMZnzO5BtUxu/Ni1P8qzWxDioXs+7aIZQEhA==",
"license": "MIT",
"dependencies": {
"cross-spawn": "7.0.6"
}
},
"node_modules/@standard-schema/spec": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
"integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
"license": "MIT"
},
"node_modules/cross-spawn": {
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"license": "MIT",
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/detect-libc": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
"integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
"license": "Apache-2.0",
"optional": true,
"engines": {
"node": ">=8"
}
},
"node_modules/effect": {
"version": "4.0.0-beta.66",
"resolved": "https://registry.npmjs.org/effect/-/effect-4.0.0-beta.66.tgz",
"integrity": "sha512-4arEr62cziFa8BBVDUwJCJJmaVepXf/kRg7KtC0h8+bufngscrHbwWFhr9c+HonwOF+31U3iD3xUJmw9KzX7Dw==",
"license": "MIT",
"dependencies": {
"@standard-schema/spec": "^1.1.0",
"fast-check": "^4.6.0",
"find-my-way-ts": "^0.1.6",
"ini": "^6.0.0",
"kubernetes-types": "^1.30.0",
"msgpackr": "^1.11.9",
"multipasta": "^0.2.7",
"toml": "^4.1.1",
"uuid": "^13.0.0",
"yaml": "^2.8.3"
}
},
"node_modules/fast-check": {
"version": "4.8.0",
"resolved": "https://registry.npmjs.org/fast-check/-/fast-check-4.8.0.tgz",
"integrity": "sha512-GOJ158CUMnN6cSahsv4+ExARvIDuzzinFjkp0E9WtiBa5zcVeLozVkWaE4IzFcc+Y48Wp1EDlUZsXRyAztQcSg==",
"funding": [
{
"type": "individual",
"url": "https://github.com/sponsors/dubzzz"
},
{
"type": "opencollective",
"url": "https://opencollective.com/fast-check"
}
],
"license": "MIT",
"dependencies": {
"pure-rand": "^8.0.0"
},
"engines": {
"node": ">=12.17.0"
}
},
"node_modules/find-my-way-ts": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/find-my-way-ts/-/find-my-way-ts-0.1.6.tgz",
"integrity": "sha512-a85L9ZoXtNAey3Y6Z+eBWW658kO/MwR7zIafkIUPUMf3isZG0NCs2pjW2wtjxAKuJPxMAsHUIP4ZPGv0o5gyTA==",
"license": "MIT"
},
"node_modules/ini": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
"integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
"license": "ISC",
"engines": {
"node": "^20.17.0 || >=22.9.0"
}
},
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"license": "ISC"
},
"node_modules/kubernetes-types": {
"version": "1.30.0",
"resolved": "https://registry.npmjs.org/kubernetes-types/-/kubernetes-types-1.30.0.tgz",
"integrity": "sha512-Dew1okvhM/SQcIa2rcgujNndZwU8VnSapDgdxlYoB84ZlpAD43U6KLAFqYo17ykSFGHNPrg0qry0bP+GJd9v7Q==",
"license": "Apache-2.0"
},
"node_modules/msgpackr": {
"version": "1.11.12",
"resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.12.tgz",
"integrity": "sha512-RBdJ1Un7yGlXWajrkxcSa93nvQ0w4zBf60c0yYv7YtBelP8H2FA7XsfBbMHtXKXUMUxH7zV3Zuozh+kUQWhHvg==",
"license": "MIT",
"optionalDependencies": {
"msgpackr-extract": "^3.0.2"
}
},
"node_modules/msgpackr-extract": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
"integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
"hasInstallScript": true,
"license": "MIT",
"optional": true,
"dependencies": {
"node-gyp-build-optional-packages": "5.2.2"
},
"bin": {
"download-msgpackr-prebuilds": "bin/download-prebuilds.js"
},
"optionalDependencies": {
"@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
"@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
"@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
"@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
"@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
"@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
}
},
"node_modules/multipasta": {
"version": "0.2.7",
"resolved": "https://registry.npmjs.org/multipasta/-/multipasta-0.2.7.tgz",
"integrity": "sha512-KPA58d68KgGil15oDqXjkUBEBYc00XvbPj5/X+dyzeo/lWm9Nc25pQRlf1D+gv4OpK7NM0J1odrbu9JNNGvynA==",
"license": "MIT"
},
"node_modules/node-gyp-build-optional-packages": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
"integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
"license": "MIT",
"optional": true,
"dependencies": {
"detect-libc": "^2.0.1"
},
"bin": {
"node-gyp-build-optional-packages": "bin.js",
"node-gyp-build-optional-packages-optional": "optional.js",
"node-gyp-build-optional-packages-test": "build-test.js"
}
},
"node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/pure-rand": {
"version": "8.4.0",
"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-8.4.0.tgz",
"integrity": "sha512-IoM8YF/jY0hiugFo/wOWqfmarlE6J0wc6fDK1PhftMk7MGhVZl88sZimmqBBFomLOCSmcCCpsfj7wXASCpvK9A==",
"funding": [
{
"type": "individual",
"url": "https://github.com/sponsors/dubzzz"
},
{
"type": "opencollective",
"url": "https://opencollective.com/fast-check"
}
],
"license": "MIT"
},
"node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"license": "MIT",
"dependencies": {
"shebang-regex": "^3.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/toml": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/toml/-/toml-4.1.1.tgz",
"integrity": "sha512-EBJnVBr3dTXdA89WVFoAIPUqkBjxPMwRqsfuo1r240tKFHXv3zgca4+NJib/h6TyvGF7vOawz0jGuryJCdNHrw==",
"license": "MIT",
"engines": {
"node": ">=20"
}
},
"node_modules/uuid": {
"version": "13.0.2",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-13.0.2.tgz",
"integrity": "sha512-vzi9uRZ926x4XV73S/4qQaTwPXM2JBj6/6lI/byHH1jOpCzb0zDbfytgA9LcN/hzb2l7WQSQnxITOVx5un/wGw==",
"funding": [
"https://github.com/sponsors/broofa",
"https://github.com/sponsors/ctavan"
],
"license": "MIT",
"bin": {
"uuid": "dist-node/bin/uuid"
}
},
"node_modules/which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"license": "ISC",
"dependencies": {
"isexe": "^2.0.0"
},
"bin": {
"node-which": "bin/node-which"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/yaml": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz",
"integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==",
"license": "ISC",
"bin": {
"yaml": "bin.mjs"
},
"engines": {
"node": ">= 14.6"
},
"funding": {
"url": "https://github.com/sponsors/eemeli"
}
},
"node_modules/zod": {
"version": "4.1.8",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/colinhacks"
}
}
}
}
+6 -3
View File
@@ -9,8 +9,8 @@
; https://docs.platformio.org/page/projectconf.html
[common]
version = "3.3.1"
to_old_version = "3.2.0"
version = "3.4.2"
to_old_version = "3.4.0"
[env:esp32dev]
platform = espressif32@^6.0.0
@@ -45,7 +45,10 @@ build_flags =
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
-DCONFIG_ASYNC_TCP_PRIORITY=10
-DCONFIG_ASYNC_TCP_USE_WDT=1
# WDT für AsyncTCP deaktiviert: Mit aktivem WDT konnten langsame
# WebSocket-Sender (z. B. große ws.textAll-JSONs) den AsyncTCP-Task
# killen und so alle Clients abwerfen.
-DCONFIG_ASYNC_TCP_USE_WDT=0
-DCONFIG_LWIP_TCP_MSL=30000
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=8192
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
+38 -1
View File
@@ -208,6 +208,25 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
return (httpCode == 200);
}
bool sendTagData(String tagJson) {
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
HTTPClient http;
http.setTimeout(10000);
http.setReuse(true);
http.begin(filamanUrl + "/api/v1/devices/tag-data");
http.addHeader("Content-Type", "application/json");
http.addHeader("Authorization", "Device " + filamanToken);
http.addHeader("Connection", "keep-alive");
JsonDocument doc;
doc["tag_json"] = tagJson;
String payload;
serializeJson(doc, payload);
int httpCode = http.POST(payload);
http.end();
Serial.printf("sendTagData: HTTP %d\n", httpCode);
return (httpCode == 200);
}
void filamanApiTask(void* pvParameters) {
for (;;) {
ApiRequest req;
@@ -228,10 +247,11 @@ void filamanApiTask(void* pvParameters) {
if (hasReq) {
filamanApiState = API_TRANSMITTING;
switch (req.type) {
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break; // Mit Retry-Logik
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); 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, req.remainingWeight); break;
case API_REQUEST_TAG_DATA: sendTagData(req.str1); break;
default: break;
}
filamanApiState = API_IDLE;
@@ -323,6 +343,23 @@ void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool succe
}
}
void sendTagDataAsync(String tagJson) {
if (!checkFilamanRegistration()) 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_TAG_DATA;
apiQueue[i].str1 = tagJson;
apiQueue[i].id1 = 0;
apiQueue[i].id2 = 0;
apiQueue[i].str2 = "";
apiQueue[i].val = 0.0f;
apiQueue[i].active = true;
break;
}
xSemaphoreGive(queueMutex);
}
}
bool initFilaman() {
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
loadFilamanConfig();
+3 -1
View File
@@ -17,7 +17,8 @@ typedef enum {
API_REQUEST_HEARTBEAT,
API_REQUEST_WEIGHT,
API_REQUEST_LOCATE,
API_REQUEST_RFID_RESULT
API_REQUEST_RFID_RESULT,
API_REQUEST_TAG_DATA
} FilamanApiRequestType;
extern volatile filamanApiStateType filamanApiState;
@@ -30,6 +31,7 @@ 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, float remainingWeight = 0);
void sendTagDataAsync(String tagJson);
// Internal blocking functions (used by async task)
bool sendHeartbeat();
+1 -1
View File
@@ -25,7 +25,7 @@
#define SCREEN_PROGRESS_BAR_HEIGHT 12U
#define DISPLAY_BOOT_TEXT "FilaMan"
#define WIFI_CHECK_INTERVAL 60000U
#define WIFI_CHECK_INTERVAL 15000U
#define DISPLAY_UPDATE_INTERVAL 1000U
#define FILAMAN_HEARTBEAT_INTERVAL 60000U
+11 -3
View File
@@ -199,9 +199,17 @@ void loop() {
mainTaskWasPaused = true;
}
// Während eines expliziten Scan-Requests darf kein regulärer Wiegevorgang
// an das Backend gesendet werden.
if (scanRequestActive) {
weightCounterToApi = 0;
weightSend = 0;
lastWeight = weight;
}
// Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
if (!scanRequestActive && currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
{
lastWeightReadTime = currentMillis;
@@ -229,7 +237,7 @@ void loop() {
lastWeight = weight;
// 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)
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
{
tagProcessed = true;
@@ -251,7 +259,7 @@ void loop() {
}
// Handle successful tag write
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
if (!scanRequestActive && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
{
tagProcessed = true;
+158 -51
View File
@@ -27,6 +27,35 @@ bool isBambuTag = false;
volatile bool nfcReadingTaskSuspendRequest = false;
volatile bool nfcReadingTaskSuspendState = false;
volatile bool nfcWriteInProgress = false; // Prevent any tag operations during write
volatile bool scanRequestActive = false; // Set by website when frontend requests a tag scan
unsigned long scanRequestStartedAtMs = 0;
const unsigned long SCAN_REQUEST_TIMEOUT_MS = 30000;
void sendScanRequestErrorToBackend(const char* errorMessage) {
if (!scanRequestActive) {
return;
}
JsonDocument doc;
doc["scan_status"] = "error";
doc["error_message"] = errorMessage;
doc["source"] = "rfid_scan_request";
String payload;
serializeJson(doc, payload);
sendTagDataAsync(payload);
scanRequestActive = false;
scanRequestStartedAtMs = 0;
}
void setScanRequest(bool active) {
scanRequestActive = active;
if (active) {
scanRequestStartedAtMs = millis();
} else {
scanRequestStartedAtMs = 0;
}
}
volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
// 0 = nicht gelesen
@@ -1315,12 +1344,19 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
{
if(filamanConnected){
Serial.println("JSON-Dokument erfolgreich verarbeitet");
if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
String idKey = doc["spool_id"].is<String>() ? "spool_id" : "sm_id";
if (doc[idKey].is<String>() && doc[idKey] != "" && doc[idKey] != "0")
{
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
activeSpoolId = doc["sm_id"].as<String>();
lastSpoolId = activeSpoolId;
if (scanRequestActive) {
scanRequestActive = false;
sendTagDataAsync(nfcJsonData);
tagProcessed = true;
} else {
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
activeSpoolId = doc[idKey].as<String>();
lastSpoolId = activeSpoolId;
}
}
else if(doc["location_id"].is<int>())
@@ -1350,6 +1386,27 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
tagProcessed = true;
activeSpoolId = "";
}
else if (doc["protocol"].is<String>() &&
(doc["protocol"].as<String>() == "openspool" ||
doc["protocol"].as<String>() == "filaman"))
{
// Tag mit erweitertem Protokoll (OpenSpool/FilaMan) aber ohne spool_id/sm_id.
// FilaMan sucht die Spule anhand der tag_uuid (rfid_uid).
String protocolStr = doc["protocol"].as<String>();
String type = doc["type"] | "?";
String brand = doc["brand"] | "";
String displayText = brand.length() > 0 ? (brand + " " + type) : type;
Serial.println("Extended-data tag: protocol=" + protocolStr + " type=" + type + " brand=" + brand);
activeSpoolId = ""; // Keine spool_id/sm_id → Gewicht wird mit tag_uuid gesendet
if (scanRequestActive) {
scanRequestActive = false;
sendTagDataAsync(nfcJsonData);
tagProcessed = true;
} else {
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), displayText.c_str());
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
}
}
else
{
Serial.println("Unbekannter Tag-Inhalt.");
@@ -1433,7 +1490,7 @@ bool quickSpoolIdCheck(String uidString) {
return false;
}
Serial.println("=== FAST-PATH: Quick sm_id Check ===");
Serial.println("=== FAST-PATH: Quick spool_id Check ===");
// Read enough pages to cover NDEF header + beginning of payload (pages 4-8 = 20 bytes)
uint8_t ndefData[20];
@@ -1542,17 +1599,23 @@ bool quickSpoolIdCheck(String uidString) {
Serial.print("JSON start from extended read: ");
Serial.println(jsonStart);
// Check for sm_id pattern - look for non-zero sm_id values
if (jsonStart.indexOf("\"sm_id\":\"") >= 0) {
int smIdStart = jsonStart.indexOf("\"sm_id\":\"") + 9;
// Check for spool_id/sm_id pattern - look for non-zero id values
String idPattern = "\"spool_id\":\"";
int idPatternPos = jsonStart.indexOf(idPattern);
if (idPatternPos < 0) {
idPattern = "\"sm_id\":\"";
idPatternPos = jsonStart.indexOf(idPattern);
}
if (idPatternPos >= 0) {
int smIdStart = idPatternPos + idPattern.length();
int smIdEnd = jsonStart.indexOf("\"", smIdStart);
if (smIdEnd > smIdStart && smIdEnd < jsonStart.length()) {
String quickSpoolId = jsonStart.substring(smIdStart, smIdEnd);
Serial.print("Found sm_id in extended read: ");
Serial.print("Found spool_id/sm_id in extended read: ");
Serial.println(quickSpoolId);
// Only process if sm_id is not "0" (known spool)
// Only process if id is not "0" (known spool)
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
Serial.println("✓ FAST-PATH: Known spool detected!");
@@ -1573,13 +1636,13 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
Serial.println("✗ FAST-PATH: sm_id is 0 - new brand filament, need full read");
Serial.println("✗ FAST-PATH: spool_id/sm_id is 0 - new brand filament, need full read");
return false;
}
}
}
Serial.println("✗ FAST-PATH: No sm_id pattern in extended read");
Serial.println("✗ FAST-PATH: No spool_id/sm_id pattern in extended read");
return false;
}
@@ -1595,20 +1658,26 @@ bool quickSpoolIdCheck(String uidString) {
Serial.print("Quick JSON data: ");
Serial.println(quickJson);
// Look for sm_id pattern in the beginning of JSON - check for known vs new spools
if (quickJson.indexOf("\"sm_id\":\"") >= 0) {
Serial.println("✓ FAST-PATH: sm_id field found");
// Look for spool_id/sm_id pattern in the beginning of JSON - check for known vs new spools
String idPattern2 = "\"spool_id\":\"";
int idPattern2Pos = quickJson.indexOf(idPattern2);
if (idPattern2Pos < 0) {
idPattern2 = "\"sm_id\":\"";
idPattern2Pos = quickJson.indexOf(idPattern2);
}
if (idPattern2Pos >= 0) {
Serial.println("✓ FAST-PATH: spool_id/sm_id field found");
// Extract sm_id from quick data
int smIdStart = quickJson.indexOf("\"sm_id\":\"") + 9;
// Extract id from quick data
int smIdStart = idPattern2Pos + idPattern2.length();
int smIdEnd = quickJson.indexOf("\"", smIdStart);
if (smIdEnd > smIdStart && smIdEnd < quickJson.length()) {
String quickSpoolId = quickJson.substring(smIdStart, smIdEnd);
Serial.print("✓ Quick extracted sm_id: ");
Serial.print("✓ Quick extracted spool_id/sm_id: ");
Serial.println(quickSpoolId);
// Only process known spools (sm_id != "0") via fast path
// Only process known spools (id != "0") via fast path
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
Serial.println("✓ FAST-PATH: Known spool detected!");
@@ -1629,12 +1698,12 @@ bool quickSpoolIdCheck(String uidString) {
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
return true;
} else {
Serial.println("✗ FAST-PATH: sm_id is 0 - new brand filament, need full read");
return false; // sm_id="0" means new brand filament, needs full processing
Serial.println("✗ FAST-PATH: spool_id/sm_id is 0 - new brand filament, need full read");
return false; // id="0" means new brand filament, needs full processing
}
} else {
Serial.println("✗ FAST-PATH: Could not extract complete sm_id value");
return false; // Need full read to get complete sm_id
Serial.println("✗ FAST-PATH: Could not extract complete spool_id/sm_id value");
return false; // Need full read to get complete id
}
}
@@ -1885,7 +1954,7 @@ void writeJsonToTag(void *parameter) {
vTaskDelete(NULL);
}
// Ensures sm_id is always the first key in JSON for fast-path detection
// Ensures spool_id is always the first key in JSON for fast-path detection
String optimizeJsonForFastPath(const char* payload) {
JsonDocument inputDoc;
DeserializationError error = deserializeJson(inputDoc, payload);
@@ -1896,26 +1965,26 @@ String optimizeJsonForFastPath(const char* payload) {
return String(payload); // Return original if parsing fails
}
// Create optimized JSON with sm_id first
// Create optimized JSON with spool_id first
JsonDocument optimizedDoc;
// Always add sm_id first (even if it's "0" for brand filaments)
// Also convert spool_id to sm_id if present (backend may send either)
if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
Serial.print("Optimizing JSON: sm_id found = ");
Serial.println(inputDoc["sm_id"].as<String>());
} else if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
optimizedDoc["sm_id"] = String(inputDoc["spool_id"].as<int>());
Serial.print("Optimizing JSON: Converted spool_id to sm_id = ");
// Always add spool_id first (even if it's "0" for brand filaments)
// Accept legacy sm_id as input too, but always emit spool_id
if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
optimizedDoc["spool_id"] = String(inputDoc["spool_id"].as<int>());
Serial.print("Optimizing JSON: spool_id found = ");
Serial.println(inputDoc["spool_id"].as<int>());
} else if (inputDoc["spool_id"].is<String>() && inputDoc["spool_id"].as<String>() != "0" && inputDoc["spool_id"].as<String>() != "") {
optimizedDoc["sm_id"] = inputDoc["spool_id"].as<String>();
Serial.print("Optimizing JSON: Converted spool_id (string) to sm_id = ");
optimizedDoc["spool_id"] = inputDoc["spool_id"].as<String>();
Serial.print("Optimizing JSON: spool_id found = ");
Serial.println(inputDoc["spool_id"].as<String>());
} else if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
optimizedDoc["spool_id"] = inputDoc["sm_id"].as<String>();
Serial.print("Optimizing JSON: Converted legacy sm_id to spool_id = ");
Serial.println(inputDoc["sm_id"].as<String>());
} else {
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
Serial.println("Optimizing JSON: No sm_id or spool_id found, setting sm_id to '0'");
optimizedDoc["spool_id"] = "0"; // Default for brand filaments
Serial.println("Optimizing JSON: No spool_id or sm_id found, setting spool_id to '0'");
}
for (JsonPair kv : inputDoc.as<JsonObject>()) {
@@ -1949,7 +2018,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
return;
}
// Optimize JSON to ensure sm_id is first key for fast-path detection
// Optimize JSON to ensure spool_id is first key for fast-path detection
String optimizedPayload = optimizeJsonForFastPath(payload);
NfcWriteParameterType* parameters = new NfcWriteParameterType();
@@ -2029,6 +2098,11 @@ void scanRfidTask(void * parameter) {
esp_task_wdt_reset();
yield();
if (scanRequestActive && scanRequestStartedAtMs > 0 && (millis() - scanRequestStartedAtMs) > SCAN_REQUEST_TIMEOUT_MS) {
Serial.println("RFID scan-request timeout reached without tag");
sendScanRequestErrorToBackend("Timeout - no tag found");
}
// Skip scanning during write operations, but keep NFC interface active
if (nfcReaderState != NFC_WRITING && !nfcWriteInProgress && !nfcReadingTaskSuspendRequest && !booting)
{
@@ -2081,7 +2155,8 @@ void scanRfidTask(void * parameter) {
{
activeTagUuid = uidString;
// Try fast-path detection first for known spools
if (quickSpoolIdCheck(uidString)) {
// Skip fast-path when a scan request is active — full NDEF read needed to send tag data
if (!scanRequestActive && quickSpoolIdCheck(uidString)) {
Serial.println("✓ FAST-PATH: Tag processed quickly, skipping full read");
// Set reader back to idle for next scan
nfcReaderState = NFC_READ_SUCCESS;
@@ -2157,16 +2232,48 @@ void scanRfidTask(void * parameter) {
}
else
{
// 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, tr(STR_FAILURE), tr(STR_UNKNOWN_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");
// UID length != 7 — could be Mifare Classic (BambuLab) or non-standard NTAG.
// Try NTAG-style NDEF read first to check for openspool/filaman protocol.
Serial.println("UID length != 7, checking for openspool/filaman protocol first...");
activeTagUuid = uidString;
bool handledAsNdef = false;
uint16_t tagSize = readTagSize();
if (tagSize > 0)
{
uint8_t* data = (uint8_t*)malloc(tagSize);
memset(data, 0, tagSize);
uint8_t numPages = tagSize / 4;
for (uint8_t i = 4; i < 4 + numPages; i++) {
if (!robustPageRead(i, data + (i - 4) * 4)) {
Serial.printf("Page %d read failed, stopping\n", i);
break;
}
if (data[(i - 4) * 4] == 0xFE) {
Serial.println("Found NDEF end marker");
break;
}
yield();
esp_task_wdt_reset();
vTaskDelay(pdMS_TO_TICKS(2));
}
if (decodeNdefAndReturnJson(data, uidString)) {
handledAsNdef = true;
nfcReaderState = NFC_READ_SUCCESS;
}
free(data);
}
if (!handledAsNdef)
{
Serial.println("No NDEF/openspool protocol found, trying Bambu Lab tag...");
if (!detectBambuTag(uid, uidLength)) {
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
activeSpoolId = "";
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
}
}
}
}
+2
View File
@@ -28,6 +28,7 @@ void scanRfidTask(void * parameter);
void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId = 0, int locationId = 0);
bool quickSpoolIdCheck(String uidString);
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
void setScanRequest(bool active);
extern TaskHandle_t RfidReaderTask;
extern String nfcJsonData;
@@ -36,6 +37,7 @@ extern String activeTagUuid;
extern String lastSpoolId;
extern volatile nfcReaderStateType nfcReaderState;
extern volatile bool nfcWriteInProgress;
extern volatile bool scanRequestActive;
extern bool tagProcessed;
extern bool isBambuTag;
+5
View File
@@ -285,6 +285,11 @@ void setupWebserver(AsyncWebServer &server) {
request->send(200, "application/json", "{\"success\": true}");
});
server.on("/api/v1/rfid/scan-request", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
setScanRequest(true);
request->send(200, "application/json", "{\"success\": true}");
});
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "text/plain", "Rebooting...");
delay(500);
+59 -29
View File
@@ -17,16 +17,54 @@ void wifiSettings() {
WiFi.mode(WIFI_STA);
WiFi.setHostname("FilaMan");
// ESP32-Core Auto-Reconnect aktivieren (unabhängig vom WiFiManager-Flag).
// Sorgt dafür, dass der WiFi-Stack autonom direkt nach einem Disconnect
// neu verbindet, ohne auf das 15s-Polling in checkWiFiConnection() warten zu müssen.
WiFi.setAutoReconnect(true);
WiFi.persistent(true);
// KRITISCH: Power-Save deaktivieren für stabilen Webserver-Betrieb
// Ohne dies geht WiFi in Modem-Sleep und verpasst Requests/Responses
// Dies ist die Hauptursache für Verbindungsabbrüche bei regelmäßigen API-Calls
WiFi.setSleep(false);
esp_wifi_set_ps(WIFI_PS_NONE);
// Angemessene Sendeleistung (reduziert Hitzeprobleme)
WiFi.setTxPower(WIFI_POWER_17dBm);
// Aktiviere WiFi-Roaming für bessere Stabilität bei schwachem Signal
esp_wifi_set_rssi_threshold(-80);
// Hinweis: Kein esp_wifi_set_rssi_threshold() mehr.
// Der vorherige Wert (-80 dBm) löste in Single-AP-Heimnetzen häufige
// Disconnects aus, sobald das Signal in den normalen Wohnungs-Empfangsbereich
// fiel. Ohne Mesh-/Roaming-Setup bringt der Threshold keinen Vorteil.
}
// Reagiert sofort auf Verbindungsverlust, statt bis zum nächsten
// checkWiFiConnection()-Tick zu warten. Das ESP32-Auto-Reconnect übernimmt
// die eigentliche Wiederherstellung; hier nur Logging + Display-Update.
void onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
switch (event) {
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
Serial.printf("WiFi event: STA_DISCONNECTED, reason=%u\n",
info.wifi_sta_disconnected.reason);
if (wifiOn) {
wifiOn = false;
oledShowTopRow();
}
break;
case ARDUINO_EVENT_WIFI_STA_GOT_IP:
Serial.print("WiFi event: STA_GOT_IP ");
Serial.println(WiFi.localIP());
wifiOn = true;
wifiErrorCounter = 0;
// Power-Save nach Reconnect erneut deaktivieren (wird vom Stack
// gelegentlich zurückgesetzt).
WiFi.setSleep(false);
esp_wifi_set_ps(WIFI_PS_NONE);
oledShowTopRow();
break;
default:
break;
}
}
void configModeCallback (WiFiManager *myWiFiManager) {
@@ -39,6 +77,10 @@ void initWiFi() {
// load Wifi settings
wifiSettings();
// WiFi-Events abonnieren, bevor autoConnect() läuft, damit auch frühe
// Disconnects/Reconnects schon erfasst werden.
WiFi.onEvent(onWiFiEvent);
wm.setAPCallback(configModeCallback);
wm.setSaveConfigCallback([]() {
@@ -48,7 +90,10 @@ void initWiFi() {
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
wm.setWiFiAutoReconnect(true);
// WiFiManager-Reconnect deaktiviert: der ESP32-Stack übernimmt das via
// setAutoReconnect(true). Zwei parallele Reconnect-Mechanismen erzeugen
// sonst einen Verbindungssturm, der den Router zu AUTH_EXPIRE-Kicks verleitet.
wm.setWiFiAutoReconnect(false);
wm.setConnectTimeout(10);
oledShowProgressBar(1, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
@@ -75,39 +120,24 @@ void initWiFi() {
void checkWiFiConnection() {
if (WiFi.status() != WL_CONNECTED)
{
if (wifiOn) {
Serial.println("WiFi connection lost. Attempting active reconnect...");
wifiOn = false;
oledShowTopRow();
oledDisplayText(tr(STR_WIFI_RECONNECTING));
// Aktiver Reconnect-Versuch statt nur auf LwIP auto-reconnect zu warten
WiFi.reconnect();
}
// setAutoReconnect(true) übernimmt die Wiederverbindung automatisch.
// Hier nur Display-Update und Fehler zählen für den Neustart-Watchdog.
oledDisplayText(tr(STR_WIFI_RECONNECTING));
wifiErrorCounter++;
// Only restart after a significant time of no connection (e.g. 5 minutes)
// Assuming WIFI_CHECK_INTERVAL is 60000ms (1 minute), 5 errors = 5 minutes
if (wifiErrorCounter >= 5)
// Nach ca. 5 Minuten ohne Verbindung Neustart (bei WIFI_CHECK_INTERVAL
// = 15s entspricht das 20 Fehlern).
const uint8_t maxErrors = (uint8_t)(300000UL / WIFI_CHECK_INTERVAL);
if (wifiErrorCounter >= maxErrors)
{
Serial.println("WiFi unable to reconnect for 5 minutes. Restarting...");
Serial.println("WiFi unable to reconnect for ~5 minutes. Restarting...");
ESP.restart();
}
}
else
{
if (!wifiOn) {
Serial.println("WiFi reconnected successfully.");
wifiErrorCounter = 0;
wifiOn = true;
oledShowTopRow();
// Power-Save erneut deaktivieren nach Reconnect (wird manchmal zurückgesetzt)
esp_wifi_set_ps(WIFI_PS_NONE);
} else {
// Reset error counter if we are connected (just to be safe)
wifiErrorCounter = 0;
}
// Connected: Fehlerzähler zurücksetzen. wifiOn wird vom GOT_IP-Event
// gepflegt, daher hier nichts weiter zu tun.
wifiErrorCounter = 0;
}
}