Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 |
No files matched your search
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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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).
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|||||||
+57
-2
@@ -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">
|
||||||
@@ -69,6 +69,24 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
||||||
|
|
||||||
@@ -105,6 +123,43 @@
|
|||||||
.catch(error => console.error('Error saving language:', error));
|
.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;
|
||||||
|
|||||||
+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.5"
|
version = "3.4.1"
|
||||||
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
|
||||||
|
|
||||||
|
|||||||
+66
-5
@@ -80,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;
|
||||||
@@ -94,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) {
|
||||||
@@ -101,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
|
||||||
@@ -146,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;
|
||||||
@@ -165,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;
|
||||||
@@ -185,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;
|
||||||
@@ -205,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;
|
||||||
@@ -300,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;
|
||||||
|
|||||||
+5
-1
@@ -14,6 +14,7 @@
|
|||||||
|
|
||||||
#define NVS_NAMESPACE_SETTINGS "settings"
|
#define NVS_NAMESPACE_SETTINGS "settings"
|
||||||
#define NVS_KEY_LANGUAGE "language"
|
#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)
|
||||||
@@ -24,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;
|
||||||
|
|
||||||
@@ -70,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
|
||||||
+91
-11
@@ -5,6 +5,7 @@
|
|||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include "lang.h"
|
#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);
|
||||||
|
|
||||||
@@ -16,6 +17,60 @@ static DisplayPriority currentPriority = DISPLAY_PRIORITY_NONE;
|
|||||||
static unsigned long prioritySetTime = 0;
|
static unsigned long prioritySetTime = 0;
|
||||||
static unsigned long priorityMinDuration = 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) {
|
bool oledCanUpdate(DisplayPriority newPriority) {
|
||||||
if (currentPriority == DISPLAY_PRIORITY_NONE) return true;
|
if (currentPriority == DISPLAY_PRIORITY_NONE) return true;
|
||||||
// Higher priority can always preempt
|
// Higher priority can always preempt
|
||||||
@@ -55,9 +110,12 @@ 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, tr(STR_DISPLAY_INIT));
|
oledShowProgressBar(0, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_DISPLAY_INIT));
|
||||||
}
|
}
|
||||||
|
|
||||||
void oledclearline() {
|
void oledclearline() {
|
||||||
@@ -192,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);
|
||||||
@@ -201,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();
|
||||||
|
|||||||
@@ -30,6 +30,15 @@ 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(int16_t weight);
|
void oledShowWeight(int16_t weight);
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -10,8 +10,10 @@ Lang currentLang = LANG_EN;
|
|||||||
static const char EN_DISPLAY_INIT[] = "Display init";
|
static const char EN_DISPLAY_INIT[] = "Display init";
|
||||||
static const char EN_WIFI_INIT[] = "WiFi init";
|
static const char EN_WIFI_INIT[] = "WiFi init";
|
||||||
static const char EN_WEBSERVER_INIT[] = "Webserver 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_NFC_INIT[] = "NFC init";
|
||||||
static const char EN_SEARCHING_SCALE[] = "Searching scale";
|
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_TARE_SCALE[] = "TARE Scale";
|
||||||
static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated";
|
static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated";
|
||||||
@@ -76,14 +78,19 @@ static const char EN_WIFI_RECONN[] = "WiFi reconnecting";
|
|||||||
static const char EN_UPDATE[] = "Update";
|
static const char EN_UPDATE[] = "Update";
|
||||||
static const char EN_DOWNLOAD[] = "Download";
|
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
|
// German strings
|
||||||
// =====================================================================
|
// =====================================================================
|
||||||
static const char DE_DISPLAY_INIT[] = "Display init";
|
static const char DE_DISPLAY_INIT[] = "Display init";
|
||||||
static const char DE_WIFI_INIT[] = "WiFi init";
|
static const char DE_WIFI_INIT[] = "WiFi init";
|
||||||
static const char DE_WEBSERVER_INIT[] = "Webserver 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_NFC_INIT[] = "NFC init";
|
||||||
static const char DE_SEARCHING_SCALE[] = "Suche Waage";
|
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_TARE_SCALE[] = "Waage tarieren";
|
||||||
static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert";
|
static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert";
|
||||||
@@ -148,6 +155,9 @@ static const char DE_WIFI_RECONN[] = "WiFi Neuverbindung";
|
|||||||
static const char DE_UPDATE[] = "Update";
|
static const char DE_UPDATE[] = "Update";
|
||||||
static const char DE_DOWNLOAD[] = "Download";
|
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]
|
// String table: [StringID][Lang]
|
||||||
// =====================================================================
|
// =====================================================================
|
||||||
@@ -156,8 +166,10 @@ static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
|
|||||||
{ EN_DISPLAY_INIT, DE_DISPLAY_INIT },
|
{ EN_DISPLAY_INIT, DE_DISPLAY_INIT },
|
||||||
{ EN_WIFI_INIT, DE_WIFI_INIT },
|
{ EN_WIFI_INIT, DE_WIFI_INIT },
|
||||||
{ EN_WEBSERVER_INIT, DE_WEBSERVER_INIT },
|
{ EN_WEBSERVER_INIT, DE_WEBSERVER_INIT },
|
||||||
|
{ EN_API_INIT, DE_API_INIT },
|
||||||
{ EN_NFC_INIT, DE_NFC_INIT },
|
{ EN_NFC_INIT, DE_NFC_INIT },
|
||||||
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
|
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
|
||||||
|
{ EN_INIT_DONE, DE_INIT_DONE },
|
||||||
|
|
||||||
// Scale
|
// Scale
|
||||||
{ EN_TARE_SCALE, DE_TARE_SCALE },
|
{ EN_TARE_SCALE, DE_TARE_SCALE },
|
||||||
@@ -227,6 +239,10 @@ static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
|
|||||||
// OTA
|
// OTA
|
||||||
{ EN_UPDATE, DE_UPDATE },
|
{ EN_UPDATE, DE_UPDATE },
|
||||||
{ EN_DOWNLOAD, DE_DOWNLOAD },
|
{ EN_DOWNLOAD, DE_DOWNLOAD },
|
||||||
|
|
||||||
|
// No-Scale mode
|
||||||
|
{ EN_NOSCALE_MODE, DE_NOSCALE_MODE },
|
||||||
|
{ EN_NOSCALE_PROMPT, DE_NOSCALE_PROMPT },
|
||||||
};
|
};
|
||||||
|
|
||||||
const char* tr(StringID id) {
|
const char* tr(StringID id) {
|
||||||
|
|||||||
@@ -16,8 +16,10 @@ enum StringID : uint8_t {
|
|||||||
STR_DISPLAY_INIT,
|
STR_DISPLAY_INIT,
|
||||||
STR_WIFI_INIT,
|
STR_WIFI_INIT,
|
||||||
STR_WEBSERVER_INIT,
|
STR_WEBSERVER_INIT,
|
||||||
|
STR_API_INIT,
|
||||||
STR_NFC_INIT,
|
STR_NFC_INIT,
|
||||||
STR_SEARCHING_SCALE,
|
STR_SEARCHING_SCALE,
|
||||||
|
STR_INIT_DONE,
|
||||||
|
|
||||||
// Scale
|
// Scale
|
||||||
STR_TARE_SCALE,
|
STR_TARE_SCALE,
|
||||||
@@ -88,6 +90,10 @@ enum StringID : uint8_t {
|
|||||||
STR_UPDATE,
|
STR_UPDATE,
|
||||||
STR_DOWNLOAD,
|
STR_DOWNLOAD,
|
||||||
|
|
||||||
|
// No-Scale mode
|
||||||
|
STR_NOSCALE_MODE,
|
||||||
|
STR_NOSCALE_PROMPT,
|
||||||
|
|
||||||
STR_COUNT // must be last
|
STR_COUNT // must be last
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+39
-10
@@ -61,15 +61,24 @@ void setup() {
|
|||||||
|
|
||||||
// Scale
|
// Scale
|
||||||
start_scale(touchSensorConnected);
|
start_scale(touchSensorConnected);
|
||||||
scaleTareRequest = true;
|
if (scaleConnected){
|
||||||
|
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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -119,14 +128,18 @@ void loop() {
|
|||||||
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
|
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
|
||||||
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||||
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Überprüfe den Status des Touch Sensors
|
// Überprüfe den Status des Touch Sensors (nur wenn Waage vorhanden)
|
||||||
if (touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
|
if (scaleConnected && 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
|
||||||
@@ -139,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
|
||||||
@@ -150,7 +170,7 @@ 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){
|
||||||
@@ -158,7 +178,8 @@ void loop() {
|
|||||||
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 and higher-priority display messages
|
// Block weight display during NFC write operations and higher-priority display messages
|
||||||
@@ -178,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;
|
||||||
|
|
||||||
@@ -208,7 +237,7 @@ void loop() {
|
|||||||
lastWeight = weight;
|
lastWeight = weight;
|
||||||
|
|
||||||
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
||||||
if (weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||||
{
|
{
|
||||||
tagProcessed = true;
|
tagProcessed = true;
|
||||||
|
|
||||||
@@ -230,7 +259,7 @@ void loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 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;
|
||||||
|
|
||||||
|
|||||||
+125
-20
@@ -27,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
|
||||||
@@ -1317,10 +1346,16 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
|||||||
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")
|
if (doc["sm_id"].is<String>() && doc["sm_id"] != "" && doc["sm_id"] != "0")
|
||||||
{
|
{
|
||||||
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
|
if (scanRequestActive) {
|
||||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
scanRequestActive = false;
|
||||||
activeSpoolId = doc["sm_id"].as<String>();
|
sendTagDataAsync(nfcJsonData);
|
||||||
lastSpoolId = activeSpoolId;
|
tagProcessed = true;
|
||||||
|
} else {
|
||||||
|
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHING));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||||
|
activeSpoolId = doc["sm_id"].as<String>();
|
||||||
|
lastSpoolId = activeSpoolId;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
else if(doc["location_id"].is<int>())
|
else if(doc["location_id"].is<int>())
|
||||||
@@ -1350,6 +1385,27 @@ bool decodeNdefAndReturnJson(const byte* encodedMessage, String uidString) {
|
|||||||
tagProcessed = true;
|
tagProcessed = true;
|
||||||
activeSpoolId = "";
|
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 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 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.");
|
||||||
@@ -1900,19 +1956,27 @@ String optimizeJsonForFastPath(const char* payload) {
|
|||||||
JsonDocument optimizedDoc;
|
JsonDocument optimizedDoc;
|
||||||
|
|
||||||
// Always add sm_id first (even if it's "0" for brand filaments)
|
// Always add sm_id first (even if it's "0" for brand filaments)
|
||||||
if (inputDoc["sm_id"].is<String>()) {
|
// Also convert spool_id to sm_id if present (backend may send either)
|
||||||
|
if (inputDoc["sm_id"].is<String>() && inputDoc["sm_id"].as<String>() != "0" && inputDoc["sm_id"].as<String>() != "") {
|
||||||
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
|
optimizedDoc["sm_id"] = inputDoc["sm_id"].as<String>();
|
||||||
Serial.print("Optimizing JSON: sm_id found = ");
|
Serial.print("Optimizing JSON: sm_id found = ");
|
||||||
Serial.println(inputDoc["sm_id"].as<String>());
|
Serial.println(inputDoc["sm_id"].as<String>());
|
||||||
|
} else if (inputDoc["spool_id"].is<int>() && inputDoc["spool_id"].as<int>() > 0) {
|
||||||
|
optimizedDoc["sm_id"] = String(inputDoc["spool_id"].as<int>());
|
||||||
|
Serial.print("Optimizing JSON: Converted spool_id to sm_id = ");
|
||||||
|
Serial.println(inputDoc["spool_id"].as<int>());
|
||||||
|
} else if (inputDoc["spool_id"].is<String>() && inputDoc["spool_id"].as<String>() != "0" && inputDoc["spool_id"].as<String>() != "") {
|
||||||
|
optimizedDoc["sm_id"] = inputDoc["spool_id"].as<String>();
|
||||||
|
Serial.print("Optimizing JSON: Converted spool_id (string) to sm_id = ");
|
||||||
|
Serial.println(inputDoc["spool_id"].as<String>());
|
||||||
} else {
|
} else {
|
||||||
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
|
optimizedDoc["sm_id"] = "0"; // Default for brand filaments
|
||||||
Serial.println("Optimizing JSON: No sm_id found, setting to '0'");
|
Serial.println("Optimizing JSON: No sm_id or spool_id found, setting sm_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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2021,6 +2085,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)
|
||||||
{
|
{
|
||||||
@@ -2042,6 +2111,9 @@ 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");
|
||||||
|
|
||||||
@@ -2070,7 +2142,8 @@ 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;
|
||||||
@@ -2146,16 +2219,48 @@ 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.
|
||||||
if (!detectBambuTag(uid, uidLength)) {
|
Serial.println("UID length != 7, checking for openspool/filaman protocol first...");
|
||||||
//TBD: Show error here?!
|
activeTagUuid = uidString;
|
||||||
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
|
|
||||||
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
bool handledAsNdef = false;
|
||||||
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
|
uint16_t tagSize = readTagSize();
|
||||||
// Reset activeSpoolId when tag type is unknown to prevent autoSet
|
if (tagSize > 0)
|
||||||
activeSpoolId = "";
|
{
|
||||||
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
|
uint8_t* data = (uint8_t*)malloc(tagSize);
|
||||||
|
memset(data, 0, tagSize);
|
||||||
|
uint8_t numPages = tagSize / 4;
|
||||||
|
for (uint8_t i = 4; i < 4 + numPages; i++) {
|
||||||
|
if (!robustPageRead(i, data + (i - 4) * 4)) {
|
||||||
|
Serial.printf("Page %d read failed, stopping\n", i);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (data[(i - 4) * 4] == 0xFE) {
|
||||||
|
Serial.println("Found NDEF end marker");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
yield();
|
||||||
|
esp_task_wdt_reset();
|
||||||
|
vTaskDelay(pdMS_TO_TICKS(2));
|
||||||
|
}
|
||||||
|
if (decodeNdefAndReturnJson(data, uidString)) {
|
||||||
|
handledAsNdef = true;
|
||||||
|
nfcReaderState = NFC_READ_SUCCESS;
|
||||||
|
}
|
||||||
|
free(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!handledAsNdef)
|
||||||
|
{
|
||||||
|
Serial.println("No NDEF/openspool protocol found, trying Bambu Lab tag...");
|
||||||
|
if (!detectBambuTag(uid, uidLength)) {
|
||||||
|
oledShowProgressBar(1, 1, tr(STR_FAILURE), tr(STR_UNKNOWN_TAG_TYPE));
|
||||||
|
oledSetPriority(DISPLAY_PRIORITY_WARNING, 2000);
|
||||||
|
Serial.println("This doesn't seem to be an NTAG2xx tag (UUID length != 7 bytes)!");
|
||||||
|
activeSpoolId = "";
|
||||||
|
Serial.println("Unknown tag type - activeSpoolId reset to prevent autoSet");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2216,7 +2321,7 @@ void scanRfidTask(void * parameter) {
|
|||||||
|
|
||||||
void startNfc() {
|
void startNfc() {
|
||||||
nfcRequestMutex = xSemaphoreCreateMutex();
|
nfcRequestMutex = xSemaphoreCreateMutex();
|
||||||
oledShowProgressBar(5, 7, DISPLAY_BOOT_TEXT, tr(STR_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);
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+30
-23
@@ -16,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
|
||||||
@@ -64,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) {
|
||||||
@@ -79,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(progressMsg);
|
||||||
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
|
// Yield für WiFi-Stack nach jedem WebSocket-Send
|
||||||
if (status || abs(progress - lastSentProgress) >= 10 || progress == 100) {
|
vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
ws.textAll(progressMsg);
|
|
||||||
delay(100); // Längerer Delay zwischen Nachrichten
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
ws.textAll(progressMsg);
|
|
||||||
delay(50);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
lastSendTime = now;
|
||||||
lastSentProgress = progress;
|
lastSentProgress = progress;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,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) {
|
||||||
@@ -147,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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -165,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, tr(STR_UPDATE), tr(STR_DOWNLOAD));
|
oledShowProgressBar(currentProgress, 100, tr(STR_UPDATE), tr(STR_DOWNLOAD));
|
||||||
vTaskDelay(pdMS_TO_TICKS(50));
|
|
||||||
lastProgress = currentProgress;
|
lastProgress = currentProgress;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+145
-33
@@ -35,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 #####
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -196,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
|
||||||
@@ -223,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;
|
||||||
@@ -251,40 +360,43 @@ 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, tr(STR_SEARCHING_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));
|
scaleConnected = scaleDetected();
|
||||||
esp_task_wdt_reset();
|
if ( scaleConnected ) {
|
||||||
|
scale.set_scale(calibrationValue);
|
||||||
|
//vTaskDelay(pdMS_TO_TICKS(5000));
|
||||||
|
|
||||||
|
// Initialize weight stabilization filter
|
||||||
|
resetWeightFilter();
|
||||||
|
|
||||||
|
// Display Gewicht
|
||||||
|
oledShowWeight(0);
|
||||||
|
|
||||||
|
Serial.println("starte Scale Task");
|
||||||
|
BaseType_t result = xTaskCreatePinnedToCore(
|
||||||
|
scale_loop, /* Function to implement the task */
|
||||||
|
"ScaleLoop", /* Name of the task */
|
||||||
|
2048, /* Stack size in words */
|
||||||
|
NULL, /* Task input parameter */
|
||||||
|
scaleTaskPrio, /* Priority of the task */
|
||||||
|
&ScaleTask, /* Task handle. */
|
||||||
|
scaleTaskCore); /* Core where the task should run */
|
||||||
|
|
||||||
|
if (result != pdPASS) {
|
||||||
|
Serial.println("Fehler beim Erstellen des ScaleLoop-Tasks");
|
||||||
|
} else {
|
||||||
|
Serial.println("ScaleLoop-Task erfolgreich erstellt");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
while(!scale.is_ready()) {
|
// No HX711 - switching to NFC-only mode
|
||||||
vTaskDelay(pdMS_TO_TICKS(5000));
|
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));
|
||||||
scale.set_scale(calibrationValue);
|
oledDisplayText(tr(STR_NOSCALE_MODE));
|
||||||
//vTaskDelay(pdMS_TO_TICKS(5000));
|
vTaskDelay(pdMS_TO_TICKS(1500));
|
||||||
|
|
||||||
// Initialize weight stabilization filter
|
|
||||||
resetWeightFilter();
|
|
||||||
|
|
||||||
// Display Gewicht
|
|
||||||
oledShowWeight(0);
|
|
||||||
|
|
||||||
Serial.println("starte Scale Task");
|
|
||||||
BaseType_t result = xTaskCreatePinnedToCore(
|
|
||||||
scale_loop, /* Function to implement the task */
|
|
||||||
"ScaleLoop", /* Name of the task */
|
|
||||||
2048, /* Stack size in words */
|
|
||||||
NULL, /* Task input parameter */
|
|
||||||
scaleTaskPrio, /* Priority of the task */
|
|
||||||
&ScaleTask, /* Task handle. */
|
|
||||||
scaleTaskCore); /* Core where the task should run */
|
|
||||||
|
|
||||||
if (result != pdPASS) {
|
|
||||||
Serial.println("Fehler beim Erstellen des ScaleLoop-Tasks");
|
|
||||||
} else {
|
|
||||||
Serial.println("ScaleLoop-Task erfolgreich erstellt");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
+70
-49
@@ -18,6 +18,7 @@
|
|||||||
#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");
|
||||||
@@ -25,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){
|
||||||
@@ -114,74 +124,52 @@ void sendNfcData() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void setupWebserver(AsyncWebServer &server) {
|
void setupWebserver(AsyncWebServer &server) {
|
||||||
oledShowProgressBar(2, 7, DISPLAY_BOOT_TEXT, tr(STR_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
|
||||||
@@ -227,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...\"}");
|
||||||
@@ -269,6 +260,36 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
request->send(200, "application/json", "{\"success\": true}");
|
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);
|
||||||
|
|||||||
+64
-28
@@ -17,16 +17,54 @@ 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) {
|
||||||
@@ -39,6 +77,10 @@ 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([]() {
|
||||||
@@ -48,10 +90,13 @@ 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, tr(STR_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")) {
|
||||||
@@ -75,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(tr(STR_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;
|
wifiErrorCounter = 0;
|
||||||
wifiOn = true;
|
|
||||||
oledShowTopRow();
|
|
||||||
} else {
|
|
||||||
// Reset error counter if we are connected (just to be safe)
|
|
||||||
wifiErrorCounter = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user