Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f6b6df55c8 | ||
|
|
f3426119e8 | ||
|
|
dd508e2e1e | ||
|
|
0ab3db5f2d | ||
|
|
f86d71f8b2 | ||
|
|
b2ac1e9fcd | ||
|
|
f2c1d44f5a | ||
|
|
3c9a0f17ba | ||
|
|
6a9acb9d27 | ||
|
|
9b93d219f9 | ||
|
|
f3f51cd6f8 | ||
|
|
9d3a3411fb | ||
|
|
775700f90f | ||
|
|
9456e6ab91 | ||
|
|
30409a59e0 | ||
|
|
17f86a0094 | ||
|
|
eb1c032444 | ||
|
|
696b8ba518 | ||
|
|
728c40f0fa | ||
|
|
d0d2dbb274 | ||
|
|
4a377b25e0 | ||
|
|
075459b890 | ||
|
|
bece16f012 | ||
|
|
14fa6e7fd0 | ||
|
|
4daa74bbfb | ||
|
|
4b74bc8988 | ||
|
|
f09e552e3d | ||
|
|
6de2e8728c | ||
|
|
60f08ea640 | ||
|
|
7fdfc79a2a | ||
|
|
894d1d25dd | ||
|
|
a3dd4b164e | ||
|
|
0f8d3d470d | ||
|
|
20ab21dae5 | ||
|
|
a14ab8fa55 | ||
|
|
96a5e184dd | ||
|
|
bc0d586c9e | ||
|
|
ddf981b971 | ||
|
|
1b7a71b617 | ||
|
|
87a0403735 | ||
|
|
97a2ecca41 | ||
|
|
fe768cf631 | ||
|
|
60af915c9f | ||
|
|
4d318bf4ec | ||
|
|
9311162463 | ||
|
|
067807d1a6 | ||
|
|
04bf05cb05 | ||
|
|
045e450744 | ||
|
|
7b03b359ba | ||
|
|
a5d9902149 | ||
|
|
1c19413970 | ||
|
|
35e0167398 | ||
|
|
89f176b188 | ||
|
|
b78f34c1d3 |
No files matched your search
@@ -6,6 +6,18 @@ on:
|
|||||||
GITEA_TOKEN:
|
GITEA_TOKEN:
|
||||||
description: 'Token für Gitea API-Zugriff'
|
description: 'Token für Gitea API-Zugriff'
|
||||||
required: true
|
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:
|
outputs:
|
||||||
version:
|
version:
|
||||||
@@ -212,3 +224,31 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
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:
|
RELEASE_TOKEN:
|
||||||
description: 'GitHub token for release creation'
|
description: 'GitHub token for release creation'
|
||||||
required: true
|
required: true
|
||||||
FTP_PASSWORD:
|
|
||||||
description: 'FTP Password'
|
|
||||||
required: false
|
|
||||||
FTP_USER:
|
|
||||||
description: 'FTP User'
|
|
||||||
required: false
|
|
||||||
FTP_HOST:
|
|
||||||
description: 'FTP Host'
|
|
||||||
required: false
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -160,29 +151,3 @@ jobs:
|
|||||||
echo "Error: No files found to upload"
|
echo "Error: No files found to upload"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
uses: ./.github/workflows/github-release.yml
|
||||||
secrets:
|
secrets:
|
||||||
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
|
||||||
FTP_USER: ${{ secrets.FTP_USER }}
|
|
||||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
|
||||||
|
|
||||||
gitea-release:
|
gitea-release:
|
||||||
needs: detect-provider
|
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
|
uses: ./.github/workflows/gitea-release.yml
|
||||||
secrets:
|
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 }}
|
||||||
@@ -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.
|
||||||
Generated
+380
@@ -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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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!
|
||||||
@@ -6,6 +6,7 @@ FilaMan ist ein Werkzeug zur Filamentverwaltung für den 3D-Druck. Es verwendet
|
|||||||
Benutzer können Filamentspulen verwalten und das Gerät über eine Weboberfläche konfigurieren.
|
Benutzer können Filamentspulen verwalten und das Gerät über eine Weboberfläche konfigurieren.
|
||||||
Das System integriert sich nahtlos in das [FilaMan-System](https://github.com/Fire-Devils/filaman-system).
|
Das System integriert sich nahtlos in das [FilaMan-System](https://github.com/Fire-Devils/filaman-system).
|
||||||
|
|
||||||
|
**NEU ab 3.3.1:** Eine abgespeckte Version ohne Waage ist ebenfalls möglich. Details finden sich unter [NFC-only Modus](docs/NFC-only_mode_de.md).
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ FilaMan is a filament management tool for 3D printing. It uses ESP32 hardware fo
|
|||||||
Users can manage filament spools and configure the device via a web interface.
|
Users can manage filament spools and configure the device via a web interface.
|
||||||
The system integrates seamlessly with the [FilaMan-System](https://github.com/Fire-Devils/filaman-system).
|
The system integrates seamlessly with the [FilaMan-System](https://github.com/Fire-Devils/filaman-system).
|
||||||
|
|
||||||
|
**NEW since 3.3.1:** A reduced version w/o scale is also available. Details can be found in [NFC-only mode](docs/NFC-only_mode_en.md).
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|||||||
+94
-4
@@ -41,11 +41,11 @@
|
|||||||
|
|
||||||
<div class="fm-card">
|
<div class="fm-card">
|
||||||
<h2>System Registration</h2>
|
<h2>System Registration</h2>
|
||||||
<p>Current Status: <strong style="color: var(--accent);">{{registered}}</strong></p>
|
<p>Current Status: <strong style="color: var(--accent);">%registered%</strong></p>
|
||||||
|
|
||||||
<div class="fm-form-group" style="margin-top: 2rem;">
|
<div class="fm-form-group" style="margin-top: 2rem;">
|
||||||
<label class="fm-label" for="filamanUrl">FilaMan API URL</label>
|
<label class="fm-label" for="filamanUrl">FilaMan API URL</label>
|
||||||
<input type="text" id="filamanUrl" class="fm-input" value="{{filamanUrl}}" placeholder="e.g. http://192.168.1.10:8000">
|
<input type="text" id="filamanUrl" class="fm-input" value="%filamanUrl%" placeholder="e.g. http://192.168.1.10:8000">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="fm-form-group">
|
<div class="fm-form-group">
|
||||||
@@ -57,6 +57,36 @@
|
|||||||
<button id="registerBtn" class="fm-btn fm-btn-primary">Register Device</button>
|
<button id="registerBtn" class="fm-btn fm-btn-primary">Register Device</button>
|
||||||
<div id="statusMessage" style="margin-top: 1.5rem;"></div>
|
<div id="statusMessage" style="margin-top: 1.5rem;"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="fm-card">
|
||||||
|
<h2>General Settings</h2>
|
||||||
|
|
||||||
|
<div class="fm-form-group" style="margin-top: 1rem;">
|
||||||
|
<label class="fm-label" for="languageSelect">Display Language</label>
|
||||||
|
<select id="languageSelect" class="fm-input">
|
||||||
|
<option value="en">English</option>
|
||||||
|
<option value="de">Deutsch</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fm-card">
|
||||||
|
<h2>Display Settings</h2>
|
||||||
|
|
||||||
|
<div class="fm-form-group" style="margin-top: 1rem;">
|
||||||
|
<label class="fm-label" for="sleepTimeoutSelect">OLED Sleep Timeout</label>
|
||||||
|
<select id="sleepTimeoutSelect" class="fm-input">
|
||||||
|
<option value="0">Disabled (always on)</option>
|
||||||
|
<option value="30">30 seconds</option>
|
||||||
|
<option value="60">1 minute</option>
|
||||||
|
<option value="120">2 minutes</option>
|
||||||
|
<option value="300">5 minutes</option>
|
||||||
|
<option value="600">10 minutes</option>
|
||||||
|
</select>
|
||||||
|
<p style="font-size: 0.8rem; margin-top: 0.5rem;">Display wakes automatically on weight change or NFC tag read.</p>
|
||||||
|
</div>
|
||||||
|
<div id="sleepStatusMessage" style="margin-top: 0.5rem;"></div>
|
||||||
|
</div>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -70,6 +100,66 @@
|
|||||||
})
|
})
|
||||||
.catch(error => console.error('Error fetching version:', error));
|
.catch(error => console.error('Error fetching version:', error));
|
||||||
|
|
||||||
|
// Language setting
|
||||||
|
fetch('/api/language')
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
document.getElementById('languageSelect').value = data.lang;
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Error fetching language:', error));
|
||||||
|
|
||||||
|
document.getElementById('languageSelect').addEventListener('change', function() {
|
||||||
|
fetch('/api/language', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ lang: this.value })
|
||||||
|
})
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.success) {
|
||||||
|
console.log('Language saved');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Error saving language:', error));
|
||||||
|
});
|
||||||
|
|
||||||
|
// Display sleep timeout setting
|
||||||
|
fetch('/api/display')
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
const sel = document.getElementById('sleepTimeoutSelect');
|
||||||
|
const val = String(data.sleepTimeout);
|
||||||
|
// Select closest matching option
|
||||||
|
let matched = false;
|
||||||
|
for (let i = 0; i < sel.options.length; i++) {
|
||||||
|
if (sel.options[i].value === val) { sel.value = val; matched = true; break; }
|
||||||
|
}
|
||||||
|
if (!matched) sel.value = '0';
|
||||||
|
})
|
||||||
|
.catch(error => console.error('Error fetching display settings:', error));
|
||||||
|
|
||||||
|
document.getElementById('sleepTimeoutSelect').addEventListener('change', function() {
|
||||||
|
const msg = document.getElementById('sleepStatusMessage');
|
||||||
|
fetch('/api/display', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ sleepTimeout: parseInt(this.value) })
|
||||||
|
})
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.success) {
|
||||||
|
msg.textContent = 'Saved.';
|
||||||
|
msg.style.color = 'var(--success-text)';
|
||||||
|
setTimeout(() => { msg.textContent = ''; }, 2000);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
msg.textContent = 'Error saving setting.';
|
||||||
|
msg.style.color = 'var(--error-text)';
|
||||||
|
console.error('Error saving display settings:', error);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
document.getElementById('registerBtn').addEventListener('click', () => {
|
document.getElementById('registerBtn').addEventListener('click', () => {
|
||||||
const url = document.getElementById('filamanUrl').value;
|
const url = document.getElementById('filamanUrl').value;
|
||||||
const code = document.getElementById('deviceCode').value;
|
const code = document.getElementById('deviceCode').value;
|
||||||
@@ -92,9 +182,9 @@
|
|||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
statusMessage.textContent = 'Registration successful! Rebooting...';
|
statusMessage.textContent = 'Registration successful!';
|
||||||
statusMessage.style.color = 'var(--success-text)';
|
statusMessage.style.color = 'var(--success-text)';
|
||||||
setTimeout(() => fetch('/reboot'), 2000);
|
setTimeout(() => location.reload(), 2000);
|
||||||
} else {
|
} else {
|
||||||
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
||||||
statusMessage.style.color = 'var(--error-text)';
|
statusMessage.style.color = 'var(--error-text)';
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@
|
|||||||
<button id="tareBtn" class="fm-btn fm-btn-outline">Tare Scale</button>
|
<button id="tareBtn" class="fm-btn fm-btn-outline">Tare Scale</button>
|
||||||
|
|
||||||
<label class="status-pill" style="display: flex; align-items: center; gap: 0.5rem; cursor: pointer;">
|
<label class="status-pill" style="display: flex; align-items: center; gap: 0.5rem; cursor: pointer;">
|
||||||
<input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" {{autoTare}}>
|
<input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);" %autoTare%>
|
||||||
<span>Enable Auto-TARE</span>
|
<span>Enable Auto-TARE</span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
# NFC-only Modus
|
||||||
|
|
||||||
|
## Beschreibung
|
||||||
|
Es kann praktisch sein, ein kleines Gerät in der Nähe deines Desktop-Computers zu haben, wenn du neue Spulen in deine Datenbank hinzufügst.
|
||||||
|
So kannst du sofort NFC-Tags für sie schreiben. Da keine Waage erforderlich ist (das Gewicht einer neuen Spule ist in der Regel bekannt), ist es sinnvoll, auf diese Funktion zu verzichten, um einen kleineren Formfaktor zu erreichen.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## Bedienung
|
||||||
|
|
||||||
|
Bevor du das NFC-only Terminal verwenden kannst, musst du es in der `FilaMan System App` registrieren, wie bei jeder anderen Waage auch.
|
||||||
|
|
||||||
|
### Tag schreiben
|
||||||
|
Hauptzweck ist das Schreiben neuer NFC-Tags.
|
||||||
|
|
||||||
|
Du startest den Schreibvorgang in der `FilaMan System App` (Web-GUI). Dann wählst du dein NFC-Gerät aus und folgst den Anweisungen auf dem Display.
|
||||||
|
|
||||||
|
### Tag lesen
|
||||||
|
Das Gerät kann Tags zwar lesen, sinnvolle Anwendungsfälle sind jedoch ohne Waage eingeschränkt.
|
||||||
|
Du kannst trotzdem eine Spule identifizieren und ihr einen Standort mit dem entsprechenden Standort-Tag zuweisen.
|
||||||
|
|
||||||
|
Aber ehrlich gesagt: der Hauptzweck des NFC-only Gerätes ist **TAG SCHREIBEN**.
|
||||||
|
|
||||||
|
## NFC-only Modus
|
||||||
|
|
||||||
|
Beim Start versucht der ESP32, den HX711 (Verstärker) zusammen mit einem angeschlossenen Loadcell-Sensor zu erkennen. Wenn das gelingt, startet er im Normalmodus mit voller Funktionalität.
|
||||||
|
|
||||||
|
Andernfalls schaltet er in den **NFC-only Modus**!
|
||||||
|
|
||||||
|
Statt einer Gewichtsanzeige zeigt das Display eine Bereitschaftsmeldung. Zusätzlich ist das Waagensymbol in der oberen Zeile durchgestrichen.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## Aufbau / Installation
|
||||||
|
### Hardware
|
||||||
|
Die Verkabelung der Hardware ist gleich wie bei der originalen, voll ausgestatteten FilaMan-Waage. Es gibt nur 3 Unterschiede:
|
||||||
|
|
||||||
|
- Kein HX711 angeschlossen (und natürlich keine Loadcell)
|
||||||
|
- Kein Tastensensor (ohne Waage ist kein Tarieren nötig)
|
||||||
|
- optional: 10k Pull-up-Widerstand an Pin 16 (RX2)
|
||||||
|
|
||||||
|
Der Pull-up-Widerstand ist nicht zwingend erforderlich, erhöht aber die Zuverlässigkeit beim Erkennen eines fehlenden HX711. Ohne Pull-up-Widerstand sollte es aber ebenfalls funktionieren.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
| Komponente | ESP32 Pin |
|
||||||
|
| ---- | ---- |
|
||||||
|
| 10k Pull-up | 16 |
|
||||||
|
| | 17 |
|
||||||
|
| OLED SDA | 21 |
|
||||||
|
| OLED SCL | 22 |
|
||||||
|
| PN532 IRQ | 32 |
|
||||||
|
| PN532 RESET | 33 |
|
||||||
|
| PN532 SDA | 21 |
|
||||||
|
| PN532 SCL | 22 |
|
||||||
|
|
||||||
|
#### PN532
|
||||||
|
- **!! Stelle sicher, dass die DIP-Schalter des PN532 auf I2C gestellt sind**
|
||||||
|
- Verbinde `VCC` mit 5V
|
||||||
|
|
||||||
|
#### OLED
|
||||||
|
- Verbinde `VCC` mit 3,3V
|
||||||
|
|
||||||
|
#### 10k Widerstand (optional)
|
||||||
|
- Verbinde den Widerstand mit PIN 16 (wo normalerweise der DOUT des HX711 angeschlossen wäre) und 5V
|
||||||
|
|
||||||
|
### Software
|
||||||
|
Folge den Anweisungen in der [Hauptdokumentation](../README.de.md#schritt-für-schritt-installation).
|
||||||
|
|
||||||
|
Du benötigst Version 3.3.1 oder neuer für eine funktionierende Hardware-Erkennung und den NFC-only Modus.
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
# NFC-only mode
|
||||||
|
|
||||||
|
## Description
|
||||||
|
It may be convenient to have a small device near your desktop computer when adding new spools to your database.
|
||||||
|
So you are able to write NFC-tags for them right away. Since there is no need for a scale (the weight of a new
|
||||||
|
spool should be well known), it is pleasant to leave the scale functionality out in advance of a smaller footprint.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
Before you can use the NFC-only device, you have to register it to your FilaMan System App as
|
||||||
|
you would do with any regular scale device.
|
||||||
|
|
||||||
|
### Tag Writing
|
||||||
|
Its main purpose is to write new NFC tags.
|
||||||
|
|
||||||
|
You start the writing process from within the FilaMan System App (Web GUI). You than select
|
||||||
|
your NFC device and follow the instructions on the device display.
|
||||||
|
|
||||||
|
### Tag Reading
|
||||||
|
Although the device is fully capable of tag reading, its use cases are limited due to the lack of a scale.
|
||||||
|
But you can still identify a spool and assign it to a location with the according location tag.
|
||||||
|
|
||||||
|
But to be honest: the main purpose of the NFC-only device is **TAG WRITING**.
|
||||||
|
|
||||||
|
## NFC-only mode
|
||||||
|
|
||||||
|
During startup, the ESP32 tries to detect the HX711 (amplifier) together with a connected
|
||||||
|
loadcell sensor. If successful it starts into normal mode with full functionality.
|
||||||
|
|
||||||
|
Otherwise it switches in **NFC-only mode!**
|
||||||
|
|
||||||
|
Instead of a weight reading the display shows a ready prompts. Additionally the scale icon
|
||||||
|
in the top row is crossed out.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## Build / Installation
|
||||||
|
### Hardware
|
||||||
|
The wiring of the hardware is the same as the original, fully equipped FilaMan scale. There are only 3 differences:
|
||||||
|
|
||||||
|
- No HX711 connected (also no loadcell of course)
|
||||||
|
- No touch sensor (without scale there is no need to tare)
|
||||||
|
- optional: 10k pull-up resistor on Pin 16 (RX2)
|
||||||
|
|
||||||
|
The pull-up resistor is not mandatory, but for good measure. It makes it more reliable to
|
||||||
|
detect a missing hx711. But it should also work w/o the pull-up resistor.
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
| Component | ESP32 Pin |
|
||||||
|
| ---- | ---- |
|
||||||
|
| 10k pull-up | 16 |
|
||||||
|
| | 17 |
|
||||||
|
| OLED SDA | 21 |
|
||||||
|
| OLED SCL. | 22 |
|
||||||
|
| PN532 IRQ | 32 |
|
||||||
|
| PN532 RESET | 33 |
|
||||||
|
| PN532 SDA | 21 |
|
||||||
|
| PN532 SCL | 22 |
|
||||||
|
|
||||||
|
#### PN532
|
||||||
|
- !! Make sure that the DIP switches on the PN532 are set to I2C
|
||||||
|
- Connect `VCC` to 5V
|
||||||
|
|
||||||
|
#### OLED
|
||||||
|
- Connect `VCC` to 3.3V
|
||||||
|
|
||||||
|
#### 10k Resistor (optional)
|
||||||
|
- Connect to PIN 16 (where normally the DOUT of the HX711 would connect to) and 5V
|
||||||
|
|
||||||
|
### Software
|
||||||
|
Follow the instructions in the [main readme](../README.md#step-by-step-installation).
|
||||||
|
|
||||||
|
You need version 3.3.1 or later for a working hardware recognition and NFC-only mode.
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 205 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 59 KiB |
+27
-7
@@ -9,12 +9,12 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "3.2.2"
|
version = "3.4.2"
|
||||||
to_old_version = "3.0.9"
|
to_old_version = "3.4.0"
|
||||||
|
|
||||||
##
|
##
|
||||||
[env:esp32dev]
|
[env:esp32dev]
|
||||||
platform = espressif32
|
platform = espressif32@^6.0.0
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
framework = arduino
|
framework = arduino
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
@@ -55,12 +55,32 @@ build_flags =
|
|||||||
#-DOTA_DEBUG=1
|
#-DOTA_DEBUG=1
|
||||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
||||||
-DBOOT_APP_PARTITION_OTA_0=1
|
-DBOOT_APP_PARTITION_OTA_0=1
|
||||||
-DCONFIG_LWIP_TCP_MSL=60000
|
|
||||||
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096
|
# ===== AsyncTCP Optimierungen - KRITISCH für WiFi-Stabilität =====
|
||||||
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
# Core 1 = Arduino/App Core (nicht Core 0 = WiFi/Protocol Core!)
|
||||||
-DCONFIG_ASYNC_TCP_RUNNING_CORE=0
|
# Schwere Callbacks auf Core 0 stören das WiFi-Radio
|
||||||
|
-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
|
||||||
|
# Längerer ACK-Timeout für instabile Verbindungen (10s statt 5s)
|
||||||
|
-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=10000
|
||||||
|
# Größere Queue für mehr gleichzeitige Requests
|
||||||
|
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
||||||
|
# Mehr Stack für komplexere Callbacks (8KB statt 16KB default, spart RAM)
|
||||||
|
-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
|
||||||
|
# Standard-Priorität beibehalten
|
||||||
|
-DCONFIG_ASYNC_TCP_PRIORITY=10
|
||||||
|
# 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_ASYNC_TCP_USE_WDT=0
|
||||||
|
|
||||||
|
# ===== LwIP Optimierungen für OTA-Uploads (1.5-2MB) =====
|
||||||
|
# Schnellere Socket-Freigabe (30s statt 60s TIME_WAIT)
|
||||||
|
-DCONFIG_LWIP_TCP_MSL=30000
|
||||||
|
# Größerer RX-Buffer für große Uploads (8KB statt 4KB)
|
||||||
|
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=8192
|
||||||
|
# Max aktive TCP-Verbindungen (unverändert)
|
||||||
|
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
||||||
|
|
||||||
extra_scripts =
|
extra_scripts =
|
||||||
scripts/extra_script.py
|
scripts/extra_script.py
|
||||||
|
|
||||||
|
|||||||
+73
-10
@@ -8,6 +8,8 @@
|
|||||||
#include "nfc.h"
|
#include "nfc.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
|
#include "display.h"
|
||||||
|
#include "lang.h"
|
||||||
|
|
||||||
volatile filamanApiStateType filamanApiState = API_IDLE;
|
volatile filamanApiStateType filamanApiState = API_IDLE;
|
||||||
bool filamanConnected = false;
|
bool filamanConnected = false;
|
||||||
@@ -78,10 +80,12 @@ bool registerDevice(const String& deviceCode) {
|
|||||||
bool sendHeartbeat() {
|
bool sendHeartbeat() {
|
||||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||||
HTTPClient http;
|
HTTPClient http;
|
||||||
http.setTimeout(3000);
|
http.setTimeout(10000); // 10s statt 3s - wichtig für instabile Verbindungen
|
||||||
|
http.setReuse(true); // Keep-Alive aktivieren für bessere Performance
|
||||||
http.begin(filamanUrl + "/api/v1/devices/heartbeat");
|
http.begin(filamanUrl + "/api/v1/devices/heartbeat");
|
||||||
http.addHeader("Content-Type", "application/json");
|
http.addHeader("Content-Type", "application/json");
|
||||||
http.addHeader("Authorization", "Device " + filamanToken);
|
http.addHeader("Authorization", "Device " + filamanToken);
|
||||||
|
http.addHeader("Connection", "keep-alive"); // Explizit Keep-Alive anfordern
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc["ip_address"] = WiFi.localIP().toString();
|
doc["ip_address"] = WiFi.localIP().toString();
|
||||||
String payload;
|
String payload;
|
||||||
@@ -92,6 +96,21 @@ bool sendHeartbeat() {
|
|||||||
return filamanConnected;
|
return filamanConnected;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Heartbeat mit Retry-Logik für mehr Stabilität
|
||||||
|
bool sendHeartbeatWithRetry(int maxRetries = 2) {
|
||||||
|
for (int attempt = 0; attempt <= maxRetries; attempt++) {
|
||||||
|
if (sendHeartbeat()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (attempt < maxRetries) {
|
||||||
|
Serial.printf("Heartbeat failed, retry %d/%d...\n", attempt + 1, maxRetries);
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(1000)); // 1s warten vor Retry
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Serial.println("Heartbeat failed after all retries");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
||||||
Serial.printf("sendWeight: sending to API - spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), measuredWeight);
|
Serial.printf("sendWeight: sending to API - spoolId=%d, tagUuid=%s, weight=%.1f\n", spoolId, tagUuid.c_str(), measuredWeight);
|
||||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) {
|
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) {
|
||||||
@@ -99,10 +118,12 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
HTTPClient http;
|
HTTPClient http;
|
||||||
http.setTimeout(3000);
|
http.setTimeout(10000); // 10s Timeout
|
||||||
|
http.setReuse(true);
|
||||||
http.begin(filamanUrl + "/api/v1/devices/scale/weight");
|
http.begin(filamanUrl + "/api/v1/devices/scale/weight");
|
||||||
http.addHeader("Content-Type", "application/json");
|
http.addHeader("Content-Type", "application/json");
|
||||||
http.addHeader("Authorization", "Device " + filamanToken);
|
http.addHeader("Authorization", "Device " + filamanToken);
|
||||||
|
http.addHeader("Connection", "keep-alive");
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
// Only add spool_id if it's > 0 (for NTAG tags with spool ID)
|
// Only add spool_id if it's > 0 (for NTAG tags with spool ID)
|
||||||
// For Bambu tags (spoolId == 0), only send tag_uuid
|
// For Bambu tags (spoolId == 0), only send tag_uuid
|
||||||
@@ -122,19 +143,19 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
|||||||
DeserializationError error = deserializeJson(responseDoc, response);
|
DeserializationError error = deserializeJson(responseDoc, response);
|
||||||
if (!error && responseDoc["remaining_weight_g"].is<float>()) {
|
if (!error && responseDoc["remaining_weight_g"].is<float>()) {
|
||||||
int remaining = (int)responseDoc["remaining_weight_g"].as<float>();
|
int remaining = (int)responseDoc["remaining_weight_g"].as<float>();
|
||||||
pauseMainTask = 1;
|
|
||||||
oledShowRemainingWeight(remaining);
|
oledShowRemainingWeight(remaining);
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
pauseMainTask = 0;
|
oledClearPriority();
|
||||||
}
|
}
|
||||||
http.end();
|
http.end();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
pauseMainTask = 1;
|
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_API_ERROR));
|
||||||
oledShowProgressBar(1, 1, "Failure", "API Error");
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||||
pauseMainTask = 0;
|
oledClearPriority();
|
||||||
}
|
}
|
||||||
|
|
||||||
http.end();
|
http.end();
|
||||||
@@ -144,10 +165,12 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
|||||||
bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid) {
|
bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid) {
|
||||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||||
HTTPClient http;
|
HTTPClient http;
|
||||||
http.setTimeout(3000);
|
http.setTimeout(10000); // 10s Timeout
|
||||||
|
http.setReuse(true);
|
||||||
http.begin(filamanUrl + "/api/v1/devices/scale/locate");
|
http.begin(filamanUrl + "/api/v1/devices/scale/locate");
|
||||||
http.addHeader("Content-Type", "application/json");
|
http.addHeader("Content-Type", "application/json");
|
||||||
http.addHeader("Authorization", "Device " + filamanToken);
|
http.addHeader("Authorization", "Device " + filamanToken);
|
||||||
|
http.addHeader("Connection", "keep-alive");
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
if (spoolId > 0) doc["spool_id"] = spoolId;
|
if (spoolId > 0) doc["spool_id"] = spoolId;
|
||||||
if (spoolTagUuid.length() > 0) doc["spool_tag_uuid"] = spoolTagUuid;
|
if (spoolTagUuid.length() > 0) doc["spool_tag_uuid"] = spoolTagUuid;
|
||||||
@@ -163,10 +186,12 @@ bool sendLocation(int spoolId, String spoolTagUuid, int locationId, String locat
|
|||||||
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) {
|
bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight) {
|
||||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||||
HTTPClient http;
|
HTTPClient http;
|
||||||
http.setTimeout(5000);
|
http.setTimeout(10000); // 10s Timeout
|
||||||
|
http.setReuse(true);
|
||||||
http.begin(filamanUrl + "/api/v1/devices/rfid-result");
|
http.begin(filamanUrl + "/api/v1/devices/rfid-result");
|
||||||
http.addHeader("Content-Type", "application/json");
|
http.addHeader("Content-Type", "application/json");
|
||||||
http.addHeader("Authorization", "Device " + filamanToken);
|
http.addHeader("Authorization", "Device " + filamanToken);
|
||||||
|
http.addHeader("Connection", "keep-alive");
|
||||||
|
|
||||||
JsonDocument doc;
|
JsonDocument doc;
|
||||||
doc["success"] = success;
|
doc["success"] = success;
|
||||||
@@ -183,6 +208,25 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
|
|||||||
return (httpCode == 200);
|
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) {
|
void filamanApiTask(void* pvParameters) {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
ApiRequest req;
|
ApiRequest req;
|
||||||
@@ -203,10 +247,11 @@ void filamanApiTask(void* pvParameters) {
|
|||||||
if (hasReq) {
|
if (hasReq) {
|
||||||
filamanApiState = API_TRANSMITTING;
|
filamanApiState = API_TRANSMITTING;
|
||||||
switch (req.type) {
|
switch (req.type) {
|
||||||
case API_REQUEST_HEARTBEAT: sendHeartbeat(); break;
|
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break;
|
||||||
case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); 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_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_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;
|
default: break;
|
||||||
}
|
}
|
||||||
filamanApiState = API_IDLE;
|
filamanApiState = API_IDLE;
|
||||||
@@ -298,7 +343,25 @@ 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() {
|
bool initFilaman() {
|
||||||
|
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
|
||||||
loadFilamanConfig();
|
loadFilamanConfig();
|
||||||
queueMutex = xSemaphoreCreateMutex();
|
queueMutex = xSemaphoreCreateMutex();
|
||||||
// Move to Core 1 (Hardware Core) to free up Core 0 for WiFi/Webserver
|
// Move to Core 1 (Hardware Core) to free up Core 0 for WiFi/Webserver
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ typedef enum {
|
|||||||
API_REQUEST_HEARTBEAT,
|
API_REQUEST_HEARTBEAT,
|
||||||
API_REQUEST_WEIGHT,
|
API_REQUEST_WEIGHT,
|
||||||
API_REQUEST_LOCATE,
|
API_REQUEST_LOCATE,
|
||||||
API_REQUEST_RFID_RESULT
|
API_REQUEST_RFID_RESULT,
|
||||||
|
API_REQUEST_TAG_DATA
|
||||||
} FilamanApiRequestType;
|
} FilamanApiRequestType;
|
||||||
|
|
||||||
extern volatile filamanApiStateType filamanApiState;
|
extern volatile filamanApiStateType filamanApiState;
|
||||||
@@ -30,6 +31,7 @@ void sendHeartbeatAsync();
|
|||||||
void sendWeightAsync(int spoolId, String tagUuid, float weight);
|
void sendWeightAsync(int spoolId, String tagUuid, float weight);
|
||||||
void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
|
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 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)
|
// Internal blocking functions (used by async task)
|
||||||
bool sendHeartbeat();
|
bool sendHeartbeat();
|
||||||
|
|||||||
+12
-2
@@ -57,10 +57,20 @@ String readFile(const char* filename) {
|
|||||||
Serial.println(filename);
|
Serial.println(filename);
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
String content = "";
|
|
||||||
|
// Effizient: Speicher vorab allokieren und in Blöcken lesen
|
||||||
|
// Alte Implementierung war O(n²) wegen Byte-für-Byte String-Konkatenation
|
||||||
|
size_t fileSize = file.size();
|
||||||
|
String content;
|
||||||
|
content.reserve(fileSize + 1); // Speicher vorab allokieren
|
||||||
|
|
||||||
|
// Lese in 512-Byte Blöcken statt Byte für Byte
|
||||||
|
char buffer[512];
|
||||||
while (file.available()) {
|
while (file.available()) {
|
||||||
content += (char)file.read();
|
size_t bytesRead = file.readBytes(buffer, sizeof(buffer));
|
||||||
|
content.concat(buffer, bytesRead);
|
||||||
}
|
}
|
||||||
|
|
||||||
file.close();
|
file.close();
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-1
@@ -42,7 +42,9 @@ String filamanToken = "";
|
|||||||
bool filamanRegistered = false;
|
bool filamanRegistered = false;
|
||||||
// ***** API
|
// ***** API
|
||||||
|
|
||||||
// ***** Bambu Auto Set Spool
|
// ***** Display Sleep
|
||||||
|
uint16_t oledSleepTimeout = 60; // Default 60 seconds (0 = disabled)
|
||||||
|
// ***** Display Sleep
|
||||||
|
|
||||||
// ***** Task Prios
|
// ***** Task Prios
|
||||||
uint8_t rfidTaskCore = 1;
|
uint8_t rfidTaskCore = 1;
|
||||||
|
|||||||
+8
-1
@@ -11,6 +11,10 @@
|
|||||||
#define NVS_NAMESPACE_SCALE "scale"
|
#define NVS_NAMESPACE_SCALE "scale"
|
||||||
#define NVS_KEY_CALIBRATION "cal_value"
|
#define NVS_KEY_CALIBRATION "cal_value"
|
||||||
#define NVS_KEY_AUTOTARE "auto_tare"
|
#define NVS_KEY_AUTOTARE "auto_tare"
|
||||||
|
|
||||||
|
#define NVS_NAMESPACE_SETTINGS "settings"
|
||||||
|
#define NVS_KEY_LANGUAGE "language"
|
||||||
|
#define NVS_KEY_OLED_SLEEP "oled_sleep"
|
||||||
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
|
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
|
||||||
|
|
||||||
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
|
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
|
||||||
@@ -21,10 +25,12 @@
|
|||||||
#define SCREEN_PROGRESS_BAR_HEIGHT 12U
|
#define SCREEN_PROGRESS_BAR_HEIGHT 12U
|
||||||
#define DISPLAY_BOOT_TEXT "FilaMan"
|
#define DISPLAY_BOOT_TEXT "FilaMan"
|
||||||
|
|
||||||
#define WIFI_CHECK_INTERVAL 60000U
|
#define WIFI_CHECK_INTERVAL 15000U
|
||||||
#define DISPLAY_UPDATE_INTERVAL 1000U
|
#define DISPLAY_UPDATE_INTERVAL 1000U
|
||||||
#define FILAMAN_HEARTBEAT_INTERVAL 60000U
|
#define FILAMAN_HEARTBEAT_INTERVAL 60000U
|
||||||
|
|
||||||
|
#define NUM_SETUP_STEPS 6 // 0:Display 1:WiFi 2:Web-Server 3:API 4:NFC 5:Scale 6:<finished>
|
||||||
|
|
||||||
extern const uint8_t PN532_IRQ;
|
extern const uint8_t PN532_IRQ;
|
||||||
extern const uint8_t PN532_RESET;
|
extern const uint8_t PN532_RESET;
|
||||||
|
|
||||||
@@ -67,4 +73,5 @@ extern uint8_t scaleTaskCore;
|
|||||||
extern uint8_t scaleTaskPrio;
|
extern uint8_t scaleTaskPrio;
|
||||||
|
|
||||||
extern uint16_t defaultScaleCalibrationValue;
|
extern uint16_t defaultScaleCalibrationValue;
|
||||||
|
extern uint16_t oledSleepTimeout;
|
||||||
#endif
|
#endif
|
||||||
+138
-32
@@ -3,12 +3,105 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include "icons.h"
|
#include "icons.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include <cstring>
|
||||||
|
#include "lang.h"
|
||||||
|
#include <Preferences.h>
|
||||||
|
|
||||||
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
|
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
|
||||||
|
|
||||||
bool wifiOn = false;
|
bool wifiOn = false;
|
||||||
bool iconToggle = false;
|
bool iconToggle = false;
|
||||||
|
|
||||||
|
// Display priority management
|
||||||
|
static DisplayPriority currentPriority = DISPLAY_PRIORITY_NONE;
|
||||||
|
static unsigned long prioritySetTime = 0;
|
||||||
|
static unsigned long priorityMinDuration = 0;
|
||||||
|
|
||||||
|
// Display sleep management
|
||||||
|
static bool oledAsleep = false;
|
||||||
|
static unsigned long lastActivityMillis = 0;
|
||||||
|
|
||||||
|
void oledWake() {
|
||||||
|
if (oledAsleep) {
|
||||||
|
display.ssd1306_command(SSD1306_DISPLAYON);
|
||||||
|
oledAsleep = false;
|
||||||
|
}
|
||||||
|
lastActivityMillis = millis();
|
||||||
|
}
|
||||||
|
|
||||||
|
void oledSleep() {
|
||||||
|
if (!oledAsleep) {
|
||||||
|
display.ssd1306_command(SSD1306_DISPLAYOFF);
|
||||||
|
oledAsleep = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void oledResetActivityTimer() {
|
||||||
|
lastActivityMillis = millis();
|
||||||
|
if (oledAsleep) {
|
||||||
|
oledWake();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void oledCheckSleep() {
|
||||||
|
if (oledSleepTimeout == 0 || oledAsleep) return;
|
||||||
|
if (millis() - lastActivityMillis >= (unsigned long)oledSleepTimeout * 1000UL) {
|
||||||
|
oledSleep();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isOledAsleep() {
|
||||||
|
return oledAsleep;
|
||||||
|
}
|
||||||
|
|
||||||
|
void loadOledSleepTimeout() {
|
||||||
|
Preferences preferences;
|
||||||
|
preferences.begin(NVS_NAMESPACE_SETTINGS, true);
|
||||||
|
oledSleepTimeout = preferences.getUShort(NVS_KEY_OLED_SLEEP, 60);
|
||||||
|
preferences.end();
|
||||||
|
Serial.print("OLED sleep timeout loaded: ");
|
||||||
|
Serial.println(oledSleepTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
void saveOledSleepTimeout(uint16_t timeoutSecs) {
|
||||||
|
oledSleepTimeout = timeoutSecs;
|
||||||
|
Preferences preferences;
|
||||||
|
preferences.begin(NVS_NAMESPACE_SETTINGS, false);
|
||||||
|
preferences.putUShort(NVS_KEY_OLED_SLEEP, timeoutSecs);
|
||||||
|
preferences.end();
|
||||||
|
}
|
||||||
|
|
||||||
|
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() {
|
void setupDisplay() {
|
||||||
if (!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
|
if (!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
|
||||||
Serial.println(F("SSD1306 allocation failed"));
|
Serial.println(F("SSD1306 allocation failed"));
|
||||||
@@ -17,29 +110,20 @@ void setupDisplay() {
|
|||||||
display.setTextColor(WHITE);
|
display.setTextColor(WHITE);
|
||||||
display.clearDisplay();
|
display.clearDisplay();
|
||||||
|
|
||||||
|
// Load sleep timeout from NVS
|
||||||
|
loadOledSleepTimeout();
|
||||||
|
lastActivityMillis = millis();
|
||||||
|
|
||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
oledShowProgressBar(0, 7, DISPLAY_BOOT_TEXT, "Display init");
|
oledShowProgressBar(0, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_DISPLAY_INIT));
|
||||||
}
|
}
|
||||||
|
|
||||||
void oledclearline() {
|
void oledclearline() {
|
||||||
int x, y;
|
display.fillRect(0, 0, SCREEN_WIDTH, 16, BLACK);
|
||||||
for (y = 0; y < 16; y++) {
|
|
||||||
for (x = 0; x < SCREEN_WIDTH; x++) {
|
|
||||||
display.drawPixel(x, y, BLACK);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//display.display();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void oledcleardata() {
|
void oledcleardata() {
|
||||||
int x, y;
|
display.fillRect(0, OLED_DATA_START, SCREEN_WIDTH, OLED_DATA_END - OLED_DATA_START, BLACK);
|
||||||
for (y = OLED_DATA_START; y < OLED_DATA_END; y++) {
|
|
||||||
for (x = 0; x < SCREEN_WIDTH; x++) {
|
|
||||||
display.drawPixel(x, y, BLACK);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//display.display();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int oled_center_h(const String &text) {
|
int oled_center_h(const String &text) {
|
||||||
@@ -166,6 +250,12 @@ void oledDisplayText(const String &message, uint8_t size) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void oledShowTopRow() {
|
void oledShowTopRow() {
|
||||||
|
const u_int8_t rightmost_x = 108;
|
||||||
|
const u_int8_t x_offset = 25;
|
||||||
|
const u_int8_t symbol_width =16;
|
||||||
|
const u_int8_t symbol_height =16;
|
||||||
|
u_int8_t x_pos = rightmost_x;
|
||||||
|
|
||||||
oledclearline();
|
oledclearline();
|
||||||
|
|
||||||
display.setTextSize(1);
|
display.setTextSize(1);
|
||||||
@@ -175,27 +265,43 @@ void oledShowTopRow() {
|
|||||||
|
|
||||||
iconToggle = !iconToggle;
|
iconToggle = !iconToggle;
|
||||||
|
|
||||||
|
// draw symbols from right to left
|
||||||
// Do not show status indicators during boot
|
// Do not show status indicators during boot
|
||||||
if(!booting){
|
if(!booting){
|
||||||
if (filamanConnected) {
|
// WiFi
|
||||||
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
|
x_pos = rightmost_x;
|
||||||
|
if (wifiOn == 1) {
|
||||||
|
display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, WHITE);
|
||||||
} else {
|
} else {
|
||||||
if(iconToggle){
|
if(iconToggle){
|
||||||
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
|
display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, WHITE);
|
||||||
display.drawLine(80, 15, 96, 0, WHITE);
|
display.drawLine(x_pos, symbol_height-1, x_pos + symbol_width, 0, WHITE);
|
||||||
display.drawLine(81, 15, 97, 0, WHITE);
|
display.drawLine(x_pos+1, symbol_height-1, x_pos+1 + symbol_width, 0, WHITE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wifiOn == 1) {
|
// Backend
|
||||||
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
|
x_pos -= x_offset; // change x position to the left
|
||||||
|
if (filamanConnected) {
|
||||||
|
display.drawBitmap(x_pos, 0, bitmap_spoolman_on , symbol_width, symbol_height, WHITE);
|
||||||
} else {
|
} else {
|
||||||
if(iconToggle){
|
if(iconToggle){
|
||||||
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
|
display.drawBitmap(x_pos, 0, bitmap_spoolman_on , symbol_width, symbol_height, WHITE);
|
||||||
display.drawLine(107, 15, 123, 0, WHITE);
|
display.drawLine(x_pos, symbol_height-1, x_pos + symbol_width, 0, WHITE);
|
||||||
display.drawLine(108, 15, 124, 0, WHITE);
|
display.drawLine(x_pos+1, symbol_height-1, x_pos+1 + symbol_width, 0, WHITE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Scale
|
||||||
|
x_pos -= x_offset; // change x position to the left
|
||||||
|
if (scaleConnected) {
|
||||||
|
display.drawBitmap(x_pos, 0, bitmap_scale_on , symbol_width, symbol_height, WHITE);
|
||||||
|
} else {
|
||||||
|
display.drawBitmap(x_pos, 0, bitmap_scale_on , symbol_width, symbol_height, WHITE);
|
||||||
|
display.drawLine(x_pos-1, symbol_height-1, x_pos-1 + symbol_width, 0, WHITE);
|
||||||
|
display.drawLine(x_pos, symbol_height-1, x_pos + symbol_width, 0, WHITE);
|
||||||
|
display.drawLine(x_pos+1, symbol_height-1, x_pos+1 + symbol_width, 0, WHITE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
display.display();
|
display.display();
|
||||||
@@ -207,16 +313,16 @@ void oledShowIcon(const char* icon) {
|
|||||||
uint16_t iconSize = OLED_DATA_END-OLED_DATA_START;
|
uint16_t iconSize = OLED_DATA_END-OLED_DATA_START;
|
||||||
uint16_t iconStart = (SCREEN_WIDTH - iconSize) / 2;
|
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);
|
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);
|
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);
|
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);
|
display.drawBitmap(iconStart, OLED_DATA_START, icon_loading , iconSize, iconSize, WHITE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -244,7 +350,7 @@ void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char*
|
|||||||
display.display();
|
display.display();
|
||||||
}
|
}
|
||||||
|
|
||||||
void oledShowWeight(uint16_t weight) {
|
void oledShowWeight(int16_t weight) {
|
||||||
// Display Gewicht
|
// Display Gewicht
|
||||||
oledcleardata();
|
oledcleardata();
|
||||||
display.setTextSize(3);
|
display.setTextSize(3);
|
||||||
@@ -257,8 +363,8 @@ void oledShowWeight(uint16_t weight) {
|
|||||||
void oledShowRemainingWeight(uint16_t remainingWeight) {
|
void oledShowRemainingWeight(uint16_t remainingWeight) {
|
||||||
oledcleardata();
|
oledcleardata();
|
||||||
display.setTextSize(1);
|
display.setTextSize(1);
|
||||||
display.setCursor(oled_center_h("Weight sent, rest:"), OLED_DATA_START + 4);
|
display.setCursor(oled_center_h(tr(STR_WEIGHT_SENT_REST)), OLED_DATA_START + 4);
|
||||||
display.print("Weight sent, rest:");
|
display.print(tr(STR_WEIGHT_SENT_REST));
|
||||||
|
|
||||||
display.setTextSize(3);
|
display.setTextSize(3);
|
||||||
String weightStr = String(remainingWeight) + " g";
|
String weightStr = String(remainingWeight) + " g";
|
||||||
|
|||||||
+24
-1
@@ -6,19 +6,42 @@
|
|||||||
#include <Adafruit_SSD1306.h>
|
#include <Adafruit_SSD1306.h>
|
||||||
#include "config.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 Adafruit_SSD1306 display;
|
||||||
extern bool wifiOn;
|
extern bool wifiOn;
|
||||||
|
|
||||||
|
// Display priority management
|
||||||
|
bool oledCanUpdate(DisplayPriority newPriority);
|
||||||
|
void oledSetPriority(DisplayPriority priority, unsigned long minDurationMs);
|
||||||
|
void oledClearPriority();
|
||||||
|
DisplayPriority oledGetCurrentPriority();
|
||||||
|
|
||||||
void setupDisplay();
|
void setupDisplay();
|
||||||
void oledclearline();
|
void oledclearline();
|
||||||
void oledcleardata();
|
void oledcleardata();
|
||||||
int oled_center_h(const String &text);
|
int oled_center_h(const String &text);
|
||||||
int oled_center_v(const String &text);
|
int oled_center_v(const String &text);
|
||||||
|
|
||||||
|
// Display sleep management
|
||||||
|
void oledWake();
|
||||||
|
void oledSleep();
|
||||||
|
void oledResetActivityTimer();
|
||||||
|
void oledCheckSleep();
|
||||||
|
bool isOledAsleep();
|
||||||
|
void loadOledSleepTimeout();
|
||||||
|
void saveOledSleepTimeout(uint16_t timeoutSecs);
|
||||||
|
|
||||||
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);
|
void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char* largeText, const char* statusMessage);
|
||||||
|
|
||||||
void oledShowWeight(uint16_t weight);
|
void oledShowWeight(int16_t weight);
|
||||||
void oledShowRemainingWeight(uint16_t remainingWeight);
|
void oledShowRemainingWeight(uint16_t remainingWeight);
|
||||||
void oledDisplayText(const String &message, uint8_t size = 2);
|
void oledDisplayText(const String &message, uint8_t size = 2);
|
||||||
void oledShowConnectionError(const char* error, const String& ip);
|
void oledShowConnectionError(const char* error, const String& ip);
|
||||||
|
|||||||
@@ -37,6 +37,12 @@ const unsigned char bitmap_bambu_on [] PROGMEM = {
|
|||||||
0x30, 0x78, 0x00, 0x7c, 0x06, 0x7c, 0x1e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c
|
0x30, 0x78, 0x00, 0x7c, 0x06, 0x7c, 0x1e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 'scale_on', 16x16px
|
||||||
|
const unsigned char bitmap_scale_on [] PROGMEM = {
|
||||||
|
0x01, 0x80, 0x3f, 0xfc, 0x3f, 0xfc, 0x11, 0x88, 0x21, 0x84, 0x09, 0x90, 0x49, 0x92, 0x45, 0xa2,
|
||||||
|
0x05, 0xa1, 0xff, 0xbf, 0xfd, 0xbf, 0x79, 0x9e, 0x01, 0x80, 0x01, 0x80, 0x0f, 0xf0, 0x0f, 0xf8
|
||||||
|
};
|
||||||
|
|
||||||
// 'failed', 47x47px
|
// 'failed', 47x47px
|
||||||
const unsigned char icon_failed [] PROGMEM = {
|
const unsigned char icon_failed [] PROGMEM = {
|
||||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
||||||
|
|||||||
+274
@@ -0,0 +1,274 @@
|
|||||||
|
#include "lang.h"
|
||||||
|
#include "config.h"
|
||||||
|
#include <Preferences.h>
|
||||||
|
|
||||||
|
Lang currentLang = LANG_EN;
|
||||||
|
|
||||||
|
// =====================================================================
|
||||||
|
// English strings
|
||||||
|
// =====================================================================
|
||||||
|
static const char EN_DISPLAY_INIT[] = "Display init";
|
||||||
|
static const char EN_WIFI_INIT[] = "WiFi init";
|
||||||
|
static const char EN_WEBSERVER_INIT[] = "Webserver init";
|
||||||
|
static const char EN_API_INIT[] = "API init";
|
||||||
|
static const char EN_NFC_INIT[] = "NFC init";
|
||||||
|
static const char EN_SEARCHING_SCALE[] = "Searching scale";
|
||||||
|
static const char EN_INIT_DONE[] = "Setup finished";
|
||||||
|
|
||||||
|
static const char EN_TARE_SCALE[] = "TARE Scale";
|
||||||
|
static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated";
|
||||||
|
static const char EN_SCALE_CAL[] = "Scale Cal.";
|
||||||
|
static const char EN_EMPTY_SCALE[] = "Empty Scale";
|
||||||
|
static const char EN_PLACE_WEIGHT[] = "Place the weight";
|
||||||
|
static const char EN_REMOVE_WEIGHT[] = "Remove weight";
|
||||||
|
static const char EN_COMPLETED[] = "Completed";
|
||||||
|
static const char EN_CAL_ERROR[] = "Calibration error";
|
||||||
|
static const char EN_HX711_NOT_FOUND[] = "HX711 not found";
|
||||||
|
|
||||||
|
static const char EN_READING[] = "Reading";
|
||||||
|
static const char EN_DECODING_DATA[] = "Decoding data";
|
||||||
|
static const char EN_SPOOL_TAG[] = "Spool Tag";
|
||||||
|
static const char EN_WEIGHING[] = "Weighing...";
|
||||||
|
static const char EN_WEIGHT_STABLE[] = "Weight stable";
|
||||||
|
static const char EN_SENDING[] = "Sending...";
|
||||||
|
static const char EN_TAG_WRITTEN[] = "Tag written";
|
||||||
|
static const char EN_WRITING[] = "Writing";
|
||||||
|
static const char EN_WRITE_TAG[] = "Write Tag";
|
||||||
|
static const char EN_DONE[] = "Done!";
|
||||||
|
static const char EN_PLACE_TAG_NOW[] = "Place tag now";
|
||||||
|
static const char EN_DETECTING_TAG[] = "Detecting tag";
|
||||||
|
static const char EN_KNOWN_SPOOL[] = "Known Spool";
|
||||||
|
static const char EN_QUICK_MODE[] = "Quick mode";
|
||||||
|
static const char EN_LOCATION[] = "Location";
|
||||||
|
static const char EN_LOCATION_SET[] = "Location set";
|
||||||
|
static const char EN_SCAN_SPOOL_FIRST[] = "Scan spool first";
|
||||||
|
static const char EN_WAIT_FMT[] = "Wait... %ds";
|
||||||
|
|
||||||
|
static const char EN_NOT_REGISTERED[] = "Not Registered";
|
||||||
|
static const char EN_API_CONN_LOST[] = "API Connection Lost";
|
||||||
|
static const char EN_API_ERROR[] = "API Error";
|
||||||
|
static const char EN_API_OFFLINE[] = "API offline";
|
||||||
|
static const char EN_WEIGHT_SENT_REST[] = "Weight sent, rest:";
|
||||||
|
|
||||||
|
static const char EN_FAILURE[] = "Failure";
|
||||||
|
static const char EN_FAILURE_EXCL[] = "Failure!";
|
||||||
|
static const char EN_UNKNOWN_TAG[] = "Unknown tag";
|
||||||
|
static const char EN_UNKNOWN_TAG_TYPE[] = "Unknown tag type";
|
||||||
|
static const char EN_NO_TAG_FOUND[] = "No tag found";
|
||||||
|
static const char EN_NFC_BUSY[] = "NFC busy!";
|
||||||
|
static const char EN_TAG_READ_ERROR[] = "Tag read error";
|
||||||
|
static const char EN_TAG_TOO_SMALL[] = "Tag too small for data";
|
||||||
|
static const char EN_NFC_RESET_FAIL[] = "NFC Reset failed";
|
||||||
|
static const char EN_TAG_LOST_RESET[] = "Tag lost after reset";
|
||||||
|
static const char EN_NFC_STILL_BROKEN[] = "NFC still broken";
|
||||||
|
static const char EN_TAG_DEFECT[] = "Tag/Interface defect";
|
||||||
|
static const char EN_TEST_READ_ERROR[] = "Test page read error";
|
||||||
|
static const char EN_TAG_REMOVED[] = "Tag removed";
|
||||||
|
static const char EN_TAG_WRITE_PROT[] = "Tag write protected?";
|
||||||
|
static const char EN_TEST_VERIFY_FAIL[] = "Test verify failed";
|
||||||
|
static const char EN_NDEF_INIT_FAIL[] = "NDEF init failed";
|
||||||
|
static const char EN_NFC_UNSTABLE[] = "NFC Interface unstable";
|
||||||
|
static const char EN_MEMORY_ERROR[] = "Memory error";
|
||||||
|
static const char EN_NO_RFID_BOARD[] = "No RFID Board found";
|
||||||
|
|
||||||
|
static const char EN_WIFI_CONFIG[] = "WiFi Config Mode";
|
||||||
|
static const char EN_WIFI_NOT_CONN[] = "WiFi not connected Check Portal";
|
||||||
|
static const char EN_WIFI_RECONN[] = "WiFi reconnecting";
|
||||||
|
|
||||||
|
static const char EN_UPDATE[] = "Update";
|
||||||
|
static const char EN_DOWNLOAD[] = "Download";
|
||||||
|
|
||||||
|
static const char EN_NOSCALE_MODE[] = "Activate NFC-only mode";
|
||||||
|
static const char EN_NOSCALE_PROMPT[] = "ready...";
|
||||||
|
|
||||||
|
// =====================================================================
|
||||||
|
// German strings
|
||||||
|
// =====================================================================
|
||||||
|
static const char DE_DISPLAY_INIT[] = "Display init";
|
||||||
|
static const char DE_WIFI_INIT[] = "WiFi init";
|
||||||
|
static const char DE_WEBSERVER_INIT[] = "Webserver init";
|
||||||
|
static const char DE_API_INIT[] = "API init";
|
||||||
|
static const char DE_NFC_INIT[] = "NFC init";
|
||||||
|
static const char DE_SEARCHING_SCALE[] = "Suche Waage";
|
||||||
|
static const char DE_INIT_DONE[] = "Setup abgeschlossen";
|
||||||
|
|
||||||
|
static const char DE_TARE_SCALE[] = "Waage tarieren";
|
||||||
|
static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert";
|
||||||
|
static const char DE_SCALE_CAL[] = "Kalibrieren";
|
||||||
|
static const char DE_EMPTY_SCALE[] = "Waage leeren";
|
||||||
|
static const char DE_PLACE_WEIGHT[] = "Gewicht auflegen";
|
||||||
|
static const char DE_REMOVE_WEIGHT[] = "Gewicht entfernen";
|
||||||
|
static const char DE_COMPLETED[] = "Abgeschlossen";
|
||||||
|
static const char DE_CAL_ERROR[] = "Kalibrierungsfehler";
|
||||||
|
static const char DE_HX711_NOT_FOUND[] = "HX711 nicht gefunden";
|
||||||
|
|
||||||
|
static const char DE_READING[] = "Lesen";
|
||||||
|
static const char DE_DECODING_DATA[] = "Daten dekodieren";
|
||||||
|
static const char DE_SPOOL_TAG[] = "Spulen-Tag";
|
||||||
|
static const char DE_WEIGHING[] = "Wiegen...";
|
||||||
|
static const char DE_WEIGHT_STABLE[] = "Gewicht stabil";
|
||||||
|
static const char DE_SENDING[] = "Senden...";
|
||||||
|
static const char DE_TAG_WRITTEN[] = "Tag beschrieben";
|
||||||
|
static const char DE_WRITING[] = "Schreiben";
|
||||||
|
static const char DE_WRITE_TAG[] = "Tag schreiben";
|
||||||
|
static const char DE_DONE[] = "Fertig!";
|
||||||
|
static const char DE_PLACE_TAG_NOW[] = "Tag jetzt auflegen";
|
||||||
|
static const char DE_DETECTING_TAG[] = "Tag erkennen";
|
||||||
|
static const char DE_KNOWN_SPOOL[] = "Bekannte Spule";
|
||||||
|
static const char DE_QUICK_MODE[] = "Schnellmodus";
|
||||||
|
static const char DE_LOCATION[] = "Standort";
|
||||||
|
static const char DE_LOCATION_SET[] = "Standort gesetzt";
|
||||||
|
static const char DE_SCAN_SPOOL_FIRST[] = "Zuerst Spule scannen";
|
||||||
|
static const char DE_WAIT_FMT[] = "Warte... %ds";
|
||||||
|
|
||||||
|
static const char DE_NOT_REGISTERED[] = "Nicht registriert";
|
||||||
|
static const char DE_API_CONN_LOST[] = "API-Verbindung weg";
|
||||||
|
static const char DE_API_ERROR[] = "API-Fehler";
|
||||||
|
static const char DE_API_OFFLINE[] = "API offline";
|
||||||
|
static const char DE_WEIGHT_SENT_REST[] = "Gesendet, Rest:";
|
||||||
|
|
||||||
|
static const char DE_FAILURE[] = "Fehler";
|
||||||
|
static const char DE_FAILURE_EXCL[] = "Fehler!";
|
||||||
|
static const char DE_UNKNOWN_TAG[] = "Unbekannter Tag";
|
||||||
|
static const char DE_UNKNOWN_TAG_TYPE[] = "Unbekannter Tagtyp";
|
||||||
|
static const char DE_NO_TAG_FOUND[] = "Kein Tag gefunden";
|
||||||
|
static const char DE_NFC_BUSY[] = "NFC belegt!";
|
||||||
|
static const char DE_TAG_READ_ERROR[] = "Tag-Lesefehler";
|
||||||
|
static const char DE_TAG_TOO_SMALL[] = "Tag zu klein";
|
||||||
|
static const char DE_NFC_RESET_FAIL[] = "NFC-Reset fehlgeschl.";
|
||||||
|
static const char DE_TAG_LOST_RESET[] = "Tag nach Reset weg";
|
||||||
|
static const char DE_NFC_STILL_BROKEN[] = "NFC immer noch defekt";
|
||||||
|
static const char DE_TAG_DEFECT[] = "Tag/Interface defekt";
|
||||||
|
static const char DE_TEST_READ_ERROR[] = "Testseite Lesefehler";
|
||||||
|
static const char DE_TAG_REMOVED[] = "Tag entfernt";
|
||||||
|
static const char DE_TAG_WRITE_PROT[] = "Tag schreibgeschuetzt";
|
||||||
|
static const char DE_TEST_VERIFY_FAIL[] = "Test fehlgeschlagen";
|
||||||
|
static const char DE_NDEF_INIT_FAIL[] = "NDEF-Init Fehler";
|
||||||
|
static const char DE_NFC_UNSTABLE[] = "NFC instabil";
|
||||||
|
static const char DE_MEMORY_ERROR[] = "Speicherfehler";
|
||||||
|
static const char DE_NO_RFID_BOARD[] = "Kein RFID-Board";
|
||||||
|
|
||||||
|
static const char DE_WIFI_CONFIG[] = "WiFi Konfig-Modus";
|
||||||
|
static const char DE_WIFI_NOT_CONN[] = "WiFi nicht verbunden Portal pruefen";
|
||||||
|
static const char DE_WIFI_RECONN[] = "WiFi Neuverbindung";
|
||||||
|
|
||||||
|
static const char DE_UPDATE[] = "Update";
|
||||||
|
static const char DE_DOWNLOAD[] = "Download";
|
||||||
|
|
||||||
|
static const char DE_NOSCALE_MODE[] = "Aktiviere NFC-only Modus";
|
||||||
|
static const char DE_NOSCALE_PROMPT[] = "bereit...";
|
||||||
|
|
||||||
|
// =====================================================================
|
||||||
|
// String table: [StringID][Lang]
|
||||||
|
// =====================================================================
|
||||||
|
static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
|
||||||
|
// Boot / Init
|
||||||
|
{ EN_DISPLAY_INIT, DE_DISPLAY_INIT },
|
||||||
|
{ EN_WIFI_INIT, DE_WIFI_INIT },
|
||||||
|
{ EN_WEBSERVER_INIT, DE_WEBSERVER_INIT },
|
||||||
|
{ EN_API_INIT, DE_API_INIT },
|
||||||
|
{ EN_NFC_INIT, DE_NFC_INIT },
|
||||||
|
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
|
||||||
|
{ EN_INIT_DONE, DE_INIT_DONE },
|
||||||
|
|
||||||
|
// Scale
|
||||||
|
{ EN_TARE_SCALE, DE_TARE_SCALE },
|
||||||
|
{ EN_SCALE_NOT_CAL, DE_SCALE_NOT_CAL },
|
||||||
|
{ EN_SCALE_CAL, DE_SCALE_CAL },
|
||||||
|
{ EN_EMPTY_SCALE, DE_EMPTY_SCALE },
|
||||||
|
{ EN_PLACE_WEIGHT, DE_PLACE_WEIGHT },
|
||||||
|
{ EN_REMOVE_WEIGHT, DE_REMOVE_WEIGHT },
|
||||||
|
{ EN_COMPLETED, DE_COMPLETED },
|
||||||
|
{ EN_CAL_ERROR, DE_CAL_ERROR },
|
||||||
|
{ EN_HX711_NOT_FOUND, DE_HX711_NOT_FOUND },
|
||||||
|
|
||||||
|
// NFC / Spool
|
||||||
|
{ EN_READING, DE_READING },
|
||||||
|
{ EN_DECODING_DATA, DE_DECODING_DATA },
|
||||||
|
{ EN_SPOOL_TAG, DE_SPOOL_TAG },
|
||||||
|
{ EN_WEIGHING, DE_WEIGHING },
|
||||||
|
{ EN_WEIGHT_STABLE, DE_WEIGHT_STABLE },
|
||||||
|
{ EN_SENDING, DE_SENDING },
|
||||||
|
{ EN_TAG_WRITTEN, DE_TAG_WRITTEN },
|
||||||
|
{ EN_WRITING, DE_WRITING },
|
||||||
|
{ EN_WRITE_TAG, DE_WRITE_TAG },
|
||||||
|
{ EN_DONE, DE_DONE },
|
||||||
|
{ EN_PLACE_TAG_NOW, DE_PLACE_TAG_NOW },
|
||||||
|
{ EN_DETECTING_TAG, DE_DETECTING_TAG },
|
||||||
|
{ EN_KNOWN_SPOOL, DE_KNOWN_SPOOL },
|
||||||
|
{ EN_QUICK_MODE, DE_QUICK_MODE },
|
||||||
|
{ EN_LOCATION, DE_LOCATION },
|
||||||
|
{ EN_LOCATION_SET, DE_LOCATION_SET },
|
||||||
|
{ EN_SCAN_SPOOL_FIRST, DE_SCAN_SPOOL_FIRST },
|
||||||
|
{ EN_WAIT_FMT, DE_WAIT_FMT },
|
||||||
|
|
||||||
|
// Connection / API
|
||||||
|
{ EN_NOT_REGISTERED, DE_NOT_REGISTERED },
|
||||||
|
{ EN_API_CONN_LOST, DE_API_CONN_LOST },
|
||||||
|
{ EN_API_ERROR, DE_API_ERROR },
|
||||||
|
{ EN_API_OFFLINE, DE_API_OFFLINE },
|
||||||
|
{ EN_WEIGHT_SENT_REST, DE_WEIGHT_SENT_REST },
|
||||||
|
|
||||||
|
// Errors
|
||||||
|
{ EN_FAILURE, DE_FAILURE },
|
||||||
|
{ EN_FAILURE_EXCL, DE_FAILURE_EXCL },
|
||||||
|
{ EN_UNKNOWN_TAG, DE_UNKNOWN_TAG },
|
||||||
|
{ EN_UNKNOWN_TAG_TYPE, DE_UNKNOWN_TAG_TYPE },
|
||||||
|
{ EN_NO_TAG_FOUND, DE_NO_TAG_FOUND },
|
||||||
|
{ EN_NFC_BUSY, DE_NFC_BUSY },
|
||||||
|
{ EN_TAG_READ_ERROR, DE_TAG_READ_ERROR },
|
||||||
|
{ EN_TAG_TOO_SMALL, DE_TAG_TOO_SMALL },
|
||||||
|
{ EN_NFC_RESET_FAIL, DE_NFC_RESET_FAIL },
|
||||||
|
{ EN_TAG_LOST_RESET, DE_TAG_LOST_RESET },
|
||||||
|
{ EN_NFC_STILL_BROKEN, DE_NFC_STILL_BROKEN },
|
||||||
|
{ EN_TAG_DEFECT, DE_TAG_DEFECT },
|
||||||
|
{ EN_TEST_READ_ERROR, DE_TEST_READ_ERROR },
|
||||||
|
{ EN_TAG_REMOVED, DE_TAG_REMOVED },
|
||||||
|
{ EN_TAG_WRITE_PROT, DE_TAG_WRITE_PROT },
|
||||||
|
{ EN_TEST_VERIFY_FAIL, DE_TEST_VERIFY_FAIL },
|
||||||
|
{ EN_NDEF_INIT_FAIL, DE_NDEF_INIT_FAIL },
|
||||||
|
{ EN_NFC_UNSTABLE, DE_NFC_UNSTABLE },
|
||||||
|
{ EN_MEMORY_ERROR, DE_MEMORY_ERROR },
|
||||||
|
{ EN_NO_RFID_BOARD, DE_NO_RFID_BOARD },
|
||||||
|
|
||||||
|
// WiFi
|
||||||
|
{ EN_WIFI_CONFIG, DE_WIFI_CONFIG },
|
||||||
|
{ EN_WIFI_NOT_CONN, DE_WIFI_NOT_CONN },
|
||||||
|
{ EN_WIFI_RECONN, DE_WIFI_RECONN },
|
||||||
|
|
||||||
|
// OTA
|
||||||
|
{ EN_UPDATE, DE_UPDATE },
|
||||||
|
{ EN_DOWNLOAD, DE_DOWNLOAD },
|
||||||
|
|
||||||
|
// No-Scale mode
|
||||||
|
{ EN_NOSCALE_MODE, DE_NOSCALE_MODE },
|
||||||
|
{ EN_NOSCALE_PROMPT, DE_NOSCALE_PROMPT },
|
||||||
|
};
|
||||||
|
|
||||||
|
const char* tr(StringID id) {
|
||||||
|
if (id >= STR_COUNT) return "???";
|
||||||
|
return stringTable[id][currentLang];
|
||||||
|
}
|
||||||
|
|
||||||
|
void loadLanguage() {
|
||||||
|
Preferences preferences;
|
||||||
|
preferences.begin(NVS_NAMESPACE_SETTINGS, true);
|
||||||
|
currentLang = (Lang)preferences.getUChar(NVS_KEY_LANGUAGE, LANG_EN);
|
||||||
|
if (currentLang >= LANG_COUNT) currentLang = LANG_EN;
|
||||||
|
preferences.end();
|
||||||
|
Serial.printf("Language loaded: %s\n", getLangCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
void saveLanguage(Lang lang) {
|
||||||
|
if (lang >= LANG_COUNT) return;
|
||||||
|
currentLang = lang;
|
||||||
|
Preferences preferences;
|
||||||
|
preferences.begin(NVS_NAMESPACE_SETTINGS, false);
|
||||||
|
preferences.putUChar(NVS_KEY_LANGUAGE, (uint8_t)lang);
|
||||||
|
preferences.end();
|
||||||
|
Serial.printf("Language saved: %s\n", getLangCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* getLangCode() {
|
||||||
|
return (currentLang == LANG_DE) ? "de" : "en";
|
||||||
|
}
|
||||||
+115
@@ -0,0 +1,115 @@
|
|||||||
|
#ifndef LANG_H
|
||||||
|
#define LANG_H
|
||||||
|
|
||||||
|
#include <Arduino.h>
|
||||||
|
|
||||||
|
// Supported languages
|
||||||
|
enum Lang : uint8_t {
|
||||||
|
LANG_EN = 0,
|
||||||
|
LANG_DE = 1,
|
||||||
|
LANG_COUNT
|
||||||
|
};
|
||||||
|
|
||||||
|
// String IDs for all translatable display texts
|
||||||
|
enum StringID : uint8_t {
|
||||||
|
// Boot / Init
|
||||||
|
STR_DISPLAY_INIT,
|
||||||
|
STR_WIFI_INIT,
|
||||||
|
STR_WEBSERVER_INIT,
|
||||||
|
STR_API_INIT,
|
||||||
|
STR_NFC_INIT,
|
||||||
|
STR_SEARCHING_SCALE,
|
||||||
|
STR_INIT_DONE,
|
||||||
|
|
||||||
|
// Scale
|
||||||
|
STR_TARE_SCALE,
|
||||||
|
STR_SCALE_NOT_CALIBRATED,
|
||||||
|
STR_SCALE_CAL,
|
||||||
|
STR_EMPTY_SCALE,
|
||||||
|
STR_PLACE_WEIGHT,
|
||||||
|
STR_REMOVE_WEIGHT,
|
||||||
|
STR_COMPLETED,
|
||||||
|
STR_CALIBRATION_ERROR,
|
||||||
|
STR_HX711_NOT_FOUND,
|
||||||
|
|
||||||
|
// NFC / Spool
|
||||||
|
STR_READING,
|
||||||
|
STR_DECODING_DATA,
|
||||||
|
STR_SPOOL_TAG,
|
||||||
|
STR_WEIGHING,
|
||||||
|
STR_WEIGHT_STABLE,
|
||||||
|
STR_SENDING,
|
||||||
|
STR_TAG_WRITTEN,
|
||||||
|
STR_WRITING,
|
||||||
|
STR_WRITE_TAG,
|
||||||
|
STR_DONE,
|
||||||
|
STR_PLACE_TAG_NOW,
|
||||||
|
STR_DETECTING_TAG,
|
||||||
|
STR_KNOWN_SPOOL,
|
||||||
|
STR_QUICK_MODE,
|
||||||
|
STR_LOCATION,
|
||||||
|
STR_LOCATION_SET,
|
||||||
|
STR_SCAN_SPOOL_FIRST,
|
||||||
|
STR_WAIT_FMT, // format string: "Wait... %ds" / "Warte... %ds"
|
||||||
|
|
||||||
|
// Connection / API
|
||||||
|
STR_NOT_REGISTERED,
|
||||||
|
STR_API_CONN_LOST,
|
||||||
|
STR_API_ERROR,
|
||||||
|
STR_API_OFFLINE,
|
||||||
|
STR_WEIGHT_SENT_REST,
|
||||||
|
|
||||||
|
// Errors
|
||||||
|
STR_FAILURE,
|
||||||
|
STR_FAILURE_EXCL,
|
||||||
|
STR_UNKNOWN_TAG,
|
||||||
|
STR_UNKNOWN_TAG_TYPE,
|
||||||
|
STR_NO_TAG_FOUND,
|
||||||
|
STR_NFC_BUSY,
|
||||||
|
STR_TAG_READ_ERROR,
|
||||||
|
STR_TAG_TOO_SMALL,
|
||||||
|
STR_NFC_RESET_FAILED,
|
||||||
|
STR_TAG_LOST_RESET,
|
||||||
|
STR_NFC_STILL_BROKEN,
|
||||||
|
STR_TAG_DEFECT,
|
||||||
|
STR_TEST_READ_ERROR,
|
||||||
|
STR_TAG_REMOVED,
|
||||||
|
STR_TAG_WRITE_PROT,
|
||||||
|
STR_TEST_VERIFY_FAIL,
|
||||||
|
STR_NDEF_INIT_FAILED,
|
||||||
|
STR_NFC_UNSTABLE,
|
||||||
|
STR_MEMORY_ERROR,
|
||||||
|
STR_NO_RFID_BOARD,
|
||||||
|
|
||||||
|
// WiFi
|
||||||
|
STR_WIFI_CONFIG_MODE,
|
||||||
|
STR_WIFI_NOT_CONNECTED,
|
||||||
|
STR_WIFI_RECONNECTING,
|
||||||
|
|
||||||
|
// OTA
|
||||||
|
STR_UPDATE,
|
||||||
|
STR_DOWNLOAD,
|
||||||
|
|
||||||
|
// No-Scale mode
|
||||||
|
STR_NOSCALE_MODE,
|
||||||
|
STR_NOSCALE_PROMPT,
|
||||||
|
|
||||||
|
STR_COUNT // must be last
|
||||||
|
};
|
||||||
|
|
||||||
|
// Current language (default: English)
|
||||||
|
extern Lang currentLang;
|
||||||
|
|
||||||
|
// Get translated string by ID
|
||||||
|
const char* tr(StringID id);
|
||||||
|
|
||||||
|
// Load language setting from NVS
|
||||||
|
void loadLanguage();
|
||||||
|
|
||||||
|
// Save language setting to NVS
|
||||||
|
void saveLanguage(Lang lang);
|
||||||
|
|
||||||
|
// Get current language as string ("en" or "de")
|
||||||
|
const char* getLangCode();
|
||||||
|
|
||||||
|
#endif
|
||||||
+70
-45
@@ -13,6 +13,7 @@
|
|||||||
#include "scale.h"
|
#include "scale.h"
|
||||||
#include "esp_task_wdt.h"
|
#include "esp_task_wdt.h"
|
||||||
#include "commonFS.h"
|
#include "commonFS.h"
|
||||||
|
#include "lang.h"
|
||||||
|
|
||||||
bool mainTaskWasPaused = 0;
|
bool mainTaskWasPaused = 0;
|
||||||
uint8_t scaleTareCounter = 0;
|
uint8_t scaleTareCounter = 0;
|
||||||
@@ -32,6 +33,9 @@ void setup() {
|
|||||||
// Initialize SPIFFS
|
// Initialize SPIFFS
|
||||||
initializeFileSystem();
|
initializeFileSystem();
|
||||||
|
|
||||||
|
// Load language setting from NVS (before display init)
|
||||||
|
loadLanguage();
|
||||||
|
|
||||||
// Start Display
|
// Start Display
|
||||||
setupDisplay();
|
setupDisplay();
|
||||||
|
|
||||||
@@ -57,15 +61,24 @@ void setup() {
|
|||||||
|
|
||||||
// Scale
|
// Scale
|
||||||
start_scale(touchSensorConnected);
|
start_scale(touchSensorConnected);
|
||||||
|
if (scaleConnected){
|
||||||
scaleTareRequest = true;
|
scaleTareRequest = true;
|
||||||
|
}
|
||||||
|
|
||||||
// WDT initialisieren mit 10 Sekunden Timeout
|
// WDT initialisieren mit 10 Sekunden Timeout
|
||||||
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
|
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
|
||||||
esp_task_wdt_init(10, panic);
|
esp_task_wdt_init(10, panic);
|
||||||
|
|
||||||
booting = false;
|
booting = false;
|
||||||
|
oledShowProgressBar(6, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_INIT_DONE));
|
||||||
|
|
||||||
// Aktuellen Task (loopTask) zum Watchdog hinzufügen
|
// Aktuellen Task (loopTask) zum Watchdog hinzufügen
|
||||||
esp_task_wdt_add(NULL);
|
esp_task_wdt_add(NULL);
|
||||||
|
|
||||||
|
if ( !scaleConnected ) {
|
||||||
|
// Clear Display after Boot
|
||||||
|
oledDisplayText(tr(STR_NOSCALE_PROMPT));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -100,47 +113,33 @@ const unsigned long debounceDelay = 500; // 500 ms debounce delay
|
|||||||
|
|
||||||
unsigned long lastConnErrorShowTime = 0;
|
unsigned long lastConnErrorShowTime = 0;
|
||||||
const unsigned long connErrorShowInterval = 10000; // Show connection error every 10 seconds if exists
|
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 #####
|
// ##### PROGRAM START #####
|
||||||
void loop() {
|
void loop() {
|
||||||
unsigned long currentMillis = millis();
|
unsigned long currentMillis = millis();
|
||||||
|
|
||||||
// Handle connection errors (not registered or not connected)
|
// Handle connection errors (not registered or not connected)
|
||||||
if (!showingConnError && intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
|
if (intervalElapsed(currentMillis, lastConnErrorShowTime, connErrorShowInterval)) {
|
||||||
if (!filamanRegistered) {
|
if (!filamanRegistered && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
|
||||||
oledShowConnectionError("Not Registered", WiFi.localIP().toString());
|
oledShowConnectionError(tr(STR_NOT_REGISTERED), WiFi.localIP().toString());
|
||||||
showingConnError = true;
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
connErrorStartTime = currentMillis;
|
|
||||||
mainTaskWasPaused = true;
|
mainTaskWasPaused = true;
|
||||||
} else if (!filamanConnected) {
|
} else if (!filamanConnected && oledCanUpdate(DISPLAY_PRIORITY_WARNING)) {
|
||||||
oledShowConnectionError("API Connection Lost", WiFi.localIP().toString());
|
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
|
||||||
showingConnError = true;
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
connErrorStartTime = currentMillis;
|
|
||||||
mainTaskWasPaused = true;
|
mainTaskWasPaused = true;
|
||||||
|
} else if ( !scaleConnected ){
|
||||||
|
// everything fine again: without scale manual clearing of the error msg is needed
|
||||||
|
oledDisplayText(tr(STR_NOSCALE_PROMPT));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clear connection error after duration
|
// Überprüfe den Status des Touch Sensors (nur wenn Waage vorhanden)
|
||||||
if (showingConnError && currentMillis - connErrorStartTime >= connErrorDisplayDuration) {
|
if (scaleConnected && touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
|
||||||
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)
|
|
||||||
{
|
{
|
||||||
lastButtonPress = currentMillis;
|
lastButtonPress = currentMillis;
|
||||||
scaleTareRequest = true;
|
scaleTareRequest = true;
|
||||||
|
oledResetActivityTimer(); // Wake display on touch press
|
||||||
}
|
}
|
||||||
|
|
||||||
// Überprüfe regelmäßig die WLAN-Verbindung
|
// Überprüfe regelmäßig die WLAN-Verbindung
|
||||||
@@ -153,8 +152,15 @@ void loop() {
|
|||||||
if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL))
|
if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL))
|
||||||
{
|
{
|
||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
// Clean up dead websocket clients periodically instead of on connect
|
oledCheckSleep(); // Put display to sleep if timeout elapsed
|
||||||
if(currentMillis % 10000 < 50) ws.cleanupClients();
|
}
|
||||||
|
|
||||||
|
// WebSocket Cleanup alle 5 Sekunden (häufiger als vorher)
|
||||||
|
// Tote Clients können WiFi-Ressourcen blockieren
|
||||||
|
static unsigned long lastWsCleanup = 0;
|
||||||
|
if (currentMillis - lastWsCleanup >= 5000) {
|
||||||
|
ws.cleanupClients();
|
||||||
|
lastWsCleanup = currentMillis;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Periodic FilaMan heartbeat
|
// Periodic FilaMan heartbeat
|
||||||
@@ -164,25 +170,27 @@ void loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If scale is not calibrated, only show a warning
|
// If scale is not calibrated, only show a warning
|
||||||
if (!scaleCalibrated)
|
if (scaleConnected && !scaleCalibrated)
|
||||||
{
|
{
|
||||||
// Do not show the warning if the calibratin process is onging
|
// Do not show the warning if the calibratin process is onging
|
||||||
if(!scaleCalibrationActive){
|
if(!scaleCalibrationActive){
|
||||||
oledDisplayText("Scale not calibrated");
|
oledDisplayText(tr(STR_SCALE_NOT_CALIBRATED));
|
||||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
if (scaleConnected && scaleCalibrated)
|
||||||
{
|
{
|
||||||
// Ausgabe der Waage auf Display
|
// Ausgabe der Waage auf Display
|
||||||
// Block weight display during NFC write operations
|
// Block weight display during NFC write operations and higher-priority display messages
|
||||||
if(pauseMainTask == 0 && !nfcWriteInProgress)
|
if(pauseMainTask == 0 && !nfcWriteInProgress && oledCanUpdate(DISPLAY_PRIORITY_STATUS))
|
||||||
{
|
{
|
||||||
// Use filtered weight for smooth display, but still check API weight for significant changes
|
// Use filtered weight for smooth display, but still check API weight for significant changes
|
||||||
int16_t displayWeight = getFilteredDisplayWeight();
|
int16_t displayWeight = getFilteredDisplayWeight();
|
||||||
if (mainTaskWasPaused || (weight != lastWeight && (nfcReaderState == NFC_IDLE || tagProcessed)))
|
if (mainTaskWasPaused || (weight != lastWeight && (nfcReaderState == NFC_IDLE || tagProcessed)))
|
||||||
{
|
{
|
||||||
(displayWeight < 2) ? ((displayWeight < -2) ? oledDisplayText("!! -0") : oledShowWeight(0)) : oledShowWeight(displayWeight);
|
oledShowWeight((abs(displayWeight) < 2) ? 0 : displayWeight);
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_STATUS, 0); // Weight can always be overwritten
|
||||||
}
|
}
|
||||||
mainTaskWasPaused = false;
|
mainTaskWasPaused = false;
|
||||||
}
|
}
|
||||||
@@ -191,9 +199,17 @@ void loop() {
|
|||||||
mainTaskWasPaused = true;
|
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
|
// 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;
|
lastWeightReadTime = currentMillis;
|
||||||
|
|
||||||
@@ -201,18 +217,27 @@ void loop() {
|
|||||||
if (abs(weight - lastWeight) <= 2 && weight > 5)
|
if (abs(weight - lastWeight) <= 2 && weight > 5)
|
||||||
{
|
{
|
||||||
weightCounterToApi++;
|
weightCounterToApi++;
|
||||||
|
// Show stable weight feedback when approaching send threshold
|
||||||
|
if (weightCounterToApi == 3 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
|
||||||
|
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHT_STABLE));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
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, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
|
||||||
|
}
|
||||||
weightCounterToApi = 0;
|
weightCounterToApi = 0;
|
||||||
weightSend = 0;
|
weightSend = 0;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
lastWeight = weight;
|
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 > 1 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||||
{
|
{
|
||||||
tagProcessed = true;
|
tagProcessed = true;
|
||||||
|
|
||||||
@@ -229,12 +254,12 @@ void loop() {
|
|||||||
weightSend = 1;
|
weightSend = 1;
|
||||||
|
|
||||||
// Feedback to user
|
// Feedback to user
|
||||||
pauseMainTask = 1;
|
oledShowProgressBar(3, 4, tr(STR_SPOOL_TAG), tr(STR_SENDING));
|
||||||
oledShowProgressBar(3, 4, "Spool Tag", "Sending...");
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle successful tag write
|
// Handle successful tag write
|
||||||
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
if (!scanRequestActive && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||||
{
|
{
|
||||||
tagProcessed = true;
|
tagProcessed = true;
|
||||||
|
|
||||||
@@ -246,14 +271,14 @@ void loop() {
|
|||||||
Serial.println("Weight queued for FilaMan after spool tag write");
|
Serial.println("Weight queued for FilaMan after spool tag write");
|
||||||
|
|
||||||
// Feedback to user
|
// Feedback to user
|
||||||
pauseMainTask = 1;
|
oledShowProgressBar(3, 4, tr(STR_TAG_WRITTEN), tr(STR_SENDING));
|
||||||
oledShowProgressBar(3, 4, "Tag written", "Sending...");
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||||
} else {
|
} else {
|
||||||
// Location tag written - no weight to send
|
// Location tag written - no weight to send
|
||||||
Serial.println("Location tag written successfully - no weight send needed");
|
Serial.println("Location tag written successfully - no weight send needed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
esp_task_wdt_reset();
|
esp_task_wdt_reset();
|
||||||
}
|
}
|
||||||
+274
-74
@@ -8,6 +8,7 @@
|
|||||||
#include "esp_task_wdt.h"
|
#include "esp_task_wdt.h"
|
||||||
#include "scale.h"
|
#include "scale.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
#include "lang.h"
|
||||||
|
|
||||||
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
|
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
|
||||||
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
|
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
|
||||||
@@ -26,6 +27,35 @@ bool isBambuTag = false;
|
|||||||
volatile bool nfcReadingTaskSuspendRequest = false;
|
volatile bool nfcReadingTaskSuspendRequest = false;
|
||||||
volatile bool nfcReadingTaskSuspendState = false;
|
volatile bool nfcReadingTaskSuspendState = false;
|
||||||
volatile bool nfcWriteInProgress = false; // Prevent any tag operations during write
|
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;
|
volatile nfcReaderStateType nfcReaderState = NFC_IDLE;
|
||||||
// 0 = nicht gelesen
|
// 0 = nicht gelesen
|
||||||
@@ -498,8 +528,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
Serial.println("!!!!!!!!!!!!!!!!!!!!!!!!");
|
Serial.println("!!!!!!!!!!!!!!!!!!!!!!!!");
|
||||||
Serial.println();
|
Serial.println();
|
||||||
|
|
||||||
oledDisplayText("Tag zu klein für Payload");
|
oledDisplayText(tr(STR_TAG_TOO_SMALL));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -540,8 +572,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
Serial.println("✓ PN532 Kommunikation wiederhergestellt");
|
Serial.println("✓ PN532 Kommunikation wiederhergestellt");
|
||||||
} else {
|
} else {
|
||||||
Serial.println("❌ PN532 Kommunikation fehlgeschlagen");
|
Serial.println("❌ PN532 Kommunikation fehlgeschlagen");
|
||||||
oledDisplayText("NFC Reset failed");
|
oledDisplayText(tr(STR_NFC_RESET_FAILED));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -574,8 +608,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
|
|
||||||
if (!tagRedetected) {
|
if (!tagRedetected) {
|
||||||
Serial.println("❌ Tag konnte nach Reset nicht wiedererkannt werden");
|
Serial.println("❌ Tag konnte nach Reset nicht wiedererkannt werden");
|
||||||
oledDisplayText("Tag lost after reset");
|
oledDisplayText(tr(STR_TAG_LOST_RESET));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -592,8 +628,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
|
|
||||||
if (!ccReadable) {
|
if (!ccReadable) {
|
||||||
Serial.println("❌ NFC-Interface funktioniert nach Reset immer noch nicht");
|
Serial.println("❌ NFC-Interface funktioniert nach Reset immer noch nicht");
|
||||||
oledDisplayText("NFC still broken");
|
oledDisplayText(tr(STR_NFC_STILL_BROKEN));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -645,8 +683,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
if (!basicPagesReadable) {
|
if (!basicPagesReadable) {
|
||||||
Serial.println("❌ KRITISCHER FEHLER: Grundlegende NDEF-Seiten nicht lesbar!");
|
Serial.println("❌ KRITISCHER FEHLER: Grundlegende NDEF-Seiten nicht lesbar!");
|
||||||
Serial.println("Tag oder Interface ist defekt");
|
Serial.println("Tag oder Interface ist defekt");
|
||||||
oledDisplayText("Tag/Interface defect");
|
oledDisplayText(tr(STR_TAG_DEFECT));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -666,8 +706,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
// First, read original content of test page
|
// First, read original content of test page
|
||||||
if (!nfc.ntag2xx_ReadPage(10, originalPage)) {
|
if (!nfc.ntag2xx_ReadPage(10, originalPage)) {
|
||||||
Serial.println("FEHLER: Kann Testseite nicht lesen für Backup");
|
Serial.println("FEHLER: Kann Testseite nicht lesen für Backup");
|
||||||
oledDisplayText("Test page read error");
|
oledDisplayText(tr(STR_TEST_READ_ERROR));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -697,15 +739,18 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
|
|
||||||
if (!tagStillPresent) {
|
if (!tagStillPresent) {
|
||||||
Serial.println("URSACHE: Tag wurde während Schreibtest entfernt!");
|
Serial.println("URSACHE: Tag wurde während Schreibtest entfernt!");
|
||||||
oledDisplayText("Tag removed");
|
oledDisplayText(tr(STR_TAG_REMOVED));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
} else {
|
} else {
|
||||||
Serial.println("URSACHE: Tag ist vorhanden aber nicht beschreibbar");
|
Serial.println("URSACHE: Tag ist vorhanden aber nicht beschreibbar");
|
||||||
Serial.println("Möglicherweise: Schreibschutz, Defekt, oder Interface-Problem");
|
Serial.println("Möglicherweise: Schreibschutz, Defekt, oder Interface-Problem");
|
||||||
oledDisplayText("Tag write protected?");
|
oledDisplayText(tr(STR_TAG_WRITE_PROT));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
}
|
}
|
||||||
Serial.println("==========================================");
|
Serial.println("==========================================");
|
||||||
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -716,8 +761,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
|
|
||||||
if (!nfc.ntag2xx_ReadPage(10, readBack)) {
|
if (!nfc.ntag2xx_ReadPage(10, readBack)) {
|
||||||
Serial.println("FEHLER: Kann Testdaten nicht zurücklesen!");
|
Serial.println("FEHLER: Kann Testdaten nicht zurücklesen!");
|
||||||
oledDisplayText("Test verify failed");
|
oledDisplayText(tr(STR_TEST_VERIFY_FAIL));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -761,8 +808,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
Serial.println("=== SCHRITT 4: NDEF-INITIALISIERUNG ===");
|
Serial.println("=== SCHRITT 4: NDEF-INITIALISIERUNG ===");
|
||||||
if (!initializeNdefStructure()) {
|
if (!initializeNdefStructure()) {
|
||||||
Serial.println("FEHLER: Konnte NDEF-Struktur nicht initialisieren!");
|
Serial.println("FEHLER: Konnte NDEF-Struktur nicht initialisieren!");
|
||||||
oledDisplayText("NDEF init failed");
|
oledDisplayText(tr(STR_NDEF_INIT_FAILED));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||||
|
oledClearPriority();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -817,8 +866,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
|
|
||||||
if (!interfaceStable) {
|
if (!interfaceStable) {
|
||||||
Serial.println("FEHLER: NFC-Interface ist nicht stabil genug für Schreibvorgang");
|
Serial.println("FEHLER: NFC-Interface ist nicht stabil genug für Schreibvorgang");
|
||||||
oledDisplayText("NFC Interface unstable");
|
oledDisplayText(tr(STR_NFC_UNSTABLE));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(3000));
|
vTaskDelay(pdMS_TO_TICKS(3000));
|
||||||
|
oledClearPriority();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -830,8 +881,10 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
uint8_t* tlvData = (uint8_t*) malloc(totalTlvSize);
|
uint8_t* tlvData = (uint8_t*) malloc(totalTlvSize);
|
||||||
if (tlvData == NULL) {
|
if (tlvData == NULL) {
|
||||||
Serial.println("Fehler: Nicht genug Speicher für TLV-Daten vorhanden.");
|
Serial.println("Fehler: Nicht genug Speicher für TLV-Daten vorhanden.");
|
||||||
oledDisplayText("Memory error");
|
oledDisplayText(tr(STR_MEMORY_ERROR));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||||
|
oledClearPriority();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1099,7 +1152,8 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
||||||
oledShowProgressBar(1, 4, "Reading", "Decoding data");
|
oledShowProgressBar(1, 4, tr(STR_READING), tr(STR_DECODING_DATA));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
|
||||||
|
|
||||||
// Debug: Print first 32 bytes of the raw data
|
// Debug: Print first 32 bytes of the raw data
|
||||||
Serial.println("Raw NDEF data (first 32 bytes):");
|
Serial.println("Raw NDEF data (first 32 bytes):");
|
||||||
@@ -1290,28 +1344,79 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
|||||||
{
|
{
|
||||||
if(filamanConnected){
|
if(filamanConnected){
|
||||||
Serial.println("JSON-Dokument erfolgreich verarbeitet");
|
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, "Spool Tag", "Weighing");
|
if (scanRequestActive) {
|
||||||
activeSpoolId = doc["sm_id"].as<String>();
|
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;
|
lastSpoolId = activeSpoolId;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
else if(doc["location_id"].is<int>())
|
else if(doc["location_id"].is<int>())
|
||||||
{
|
{
|
||||||
Serial.println("Location Tag found!");
|
Serial.println("Location Tag found!");
|
||||||
int locId = doc["location_id"].as<int>();
|
int locId = doc["location_id"].as<int>();
|
||||||
|
|
||||||
|
// Check if a spool was scanned before
|
||||||
|
if (lastSpoolId.length() == 0 || lastSpoolId == "0") {
|
||||||
|
Serial.println("No spool scanned before location tag - showing warning");
|
||||||
|
oledShowProgressBar(1, 1, tr(STR_LOCATION), tr(STR_SCAN_SPOOL_FIRST));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
|
} else {
|
||||||
int sId = lastSpoolId.toInt();
|
int sId = lastSpoolId.toInt();
|
||||||
sendLocationAsync(sId, "", locId, "");
|
sendLocationAsync(sId, "", locId, "");
|
||||||
|
|
||||||
|
// Display feedback - location was set
|
||||||
|
oledShowProgressBar(1, 1, tr(STR_LOCATION), tr(STR_LOCATION_SET));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
|
||||||
|
|
||||||
|
// Clear lastSpoolId to prevent accidental re-assignment
|
||||||
|
lastSpoolId = "";
|
||||||
|
Serial.println("Location set - lastSpoolId cleared to prevent re-assignment");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mark as processed so main.cpp doesn't try to send weight
|
||||||
|
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
|
else
|
||||||
{
|
{
|
||||||
Serial.println("Unbekannter Tag-Inhalt.");
|
Serial.println("Unbekannter Tag-Inhalt.");
|
||||||
activeSpoolId = "";
|
activeSpoolId = "";
|
||||||
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
|
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
oledShowProgressBar(4, 4, "Failure!", "API offline");
|
oledShowProgressBar(4, 4, tr(STR_FAILURE_EXCL), tr(STR_API_OFFLINE));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1385,7 +1490,7 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
return false;
|
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)
|
// Read enough pages to cover NDEF header + beginning of payload (pages 4-8 = 20 bytes)
|
||||||
uint8_t ndefData[20];
|
uint8_t ndefData[20];
|
||||||
@@ -1494,17 +1599,23 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.print("JSON start from extended read: ");
|
Serial.print("JSON start from extended read: ");
|
||||||
Serial.println(jsonStart);
|
Serial.println(jsonStart);
|
||||||
|
|
||||||
// Check for sm_id pattern - look for non-zero sm_id values
|
// Check for spool_id/sm_id pattern - look for non-zero id values
|
||||||
if (jsonStart.indexOf("\"sm_id\":\"") >= 0) {
|
String idPattern = "\"spool_id\":\"";
|
||||||
int smIdStart = jsonStart.indexOf("\"sm_id\":\"") + 9;
|
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);
|
int smIdEnd = jsonStart.indexOf("\"", smIdStart);
|
||||||
|
|
||||||
if (smIdEnd > smIdStart && smIdEnd < jsonStart.length()) {
|
if (smIdEnd > smIdStart && smIdEnd < jsonStart.length()) {
|
||||||
String quickSpoolId = jsonStart.substring(smIdStart, smIdEnd);
|
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);
|
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) {
|
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
|
||||||
Serial.println("✓ FAST-PATH: Known spool detected!");
|
Serial.println("✓ FAST-PATH: Known spool detected!");
|
||||||
|
|
||||||
@@ -1520,17 +1631,18 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
|
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
|
||||||
}
|
}
|
||||||
|
|
||||||
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
|
oledShowProgressBar(2, 4, tr(STR_KNOWN_SPOOL), tr(STR_QUICK_MODE));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
|
||||||
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} 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;
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1546,20 +1658,26 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.print("Quick JSON data: ");
|
Serial.print("Quick JSON data: ");
|
||||||
Serial.println(quickJson);
|
Serial.println(quickJson);
|
||||||
|
|
||||||
// Look for sm_id pattern in the beginning of JSON - check for known vs new spools
|
// Look for spool_id/sm_id pattern in the beginning of JSON - check for known vs new spools
|
||||||
if (quickJson.indexOf("\"sm_id\":\"") >= 0) {
|
String idPattern2 = "\"spool_id\":\"";
|
||||||
Serial.println("✓ FAST-PATH: sm_id field found");
|
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
|
// Extract id from quick data
|
||||||
int smIdStart = quickJson.indexOf("\"sm_id\":\"") + 9;
|
int smIdStart = idPattern2Pos + idPattern2.length();
|
||||||
int smIdEnd = quickJson.indexOf("\"", smIdStart);
|
int smIdEnd = quickJson.indexOf("\"", smIdStart);
|
||||||
|
|
||||||
if (smIdEnd > smIdStart && smIdEnd < quickJson.length()) {
|
if (smIdEnd > smIdStart && smIdEnd < quickJson.length()) {
|
||||||
String quickSpoolId = quickJson.substring(smIdStart, smIdEnd);
|
String quickSpoolId = quickJson.substring(smIdStart, smIdEnd);
|
||||||
Serial.print("✓ Quick extracted sm_id: ");
|
Serial.print("✓ Quick extracted spool_id/sm_id: ");
|
||||||
Serial.println(quickSpoolId);
|
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) {
|
if (quickSpoolId != "0" && quickSpoolId.length() > 0) {
|
||||||
Serial.println("✓ FAST-PATH: Known spool detected!");
|
Serial.println("✓ FAST-PATH: Known spool detected!");
|
||||||
|
|
||||||
@@ -1575,16 +1693,17 @@ bool quickSpoolIdCheck(String uidString) {
|
|||||||
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
|
Serial.println("⚠ FAST-PATH: Could not read complete JSON, web interface may show limited data");
|
||||||
}
|
}
|
||||||
|
|
||||||
oledShowProgressBar(2, 4, "Known Spool", "Quick mode");
|
oledShowProgressBar(2, 4, tr(STR_KNOWN_SPOOL), tr(STR_QUICK_MODE));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
|
||||||
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
Serial.println("✓ FAST-PATH SUCCESS: Known spool processed quickly");
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} 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; // sm_id="0" means new brand filament, needs full processing
|
return false; // id="0" means new brand filament, needs full processing
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Serial.println("✗ FAST-PATH: Could not extract complete sm_id value");
|
Serial.println("✗ FAST-PATH: Could not extract complete spool_id/sm_id value");
|
||||||
return false; // Need full read to get complete sm_id
|
return false; // Need full read to get complete id
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1621,14 +1740,18 @@ void writeJsonToTag(void *parameter) {
|
|||||||
sendNfcData();
|
sendNfcData();
|
||||||
vTaskDelay(pdMS_TO_TICKS(100));
|
vTaskDelay(pdMS_TO_TICKS(100));
|
||||||
|
|
||||||
// Show waiting message for tag detection
|
// Show initial waiting message with countdown
|
||||||
oledShowProgressBar(0, 1, "Write Tag", "Warte auf Tag");
|
char _waitBuf[20];
|
||||||
|
snprintf(_waitBuf, sizeof(_waitBuf), tr(STR_WAIT_FMT), 30);
|
||||||
|
oledShowProgressBar(0, 30, tr(STR_WRITE_TAG), _waitBuf);
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
|
||||||
|
|
||||||
// Wait up to 30 seconds for tag
|
// Wait up to 30 seconds for tag
|
||||||
uint8_t success = 0;
|
uint8_t success = 0;
|
||||||
String uidString = "";
|
String uidString = "";
|
||||||
uint8_t uidLength = 0;
|
uint8_t uidLength = 0;
|
||||||
unsigned long startTime = millis();
|
unsigned long startTime = millis();
|
||||||
|
uint8_t lastSecondsShown = 30;
|
||||||
|
|
||||||
while (millis() - startTime < 30000) {
|
while (millis() - startTime < 30000) {
|
||||||
uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 }; // Buffer to store the returned UID
|
uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 }; // Buffer to store the returned UID
|
||||||
@@ -1636,6 +1759,17 @@ void writeJsonToTag(void *parameter) {
|
|||||||
yield();
|
yield();
|
||||||
esp_task_wdt_reset();
|
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), tr(STR_WAIT_FMT), remainingSeconds);
|
||||||
|
oledShowProgressBar(elapsed / 1000, 30, tr(STR_WRITE_TAG), countdownText);
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
|
||||||
|
}
|
||||||
|
|
||||||
success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400);
|
success = nfc.readPassiveTargetID(PN532_MIFARE_ISO14443A, uid, &uidLength, 400);
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
@@ -1661,7 +1795,8 @@ void writeJsonToTag(void *parameter) {
|
|||||||
// If so, skip writing and just send success with weight to API
|
// If so, skip writing and just send success with weight to API
|
||||||
if (uidLength != 7) {
|
if (uidLength != 7) {
|
||||||
Serial.println("Bambu Lab tag detected during write - skipping write, sending result with weight");
|
Serial.println("Bambu Lab tag detected during write - skipping write, sending result with weight");
|
||||||
oledShowProgressBar(1, 1, "Write Tag", "Done!");
|
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||||
|
|
||||||
// Send success to API with tag_uuid and current weight
|
// Send success to API with tag_uuid and current weight
|
||||||
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "", weight);
|
sendRfidResultAsync(uidString, params->spoolId, params->locationId, true, "", weight);
|
||||||
@@ -1676,7 +1811,8 @@ void writeJsonToTag(void *parameter) {
|
|||||||
vTaskDelete(NULL);
|
vTaskDelete(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
oledShowProgressBar(1, 3, "Write Tag", "Writing");
|
oledShowProgressBar(1, 3, tr(STR_WRITE_TAG), tr(STR_WRITING));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||||
|
|
||||||
// Schreibe die NDEF-Message auf den Tag
|
// Schreibe die NDEF-Message auf den Tag
|
||||||
success = ntag2xx_WriteNDEF(params->payload);
|
success = ntag2xx_WriteNDEF(params->payload);
|
||||||
@@ -1689,10 +1825,11 @@ void writeJsonToTag(void *parameter) {
|
|||||||
// aktualisieren der Website wenn sich der Status ändert
|
// aktualisieren der Website wenn sich der Status ändert
|
||||||
sendNfcData();
|
sendNfcData();
|
||||||
if(params->tagType){
|
if(params->tagType){
|
||||||
oledShowProgressBar(1, 1, "Write Tag", "Done!");
|
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
|
||||||
}else{
|
}else{
|
||||||
oledShowProgressBar(1, 1, "Write Tag", "Done!");
|
oledShowProgressBar(1, 1, tr(STR_WRITE_TAG), tr(STR_DONE));
|
||||||
}
|
}
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 3000);
|
||||||
|
|
||||||
// CRITICAL: Properly stabilize NFC interface after write operation
|
// CRITICAL: Properly stabilize NFC interface after write operation
|
||||||
Serial.println();
|
Serial.println();
|
||||||
@@ -1778,7 +1915,9 @@ void writeJsonToTag(void *parameter) {
|
|||||||
{
|
{
|
||||||
Serial.println("Fehler beim Schreiben der NDEF-Message auf den Tag");
|
Serial.println("Fehler beim Schreiben der NDEF-Message auf den Tag");
|
||||||
oledShowIcon("failed");
|
oledShowIcon("failed");
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||||
|
oledClearPriority();
|
||||||
nfcReaderState = NFC_WRITE_ERROR;
|
nfcReaderState = NFC_WRITE_ERROR;
|
||||||
|
|
||||||
// Send error response to API
|
// Send error response to API
|
||||||
@@ -1789,8 +1928,10 @@ void writeJsonToTag(void *parameter) {
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
|
Serial.println("Fehler: Kein Tag zu schreiben gefunden.");
|
||||||
oledShowProgressBar(1, 1, "Failure!", "No tag found");
|
oledShowProgressBar(1, 1, tr(STR_FAILURE_EXCL), tr(STR_NO_TAG_FOUND));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||||
|
oledClearPriority();
|
||||||
nfcReaderState = NFC_IDLE;
|
nfcReaderState = NFC_IDLE;
|
||||||
|
|
||||||
// Send timeout response to API
|
// Send timeout response to API
|
||||||
@@ -1799,6 +1940,7 @@ void writeJsonToTag(void *parameter) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Reset write protection and cleanup
|
// Reset write protection and cleanup
|
||||||
|
oledClearPriority();
|
||||||
nfcWriteInProgress = false; // Re-enable high-level tag operations
|
nfcWriteInProgress = false; // Re-enable high-level tag operations
|
||||||
|
|
||||||
// Make sure we are in a safe state
|
// Make sure we are in a safe state
|
||||||
@@ -1812,7 +1954,7 @@ void writeJsonToTag(void *parameter) {
|
|||||||
vTaskDelete(NULL);
|
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) {
|
String optimizeJsonForFastPath(const char* payload) {
|
||||||
JsonDocument inputDoc;
|
JsonDocument inputDoc;
|
||||||
DeserializationError error = deserializeJson(inputDoc, payload);
|
DeserializationError error = deserializeJson(inputDoc, payload);
|
||||||
@@ -1823,23 +1965,31 @@ String optimizeJsonForFastPath(const char* payload) {
|
|||||||
return String(payload); // Return original if parsing fails
|
return String(payload); // Return original if parsing fails
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create optimized JSON with sm_id first
|
// Create optimized JSON with spool_id first
|
||||||
JsonDocument optimizedDoc;
|
JsonDocument optimizedDoc;
|
||||||
|
|
||||||
// Always add sm_id first (even if it's "0" for brand filaments)
|
// Always add spool_id first (even if it's "0" for brand filaments)
|
||||||
if (inputDoc["sm_id"].is<String>()) {
|
// Accept legacy sm_id as input too, but always emit spool_id
|
||||||
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
|
if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
|
||||||
Serial.print("Optimizing JSON: sm_id found = ");
|
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["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>());
|
Serial.println(inputDoc["sm_id"].as<String>());
|
||||||
} else {
|
} else {
|
||||||
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
|
optimizedDoc["spool_id"] = "0"; // Default for brand filaments
|
||||||
Serial.println("Optimizing JSON: No sm_id found, setting to '0'");
|
Serial.println("Optimizing JSON: No spool_id or sm_id found, setting spool_id to '0'");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add all other keys in original order
|
|
||||||
for (JsonPair kv : inputDoc.as<JsonObject>()) {
|
for (JsonPair kv : inputDoc.as<JsonObject>()) {
|
||||||
String key = kv.key().c_str();
|
String key = kv.key().c_str();
|
||||||
if (key != "sm_id") { // Skip sm_id as it's already added first
|
if (key != "sm_id" && key != "spool_id") {
|
||||||
optimizedDoc[key] = kv.value();
|
optimizedDoc[key] = kv.value();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1868,7 +2018,7 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
|
|||||||
return;
|
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);
|
String optimizedPayload = optimizeJsonForFastPath(payload);
|
||||||
|
|
||||||
NfcWriteParameterType* parameters = new NfcWriteParameterType();
|
NfcWriteParameterType* parameters = new NfcWriteParameterType();
|
||||||
@@ -1882,7 +2032,8 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
|
|||||||
nfcWriteInProgress = true; // Lock immediately to prevent race conditions
|
nfcWriteInProgress = true; // Lock immediately to prevent race conditions
|
||||||
Serial.println("startWriteJsonToTag: Starting task, lock acquired.");
|
Serial.println("startWriteJsonToTag: Starting task, lock acquired.");
|
||||||
|
|
||||||
oledShowProgressBar(0, 1, "Write Tag", "Place tag now");
|
oledShowProgressBar(0, 1, tr(STR_WRITE_TAG), tr(STR_PLACE_TAG_NOW));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||||
// Erstelle die Task
|
// Erstelle die Task
|
||||||
BaseType_t result = xTaskCreatePinnedToCore(
|
BaseType_t result = xTaskCreatePinnedToCore(
|
||||||
writeJsonToTag, // Task-Funktion
|
writeJsonToTag, // Task-Funktion
|
||||||
@@ -1902,7 +2053,8 @@ void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId
|
|||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
Serial.printf("startWriteJsonToTag: State mismatch (State: %d)\n", nfcReaderState);
|
Serial.printf("startWriteJsonToTag: State mismatch (State: %d)\n", nfcReaderState);
|
||||||
oledShowProgressBar(0, 1, "FAILURE", "NFC busy!");
|
oledShowProgressBar(0, 1, tr(STR_FAILURE), tr(STR_NFC_BUSY));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
free(parameters->payload);
|
free(parameters->payload);
|
||||||
delete parameters;
|
delete parameters;
|
||||||
}
|
}
|
||||||
@@ -1946,6 +2098,11 @@ void scanRfidTask(void * parameter) {
|
|||||||
esp_task_wdt_reset();
|
esp_task_wdt_reset();
|
||||||
yield();
|
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
|
// Skip scanning during write operations, but keep NFC interface active
|
||||||
if (nfcReaderState != NFC_WRITING && !nfcWriteInProgress && !nfcReadingTaskSuspendRequest && !booting)
|
if (nfcReaderState != NFC_WRITING && !nfcWriteInProgress && !nfcReadingTaskSuspendRequest && !booting)
|
||||||
{
|
{
|
||||||
@@ -1967,16 +2124,21 @@ void scanRfidTask(void * parameter) {
|
|||||||
// Set the current tag as not processed
|
// Set the current tag as not processed
|
||||||
tagProcessed = false;
|
tagProcessed = false;
|
||||||
|
|
||||||
|
// Wake display when a tag is detected
|
||||||
|
oledResetActivityTimer();
|
||||||
|
|
||||||
// Display some basic information about the card
|
// Display some basic information about the card
|
||||||
Serial.println("Found an ISO14443A card");
|
Serial.println("Found an ISO14443A card");
|
||||||
|
|
||||||
nfcReaderState = NFC_READING;
|
nfcReaderState = NFC_READING;
|
||||||
|
pauseMainTask = 1;
|
||||||
|
|
||||||
oledShowProgressBar(0, 4, "Reading", "Detecting tag");
|
oledShowProgressBar(0, 4, tr(STR_READING), tr(STR_DETECTING_TAG));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 1500);
|
||||||
|
|
||||||
// Reduced stabilization time for better responsiveness
|
// Stabilization time for reliable tag communication
|
||||||
Serial.println("Tag detected, minimal stabilization...");
|
Serial.println("Tag detected, stabilizing...");
|
||||||
vTaskDelay(pdMS_TO_TICKS(200)); // Reduced from 1000ms to 200ms
|
vTaskDelay(pdMS_TO_TICKS(500)); // Increased from 200ms for reliable reads
|
||||||
|
|
||||||
// create Tag UID string
|
// create Tag UID string
|
||||||
String uidString = "";
|
String uidString = "";
|
||||||
@@ -1993,11 +2155,12 @@ void scanRfidTask(void * parameter) {
|
|||||||
{
|
{
|
||||||
activeTagUuid = uidString;
|
activeTagUuid = uidString;
|
||||||
// Try fast-path detection first for known spools
|
// 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");
|
Serial.println("✓ FAST-PATH: Tag processed quickly, skipping full read");
|
||||||
// Set reader back to idle for next scan
|
// Set reader back to idle for next scan
|
||||||
nfcReaderState = NFC_READ_SUCCESS;
|
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
|
continue; // Skip full tag reading and continue scan loop
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2043,7 +2206,8 @@ void scanRfidTask(void * parameter) {
|
|||||||
|
|
||||||
if (!decodeNdefAndReturnJson(data, uidString))
|
if (!decodeNdefAndReturnJson(data, uidString))
|
||||||
{
|
{
|
||||||
oledShowProgressBar(1, 1, "Failure", "Unknown tag");
|
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
nfcReaderState = NFC_READ_ERROR;
|
nfcReaderState = NFC_READ_ERROR;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2058,7 +2222,8 @@ void scanRfidTask(void * parameter) {
|
|||||||
// NTAG reading failed, try reading as Bambu Lab tag
|
// NTAG reading failed, try reading as Bambu Lab tag
|
||||||
Serial.println("NTAG read failed, trying Bambu Lab tag...");
|
Serial.println("NTAG read failed, trying Bambu Lab tag...");
|
||||||
if (!detectBambuTag(uid, uidLength)) {
|
if (!detectBambuTag(uid, uidLength)) {
|
||||||
oledShowProgressBar(1, 1, "Failure", "Tag read error");
|
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_TAG_READ_ERROR));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
nfcReaderState = NFC_READ_ERROR;
|
nfcReaderState = NFC_READ_ERROR;
|
||||||
activeSpoolId = "";
|
activeSpoolId = "";
|
||||||
Serial.println("Tag read failed - activeSpoolId reset to prevent autoSet");
|
Serial.println("Tag read failed - activeSpoolId reset to prevent autoSet");
|
||||||
@@ -2067,18 +2232,51 @@ void scanRfidTask(void * parameter) {
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// UID length != 7, might be a Mifare Classic (Bambu tags)
|
// UID length != 7 — could be Mifare Classic (BambuLab) or non-standard NTAG.
|
||||||
Serial.println("Not a standard NTAG (UID length != 7), trying Bambu Lab tag...");
|
// 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)) {
|
if (!detectBambuTag(uid, uidLength)) {
|
||||||
//TBD: Show error here?!
|
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
|
||||||
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)!");
|
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 = "";
|
activeSpoolId = "";
|
||||||
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
|
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!success && nfcReaderState != NFC_IDLE && !nfcReadingTaskSuspendRequest)
|
if (!success && nfcReaderState != NFC_IDLE && !nfcReadingTaskSuspendRequest)
|
||||||
{
|
{
|
||||||
@@ -2088,6 +2286,8 @@ void scanRfidTask(void * parameter) {
|
|||||||
activeSpoolId = "";
|
activeSpoolId = "";
|
||||||
activeTagUuid = "";
|
activeTagUuid = "";
|
||||||
tagProcessed = false;
|
tagProcessed = false;
|
||||||
|
pauseMainTask = 0;
|
||||||
|
oledClearPriority();
|
||||||
oledShowWeight(weight);
|
oledShowWeight(weight);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2134,14 +2334,14 @@ void scanRfidTask(void * parameter) {
|
|||||||
|
|
||||||
void startNfc() {
|
void startNfc() {
|
||||||
nfcRequestMutex = xSemaphoreCreateMutex();
|
nfcRequestMutex = xSemaphoreCreateMutex();
|
||||||
oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, "NFC init");
|
oledShowProgressBar(4, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
|
||||||
nfc.begin(); // Beginne Kommunikation mit RFID Leser
|
nfc.begin(); // Beginne Kommunikation mit RFID Leser
|
||||||
|
|
||||||
delay(1000);
|
delay(1000);
|
||||||
unsigned long versiondata = nfc.getFirmwareVersion(); // Lese Versionsnummer der Firmware aus
|
unsigned long versiondata = nfc.getFirmwareVersion(); // Lese Versionsnummer der Firmware aus
|
||||||
if (! versiondata) { // Wenn keine Antwort kommt
|
if (! versiondata) { // Wenn keine Antwort kommt
|
||||||
Serial.println("Kann kein RFID Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor
|
Serial.println("Kann kein RFID Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor
|
||||||
oledDisplayText("No RFID Board found");
|
oledDisplayText(tr(STR_NO_RFID_BOARD));
|
||||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ void scanRfidTask(void * parameter);
|
|||||||
void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId = 0, int locationId = 0);
|
void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId = 0, int locationId = 0);
|
||||||
bool quickSpoolIdCheck(String uidString);
|
bool quickSpoolIdCheck(String uidString);
|
||||||
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
|
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
|
||||||
|
void setScanRequest(bool active);
|
||||||
|
|
||||||
extern TaskHandle_t RfidReaderTask;
|
extern TaskHandle_t RfidReaderTask;
|
||||||
extern String nfcJsonData;
|
extern String nfcJsonData;
|
||||||
@@ -36,6 +37,7 @@ extern String activeTagUuid;
|
|||||||
extern String lastSpoolId;
|
extern String lastSpoolId;
|
||||||
extern volatile nfcReaderStateType nfcReaderState;
|
extern volatile nfcReaderStateType nfcReaderState;
|
||||||
extern volatile bool nfcWriteInProgress;
|
extern volatile bool nfcWriteInProgress;
|
||||||
|
extern volatile bool scanRequestActive;
|
||||||
extern bool tagProcessed;
|
extern bool tagProcessed;
|
||||||
extern bool isBambuTag;
|
extern bool isBambuTag;
|
||||||
|
|
||||||
|
|||||||
+32
-24
@@ -3,6 +3,7 @@
|
|||||||
#include <commonFS.h>
|
#include <commonFS.h>
|
||||||
#include "scale.h"
|
#include "scale.h"
|
||||||
#include "nfc.h"
|
#include "nfc.h"
|
||||||
|
#include "lang.h"
|
||||||
|
|
||||||
|
|
||||||
// Globale Variablen für Config Backups hinzufügen
|
// Globale Variablen für Config Backups hinzufügen
|
||||||
@@ -15,6 +16,7 @@ static int currentUpdateCommand = 0;
|
|||||||
static size_t updateTotalSize = 0;
|
static size_t updateTotalSize = 0;
|
||||||
static size_t updateWritten = 0;
|
static size_t updateWritten = 0;
|
||||||
static bool isSpiffsUpdate = false;
|
static bool isSpiffsUpdate = false;
|
||||||
|
static size_t lastYieldAt = 0; // Für WiFi-Yield während großer Uploads
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compares two version strings and determines if version1 is less than version2
|
* Compares two version strings and determines if version1 is less than version2
|
||||||
@@ -63,11 +65,18 @@ void espRestart() {
|
|||||||
|
|
||||||
void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) {
|
void sendUpdateProgress(int progress, const char* status = nullptr, const char* message = nullptr) {
|
||||||
static int lastSentProgress = -1;
|
static int lastSentProgress = -1;
|
||||||
|
static unsigned long lastSendTime = 0;
|
||||||
|
|
||||||
// Verhindere zu häufige Updates
|
unsigned long now = millis();
|
||||||
|
|
||||||
|
// Verhindere zu häufige Updates - mindestens 500ms zwischen Progress-Updates
|
||||||
|
// Dies reduziert WebSocket-Traffic während des Uploads erheblich
|
||||||
if (progress == lastSentProgress && !status && !message) {
|
if (progress == lastSentProgress && !status && !message) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (now - lastSendTime < 500 && progress < 100 && !status) {
|
||||||
|
return; // Throttle normale Progress-Updates
|
||||||
|
}
|
||||||
|
|
||||||
String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress);
|
String progressMsg = "{\"type\":\"updateProgress\",\"progress\":" + String(progress);
|
||||||
if (status) {
|
if (status) {
|
||||||
@@ -78,23 +87,13 @@ void sendUpdateProgress(int progress, const char* status = nullptr, const char*
|
|||||||
}
|
}
|
||||||
progressMsg += "}";
|
progressMsg += "}";
|
||||||
|
|
||||||
if (progress >= 100) {
|
// Sende Progress-Update (nur einmal, nicht mehrfach)
|
||||||
// Sende die Nachricht nur einmal für den Abschluss
|
|
||||||
ws.textAll("{\"type\":\"updateProgress\",\"progress\":100,\"status\":\"success\",\"message\":\"Update successful! Restarting device...\"}");
|
|
||||||
delay(50);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sende die Nachricht mehrmals mit Verzögerung für wichtige Updates
|
|
||||||
if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) {
|
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
ws.textAll(progressMsg);
|
ws.textAll(progressMsg);
|
||||||
delay(100); // Längerer Delay zwischen Nachrichten
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ws.textAll(progressMsg);
|
|
||||||
delay(50);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Yield für WiFi-Stack nach jedem WebSocket-Send
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
|
|
||||||
|
lastSendTime = now;
|
||||||
lastSentProgress = progress;
|
lastSentProgress = progress;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,6 +130,7 @@ void handleUpdate(AsyncWebServer &server) {
|
|||||||
if (!index) {
|
if (!index) {
|
||||||
updateTotalSize = request->contentLength();
|
updateTotalSize = request->contentLength();
|
||||||
updateWritten = 0;
|
updateWritten = 0;
|
||||||
|
lastYieldAt = 0; // Reset yield counter
|
||||||
isSpiffsUpdate = (filename.indexOf("website") > -1);
|
isSpiffsUpdate = (filename.indexOf("website") > -1);
|
||||||
|
|
||||||
if (isSpiffsUpdate) {
|
if (isSpiffsUpdate) {
|
||||||
@@ -146,14 +146,14 @@ void handleUpdate(AsyncWebServer &server) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
|
sendUpdateProgress(5, "starting", "Starting SPIFFS update...");
|
||||||
vTaskDelay(pdMS_TO_TICKS(200));
|
vTaskDelay(pdMS_TO_TICKS(100));
|
||||||
} else {
|
} else {
|
||||||
if (!Update.begin(updateTotalSize)) {
|
if (!Update.begin(updateTotalSize)) {
|
||||||
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
|
request->send(400, "application/json", "{\"success\":false,\"message\":\"Update initialization failed\"}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
sendUpdateProgress(0, "starting", "Starting firmware update...");
|
sendUpdateProgress(0, "starting", "Starting firmware update...");
|
||||||
vTaskDelay(pdMS_TO_TICKS(200));
|
vTaskDelay(pdMS_TO_TICKS(100));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,22 +164,30 @@ void handleUpdate(AsyncWebServer &server) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
updateWritten += len;
|
updateWritten += len;
|
||||||
|
|
||||||
|
// KRITISCH: Yield alle 32KB für WiFi-Stack bei großen Uploads (1.5-2MB)
|
||||||
|
// Ohne dies kann der WiFi-Stack blockieren und der Upload hängen bleiben
|
||||||
|
if (updateWritten - lastYieldAt >= 32768) {
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(5)); // Kurze Pause für WiFi-Stack
|
||||||
|
lastYieldAt = updateWritten;
|
||||||
|
}
|
||||||
|
|
||||||
int currentProgress;
|
int currentProgress;
|
||||||
|
|
||||||
// Berechne den Fortschritt basierend auf dem Update-Typ
|
// Berechne den Fortschritt basierend auf dem Update-Typ
|
||||||
if (isSpiffsUpdate) {
|
if (isSpiffsUpdate) {
|
||||||
// SPIFFS: 5-75% für Upload
|
// SPIFFS: 5-100% für Upload
|
||||||
currentProgress = 6 + (updateWritten * 100) / updateTotalSize;
|
currentProgress = 5 + (updateWritten * 95) / updateTotalSize;
|
||||||
} else {
|
} else {
|
||||||
// Firmware: 0-100% für Upload
|
// Firmware: 0-100% für Upload
|
||||||
currentProgress = 1 + (updateWritten * 100) / updateTotalSize;
|
currentProgress = (updateWritten * 100) / updateTotalSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lastProgress = -1;
|
static int lastProgress = -1;
|
||||||
if (currentProgress != lastProgress && (currentProgress % 10 == 0 || final)) {
|
// Nur alle 5% Progress-Updates senden (reduziert WebSocket-Traffic)
|
||||||
|
if (currentProgress != lastProgress && (currentProgress % 5 == 0 || final)) {
|
||||||
sendUpdateProgress(currentProgress, "uploading");
|
sendUpdateProgress(currentProgress, "uploading");
|
||||||
oledShowProgressBar(currentProgress, 100, "Update", "Download");
|
oledShowProgressBar(currentProgress, 100, tr(STR_UPDATE), tr(STR_DOWNLOAD));
|
||||||
vTaskDelay(pdMS_TO_TICKS(50));
|
|
||||||
lastProgress = currentProgress;
|
lastProgress = currentProgress;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+130
-17
@@ -7,6 +7,7 @@
|
|||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "esp_task_wdt.h"
|
#include "esp_task_wdt.h"
|
||||||
#include <Preferences.h>
|
#include <Preferences.h>
|
||||||
|
#include "lang.h"
|
||||||
|
|
||||||
HX711 scale;
|
HX711 scale;
|
||||||
|
|
||||||
@@ -34,10 +35,22 @@ uint8_t scale_tare_counter = 0;
|
|||||||
bool scaleTareRequest = false;
|
bool scaleTareRequest = false;
|
||||||
uint8_t pauseMainTask = 0;
|
uint8_t pauseMainTask = 0;
|
||||||
bool scaleCalibrated;
|
bool scaleCalibrated;
|
||||||
|
bool scaleConnected;
|
||||||
bool autoTare = true;
|
bool autoTare = true;
|
||||||
bool scaleCalibrationActive = false;
|
bool scaleCalibrationActive = false;
|
||||||
volatile bool scaleCalibrationRequest = false;
|
volatile bool scaleCalibrationRequest = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Non blocking wait function
|
||||||
|
*/
|
||||||
|
void friendlyWait(uint16_t ticks) {
|
||||||
|
for (uint16_t i = 0; i < ticks; i++) {
|
||||||
|
yield();
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(1));
|
||||||
|
esp_task_wdt_reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ##### Weight stabilization functions #####
|
// ##### Weight stabilization functions #####
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -169,7 +182,7 @@ void scale_loop(void * parameter) {
|
|||||||
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
||||||
{
|
{
|
||||||
Serial.println("Re-Tare scale");
|
Serial.println("Re-Tare scale");
|
||||||
oledDisplayText("TARE Scale");
|
oledDisplayText(tr(STR_TARE_SCALE));
|
||||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||||
scale.tare();
|
scale.tare();
|
||||||
resetWeightFilter(); // Reset filter after manual tare
|
resetWeightFilter(); // Reset filter after manual tare
|
||||||
@@ -195,6 +208,7 @@ void scale_loop(void * parameter) {
|
|||||||
// Update global weight variable only if it changed significantly (for API actions)
|
// Update global weight variable only if it changed significantly (for API actions)
|
||||||
if (stabilizedWeight != weight) {
|
if (stabilizedWeight != weight) {
|
||||||
weight = stabilizedWeight;
|
weight = stabilizedWeight;
|
||||||
|
oledResetActivityTimer(); // Wake display on weight change
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prüfen ob die Waage korrekt genullt ist
|
// Prüfen ob die Waage korrekt genullt ist
|
||||||
@@ -222,6 +236,102 @@ void scale_loop(void * parameter) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
long readHX711Raw() {
|
||||||
|
long value = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < 24; i++) {
|
||||||
|
digitalWrite(LOADCELL_SCK_PIN, HIGH);
|
||||||
|
delayMicroseconds(1);
|
||||||
|
|
||||||
|
value = (value << 1) | digitalRead(LOADCELL_DOUT_PIN);
|
||||||
|
|
||||||
|
digitalWrite(LOADCELL_SCK_PIN, LOW);
|
||||||
|
delayMicroseconds(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gain = 128 (1 extra pulse)
|
||||||
|
digitalWrite(LOADCELL_SCK_PIN, HIGH);
|
||||||
|
delayMicroseconds(1);
|
||||||
|
digitalWrite(LOADCELL_SCK_PIN, LOW);
|
||||||
|
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool deepSearchScale() {
|
||||||
|
// without pull-up resistor (10k) on LOADCELL_DOUT_PIN the hx711 lib functions
|
||||||
|
// are not reliable in detecting a missing chip
|
||||||
|
// these tests work even without pull-up resistor
|
||||||
|
const uint32_t timeout = 1000;
|
||||||
|
const int samples = 10;
|
||||||
|
|
||||||
|
pinMode(LOADCELL_DOUT_PIN, INPUT);
|
||||||
|
pinMode(LOADCELL_SCK_PIN, OUTPUT);
|
||||||
|
digitalWrite(LOADCELL_SCK_PIN, LOW);
|
||||||
|
|
||||||
|
//delay(500);
|
||||||
|
friendlyWait(500);
|
||||||
|
|
||||||
|
// 1. HX711 vorhanden?
|
||||||
|
uint32_t start = millis();
|
||||||
|
while (digitalRead(LOADCELL_DOUT_PIN) == HIGH) {
|
||||||
|
if (millis() - start > timeout) {
|
||||||
|
Serial.println("HX711 not found (DOUT stays HIGH).");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Serial.println("HX711 seems to answer...");
|
||||||
|
|
||||||
|
// 2. Mehrere Werte lesen
|
||||||
|
long values[samples];
|
||||||
|
|
||||||
|
for (int i = 0; i < samples; i++) {
|
||||||
|
// warten bis bereit
|
||||||
|
uint32_t t = millis();
|
||||||
|
while (digitalRead(LOADCELL_DOUT_PIN) == HIGH) {
|
||||||
|
if (millis() - t > timeout) {
|
||||||
|
Serial.println("HX711 not found (Timeout during read).");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
values[i] = readHX711Raw();
|
||||||
|
delay(50);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Analyse
|
||||||
|
int invalidCount = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < samples; i++) {
|
||||||
|
if (values[i] == 0 || values[i] == 0xFFFFFF) {
|
||||||
|
invalidCount++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Entscheidungen
|
||||||
|
|
||||||
|
// Kein Sensor
|
||||||
|
if (invalidCount > samples / 2) {
|
||||||
|
Serial.println("HX711 not ready (Loadcell missing).");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Serial.println("HX711 found.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool scaleDetected(){
|
||||||
|
// Step 1: use hx711 library functions (need pull-up resistor to recognize missing hx711)
|
||||||
|
if ( !(scale.wait_ready_timeout(1000))) {
|
||||||
|
Serial.println("HX711 not found (pull-up resistor installed).");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Step 2: when pull-up resistor is missing, then deep search...
|
||||||
|
return deepSearchScale();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
void start_scale(bool touchSensorConnected) {
|
void start_scale(bool touchSensorConnected) {
|
||||||
Serial.println("Prüfe Calibration Value");
|
Serial.println("Prüfe Calibration Value");
|
||||||
float calibrationValue;
|
float calibrationValue;
|
||||||
@@ -250,17 +360,11 @@ void start_scale(bool touchSensorConnected) {
|
|||||||
|
|
||||||
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
|
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
|
||||||
|
|
||||||
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, "Serching scale");
|
oledShowProgressBar(5, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE));
|
||||||
for (uint16_t i = 0; i < 3000; i++) {
|
friendlyWait(3000);
|
||||||
yield();
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(1));
|
|
||||||
esp_task_wdt_reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
while(!scale.is_ready()) {
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(5000));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
scaleConnected = scaleDetected();
|
||||||
|
if ( scaleConnected ) {
|
||||||
scale.set_scale(calibrationValue);
|
scale.set_scale(calibrationValue);
|
||||||
//vTaskDelay(pdMS_TO_TICKS(5000));
|
//vTaskDelay(pdMS_TO_TICKS(5000));
|
||||||
|
|
||||||
@@ -286,6 +390,15 @@ void start_scale(bool touchSensorConnected) {
|
|||||||
Serial.println("ScaleLoop-Task erfolgreich erstellt");
|
Serial.println("ScaleLoop-Task erfolgreich erstellt");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
// No HX711 - switching to NFC-only mode
|
||||||
|
Serial.println("Kann kein HX711 Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor
|
||||||
|
oledDisplayText(tr(STR_HX711_NOT_FOUND));
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(1500));
|
||||||
|
oledDisplayText(tr(STR_NOSCALE_MODE));
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(1500));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
uint8_t calibrate_scale() {
|
uint8_t calibrate_scale() {
|
||||||
uint8_t returnState = 0;
|
uint8_t returnState = 0;
|
||||||
@@ -303,7 +416,7 @@ uint8_t calibrate_scale() {
|
|||||||
{
|
{
|
||||||
|
|
||||||
scale.set_scale();
|
scale.set_scale();
|
||||||
oledShowProgressBar(0, 3, "Scale Cal.", "Empty Scale");
|
oledShowProgressBar(0, 3, tr(STR_SCALE_CAL), tr(STR_EMPTY_SCALE));
|
||||||
|
|
||||||
for (uint16_t i = 0; i < 5000; i++) {
|
for (uint16_t i = 0; i < 5000; i++) {
|
||||||
yield();
|
yield();
|
||||||
@@ -315,7 +428,7 @@ uint8_t calibrate_scale() {
|
|||||||
Serial.println("Tare done...");
|
Serial.println("Tare done...");
|
||||||
Serial.print("Place a known weight on the scale...");
|
Serial.print("Place a known weight on the scale...");
|
||||||
|
|
||||||
oledShowProgressBar(1, 3, "Scale Cal.", "Place the weight");
|
oledShowProgressBar(1, 3, tr(STR_SCALE_CAL), tr(STR_PLACE_WEIGHT));
|
||||||
|
|
||||||
for (uint16_t i = 0; i < 5000; i++) {
|
for (uint16_t i = 0; i < 5000; i++) {
|
||||||
yield();
|
yield();
|
||||||
@@ -348,7 +461,7 @@ uint8_t calibrate_scale() {
|
|||||||
Serial.print("Verified stored value: ");
|
Serial.print("Verified stored value: ");
|
||||||
Serial.println(verifyValue);
|
Serial.println(verifyValue);
|
||||||
|
|
||||||
oledShowProgressBar(2, 3, "Scale Cal.", "Remove weight");
|
oledShowProgressBar(2, 3, tr(STR_SCALE_CAL), tr(STR_REMOVE_WEIGHT));
|
||||||
|
|
||||||
scale.set_scale(newCalibrationValue);
|
scale.set_scale(newCalibrationValue);
|
||||||
resetWeightFilter(); // Reset filter after calibration
|
resetWeightFilter(); // Reset filter after calibration
|
||||||
@@ -358,7 +471,7 @@ uint8_t calibrate_scale() {
|
|||||||
esp_task_wdt_reset();
|
esp_task_wdt_reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
oledShowProgressBar(3, 3, "Scale Cal.", "Completed");
|
oledShowProgressBar(3, 3, tr(STR_SCALE_CAL), tr(STR_COMPLETED));
|
||||||
|
|
||||||
// For some reason it is not possible to re-tare the scale here, it will result in a wdt timeout. Instead let the scale loop do the taring
|
// For some reason it is not possible to re-tare the scale here, it will result in a wdt timeout. Instead let the scale loop do the taring
|
||||||
//scale.tare();
|
//scale.tare();
|
||||||
@@ -377,7 +490,7 @@ uint8_t calibrate_scale() {
|
|||||||
{
|
{
|
||||||
Serial.println("Calibration value is invalid. Please recalibrate.");
|
Serial.println("Calibration value is invalid. Please recalibrate.");
|
||||||
|
|
||||||
oledShowProgressBar(3, 3, "Failure", "Calibration error");
|
oledShowProgressBar(3, 3, tr(STR_FAILURE), tr(STR_CALIBRATION_ERROR));
|
||||||
|
|
||||||
for (uint16_t i = 0; i < 50000; i++) {
|
for (uint16_t i = 0; i < 50000; i++) {
|
||||||
yield();
|
yield();
|
||||||
@@ -391,7 +504,7 @@ uint8_t calibrate_scale() {
|
|||||||
{
|
{
|
||||||
Serial.println("HX711 not found.");
|
Serial.println("HX711 not found.");
|
||||||
|
|
||||||
oledDisplayText("HX711 not found");
|
oledDisplayText(tr(STR_HX711_NOT_FOUND));
|
||||||
|
|
||||||
for (uint16_t i = 0; i < 30000; i++) {
|
for (uint16_t i = 0; i < 30000; i++) {
|
||||||
yield();
|
yield();
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ extern uint8_t scale_tare_counter;
|
|||||||
extern bool scaleTareRequest;
|
extern bool scaleTareRequest;
|
||||||
extern uint8_t pauseMainTask;
|
extern uint8_t pauseMainTask;
|
||||||
extern bool scaleCalibrated;
|
extern bool scaleCalibrated;
|
||||||
|
extern bool scaleConnected;
|
||||||
extern bool autoTare;
|
extern bool autoTare;
|
||||||
extern bool scaleCalibrationActive;
|
extern bool scaleCalibrationActive;
|
||||||
extern volatile bool scaleCalibrationRequest;
|
extern volatile bool scaleCalibrationRequest;
|
||||||
|
|||||||
+99
-49
@@ -11,12 +11,14 @@
|
|||||||
#include "ota.h"
|
#include "ota.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
#include "lang.h"
|
||||||
|
|
||||||
#ifndef VERSION
|
#ifndef VERSION
|
||||||
#define VERSION "1.2.0"
|
#define VERSION "1.2.0"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NO_CACHE "no-cache, no-store, must-revalidate"
|
#define NO_CACHE "no-cache, no-store, must-revalidate"
|
||||||
|
#define CACHE_ASSETS "max-age=86400" // 24h Cache für statische Assets
|
||||||
|
|
||||||
AsyncWebServer server(webserverPort);
|
AsyncWebServer server(webserverPort);
|
||||||
AsyncWebSocket ws("/ws");
|
AsyncWebSocket ws("/ws");
|
||||||
@@ -24,6 +26,15 @@ AsyncWebSocket ws("/ws");
|
|||||||
uint8_t lastSuccess = 0;
|
uint8_t lastSuccess = 0;
|
||||||
nfcReaderStateType lastnfcReaderState = NFC_IDLE;
|
nfcReaderStateType lastnfcReaderState = NFC_IDLE;
|
||||||
|
|
||||||
|
// Template-Processor für dynamische Seiten (ESPAsyncWebServer built-in)
|
||||||
|
// Ersetzt %variable% Platzhalter in HTML-Dateien
|
||||||
|
String templateProcessor(const String& var) {
|
||||||
|
if (var == "registered") return filamanRegistered ? "Registered" : "Not Registered";
|
||||||
|
if (var == "filamanUrl") return filamanUrl;
|
||||||
|
if (var == "autoTare") return autoTare ? "checked" : "";
|
||||||
|
return String(); // Unbekannte Variable - leer zurückgeben
|
||||||
|
}
|
||||||
|
|
||||||
void sendNfcDataToClient(AsyncWebSocketClient *client) {
|
void sendNfcDataToClient(AsyncWebSocketClient *client) {
|
||||||
if(!client) return;
|
if(!client) return;
|
||||||
switch(nfcReaderState){
|
switch(nfcReaderState){
|
||||||
@@ -113,74 +124,52 @@ void sendNfcData() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void setupWebserver(AsyncWebServer &server) {
|
void setupWebserver(AsyncWebServer &server) {
|
||||||
oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, "Webserver init");
|
oledShowProgressBar(2, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WEBSERVER_INIT));
|
||||||
|
|
||||||
ws.onEvent(onWsEvent);
|
ws.onEvent(onWsEvent);
|
||||||
server.addHandler(&ws);
|
server.addHandler(&ws);
|
||||||
|
|
||||||
// Static Routes
|
// ===== STATISCHE ASSETS mit serveStatic() =====
|
||||||
|
// Optimiert für concurrent Requests, mit 24h Browser-Cache
|
||||||
|
// serveStatic() ist nicht-blockierend und handhabt parallele Requests besser
|
||||||
|
server.serveStatic("/style.css", LittleFS, "/style.css")
|
||||||
|
.setCacheControl(CACHE_ASSETS);
|
||||||
|
server.serveStatic("/logo.png", LittleFS, "/logo.png")
|
||||||
|
.setCacheControl(CACHE_ASSETS);
|
||||||
|
server.serveStatic("/favicon.ico", LittleFS, "/favicon.ico")
|
||||||
|
.setCacheControl(CACHE_ASSETS);
|
||||||
|
|
||||||
|
// ===== STATISCHE HTML-SEITEN (ohne Template-Ersetzung) =====
|
||||||
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
Serial.println("Web: Request /");
|
Serial.println("Web: Request /");
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/index.html", "text/html");
|
request->send(LittleFS, "/index.html", "text/html");
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
|
||||||
request->send(response);
|
|
||||||
});
|
|
||||||
|
|
||||||
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
||||||
Serial.println("Web: Request /waage");
|
|
||||||
String html = readFile("/waage.html");
|
|
||||||
html.replace("{{autoTare}}", autoTare ? "checked" : "");
|
|
||||||
auto response = request->beginResponse(200, "text/html", html);
|
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
|
||||||
request->send(response);
|
|
||||||
});
|
|
||||||
|
|
||||||
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
||||||
Serial.println("Web: Request /setup");
|
|
||||||
String html = readFile("/setup.html");
|
|
||||||
html.replace("{{registered}}", filamanRegistered ? "Registered" : "Not Registered");
|
|
||||||
html.replace("{{filamanUrl}}", filamanUrl);
|
|
||||||
auto response = request->beginResponse(200, "text/html", html);
|
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
|
||||||
request->send(response);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
Serial.println("Web: Request /wifi");
|
Serial.println("Web: Request /wifi");
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/wifi.html", "text/html");
|
request->send(LittleFS, "/wifi.html", "text/html");
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
|
||||||
request->send(response);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
|
server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest *request) {
|
||||||
Serial.println("Web: Request /upgrade");
|
Serial.println("Web: Request /upgrade");
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/upgrade.html", "text/html");
|
request->send(LittleFS, "/upgrade.html", "text/html");
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
|
||||||
request->send(response);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/version.txt", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/version.txt", "text/plain");
|
request->send(LittleFS, "/version.txt", "text/plain");
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
|
||||||
request->send(response);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
|
// ===== DYNAMISCHE HTML-SEITEN (mit Template-Processor) =====
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/style.css", "text/css");
|
// Nutzt den eingebauten Template-Processor für %variable% Ersetzung
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
// Nicht-blockierend: Datei wird gestreamt und Variablen on-the-fly ersetzt
|
||||||
request->send(response);
|
server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
|
Serial.println("Web: Request /waage");
|
||||||
|
request->send(LittleFS, "/waage.html", "text/html", false, templateProcessor);
|
||||||
});
|
});
|
||||||
|
|
||||||
server.on("/logo.png", HTTP_GET, [](AsyncWebServerRequest *request){
|
server.on("/setup", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/logo.png", "image/png");
|
Serial.println("Web: Request /setup");
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
request->send(LittleFS, "/setup.html", "text/html", false, templateProcessor);
|
||||||
request->send(response);
|
|
||||||
});
|
|
||||||
|
|
||||||
server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){
|
|
||||||
AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/favicon.ico", "image/x-icon");
|
|
||||||
response->addHeader("Cache-Control", NO_CACHE);
|
|
||||||
request->send(response);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// API Routes
|
// API Routes
|
||||||
@@ -226,11 +215,14 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
String payloadString;
|
String payloadString;
|
||||||
serializeJson(doc, payloadString);
|
serializeJson(doc, payloadString);
|
||||||
|
|
||||||
|
bool hasSpoolId = !doc["spool_id"].isNull() || !doc["sm_id"].isNull();
|
||||||
int spoolId = doc["spool_id"] | 0;
|
int spoolId = doc["spool_id"] | 0;
|
||||||
|
if (spoolId == 0 && doc["sm_id"].is<String>()) {
|
||||||
|
spoolId = doc["sm_id"].as<String>().toInt();
|
||||||
|
}
|
||||||
int locationId = doc["location_id"] | 0;
|
int locationId = doc["location_id"] | 0;
|
||||||
|
|
||||||
// Start write task (fire and forget)
|
startWriteJsonToTag(hasSpoolId, payloadString.c_str(), spoolId, locationId);
|
||||||
startWriteJsonToTag(!doc["spool_id"].isNull(), payloadString.c_str(), spoolId, locationId);
|
|
||||||
|
|
||||||
// Respond immediately
|
// Respond immediately
|
||||||
request->send(200, "application/json", "{\"success\": true, \"message\": \"Schreibvorgang wurde gestartet. Bitte Tag bereit halten...\"}");
|
request->send(200, "application/json", "{\"success\": true, \"message\": \"Schreibvorgang wurde gestartet. Bitte Tag bereit halten...\"}");
|
||||||
@@ -240,6 +232,64 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
request->send(200, "application/json", "{\"version\": \"" VERSION "\"}");
|
request->send(200, "application/json", "{\"version\": \"" VERSION "\"}");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Language API
|
||||||
|
server.on("/api/language", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
|
JsonDocument doc;
|
||||||
|
doc["lang"] = getLangCode();
|
||||||
|
String response;
|
||||||
|
serializeJson(doc, response);
|
||||||
|
request->send(200, "application/json", response);
|
||||||
|
});
|
||||||
|
|
||||||
|
server.on("/api/language", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
||||||
|
JsonDocument doc;
|
||||||
|
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
|
||||||
|
if (error) {
|
||||||
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String lang = doc["lang"] | "";
|
||||||
|
if (lang == "de") {
|
||||||
|
saveLanguage(LANG_DE);
|
||||||
|
} else if (lang == "en") {
|
||||||
|
saveLanguage(LANG_EN);
|
||||||
|
} else {
|
||||||
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid language\"}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
request->send(200, "application/json", "{\"success\": true}");
|
||||||
|
});
|
||||||
|
|
||||||
|
// Display Settings API
|
||||||
|
server.on("/api/display", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
|
JsonDocument doc;
|
||||||
|
doc["sleepTimeout"] = oledSleepTimeout;
|
||||||
|
String response;
|
||||||
|
serializeJson(doc, response);
|
||||||
|
request->send(200, "application/json", response);
|
||||||
|
});
|
||||||
|
|
||||||
|
server.on("/api/display", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
||||||
|
JsonDocument doc;
|
||||||
|
DeserializationError error = deserializeJson(doc, (const uint8_t*)data, len);
|
||||||
|
if (error) {
|
||||||
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!doc["sleepTimeout"].is<int>()) {
|
||||||
|
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing sleepTimeout\"}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint16_t timeout = (uint16_t)constrain((int)doc["sleepTimeout"], 0, 3600);
|
||||||
|
saveOledSleepTimeout(timeout);
|
||||||
|
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){
|
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||||
request->send(200, "text/plain", "Rebooting...");
|
request->send(200, "text/plain", "Rebooting...");
|
||||||
delay(500);
|
delay(500);
|
||||||
|
|||||||
+66
-29
@@ -6,6 +6,7 @@
|
|||||||
#include <DNSServer.h>
|
#include <DNSServer.h>
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "lang.h"
|
||||||
|
|
||||||
WiFiManager wm;
|
WiFiManager wm;
|
||||||
bool wm_nonblocking = false;
|
bool wm_nonblocking = false;
|
||||||
@@ -16,28 +17,70 @@ void wifiSettings() {
|
|||||||
WiFi.mode(WIFI_STA);
|
WiFi.mode(WIFI_STA);
|
||||||
WiFi.setHostname("FilaMan");
|
WiFi.setHostname("FilaMan");
|
||||||
|
|
||||||
// Wir lassen das Power Management (Sleep) auf dem ESP-Standard.
|
// ESP32-Core Auto-Reconnect aktivieren (unabhängig vom WiFiManager-Flag).
|
||||||
// Ein erzwungenes Ausschalten führt zu RF-Abstürzen bei vielen asynchronen HTTP-Requests.
|
// 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)
|
// Angemessene Sendeleistung (reduziert Hitzeprobleme)
|
||||||
WiFi.setTxPower(WIFI_POWER_17dBm); // Set stable transmit power (default is 19.5 which gets hot)
|
WiFi.setTxPower(WIFI_POWER_17dBm);
|
||||||
|
|
||||||
// Wir überlassen die Protokoll-Aushandlung (b/g/n) dem Treiber. Harte Vorgaben crashen unter Last.
|
// 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.
|
||||||
|
}
|
||||||
|
|
||||||
// Aktiviere WiFi-Roaming für bessere Stabilität
|
// Reagiert sofort auf Verbindungsverlust, statt bis zum nächsten
|
||||||
esp_wifi_set_rssi_threshold(-80);
|
// 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) {
|
void configModeCallback (WiFiManager *myWiFiManager) {
|
||||||
Serial.println("Entered config mode");
|
Serial.println("Entered config mode");
|
||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
oledDisplayText("WiFi Config Mode");
|
oledDisplayText(tr(STR_WIFI_CONFIG_MODE));
|
||||||
}
|
}
|
||||||
|
|
||||||
void initWiFi() {
|
void initWiFi() {
|
||||||
// load Wifi settings
|
// load Wifi settings
|
||||||
wifiSettings();
|
wifiSettings();
|
||||||
|
|
||||||
|
// WiFi-Events abonnieren, bevor autoConnect() läuft, damit auch frühe
|
||||||
|
// Disconnects/Reconnects schon erfasst werden.
|
||||||
|
WiFi.onEvent(onWiFiEvent);
|
||||||
|
|
||||||
wm.setAPCallback(configModeCallback);
|
wm.setAPCallback(configModeCallback);
|
||||||
|
|
||||||
wm.setSaveConfigCallback([]() {
|
wm.setSaveConfigCallback([]() {
|
||||||
@@ -47,17 +90,20 @@ void initWiFi() {
|
|||||||
|
|
||||||
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
||||||
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
|
//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);
|
wm.setConnectTimeout(10);
|
||||||
|
|
||||||
oledShowProgressBar(1, 7, DISPLAY_BOOT_TEXT, "WiFi init");
|
oledShowProgressBar(1, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_WIFI_INIT));
|
||||||
|
|
||||||
//bool res = wm.autoConnect("FilaMan"); // anonymous ap
|
//bool res = wm.autoConnect("FilaMan"); // anonymous ap
|
||||||
if(!wm.autoConnect("FilaMan")) {
|
if(!wm.autoConnect("FilaMan")) {
|
||||||
Serial.println("Failed to connect or hit timeout");
|
Serial.println("Failed to connect or hit timeout");
|
||||||
// ESP.restart();
|
// ESP.restart();
|
||||||
oledShowTopRow();
|
oledShowTopRow();
|
||||||
oledDisplayText("WiFi not connected Check Portal");
|
oledDisplayText(tr(STR_WIFI_NOT_CONNECTED));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
wifiOn = true;
|
wifiOn = true;
|
||||||
@@ -74,33 +120,24 @@ void initWiFi() {
|
|||||||
void checkWiFiConnection() {
|
void checkWiFiConnection() {
|
||||||
if (WiFi.status() != WL_CONNECTED)
|
if (WiFi.status() != WL_CONNECTED)
|
||||||
{
|
{
|
||||||
if (wifiOn) {
|
// setAutoReconnect(true) übernimmt die Wiederverbindung automatisch.
|
||||||
Serial.println("WiFi connection lost. LwIP is auto-reconnecting...");
|
// Hier nur Display-Update und Fehler zählen für den Neustart-Watchdog.
|
||||||
wifiOn = false;
|
oledDisplayText(tr(STR_WIFI_RECONNECTING));
|
||||||
oledShowTopRow();
|
|
||||||
oledDisplayText("WiFi reconnecting");
|
|
||||||
}
|
|
||||||
|
|
||||||
wifiErrorCounter++;
|
wifiErrorCounter++;
|
||||||
|
|
||||||
// Only restart after a significant time of no connection (e.g. 5 minutes)
|
// Nach ca. 5 Minuten ohne Verbindung Neustart (bei WIFI_CHECK_INTERVAL
|
||||||
// Assuming WIFI_CHECK_INTERVAL is 60000ms (1 minute), 5 errors = 5 minutes
|
// = 15s entspricht das 20 Fehlern).
|
||||||
if (wifiErrorCounter >= 5)
|
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();
|
ESP.restart();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!wifiOn) {
|
// Connected: Fehlerzähler zurücksetzen. wifiOn wird vom GOT_IP-Event
|
||||||
Serial.println("WiFi reconnected.");
|
// gepflegt, daher hier nichts weiter zu tun.
|
||||||
wifiErrorCounter = 0;
|
|
||||||
wifiOn = true;
|
|
||||||
oledShowTopRow();
|
|
||||||
} else {
|
|
||||||
// Reset error counter if we are connected (just to be safe)
|
|
||||||
wifiErrorCounter = 0;
|
wifiErrorCounter = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
Reference in new issue
Block a user