Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a04cc37190 | ||
|
|
7e6854cd8a | ||
|
|
a5ba8a901a | ||
|
|
b8cfa1ce98 | ||
|
|
884c8bcf8f | ||
|
|
502c1d6ab8 | ||
|
|
3e995faa8c | ||
|
|
4b93362dd7 | ||
|
|
9a1d394bc8 | ||
|
|
fab9fdae87 | ||
|
|
1939c1b57f | ||
|
|
026cbd5179 | ||
|
|
15c66af948 | ||
|
|
8b746b204a | ||
|
|
5241969c57 | ||
|
|
80825c6cfc | ||
|
|
337d7f8983 | ||
|
|
6749022243 | ||
|
|
1da123a01f | ||
|
|
028fe85586 | ||
|
|
27e16c3d1b | ||
|
|
6f9c99edb6 | ||
|
|
a7b97dc0c9 | ||
|
|
2bae0369fa | ||
|
|
1c3aae5f49 | ||
|
|
4054a96067 | ||
|
|
f6b6df55c8 | ||
|
|
f3426119e8 | ||
|
|
dd508e2e1e | ||
|
|
0ab3db5f2d | ||
|
|
f86d71f8b2 | ||
|
|
b2ac1e9fcd | ||
|
|
f2c1d44f5a | ||
|
|
3c9a0f17ba | ||
|
|
6a9acb9d27 | ||
|
|
9b93d219f9 | ||
|
|
f3f51cd6f8 | ||
|
|
9d3a3411fb | ||
|
|
775700f90f | ||
|
|
9456e6ab91 | ||
|
|
30409a59e0 | ||
|
|
17f86a0094 | ||
|
|
0d38728072 | ||
|
|
0f43f228e7 | ||
|
|
eb1c032444 | ||
|
|
696b8ba518 | ||
|
|
728c40f0fa | ||
|
|
d0d2dbb274 | ||
|
|
4a377b25e0 | ||
|
|
075459b890 | ||
|
|
bece16f012 | ||
|
|
14fa6e7fd0 | ||
|
|
4daa74bbfb | ||
|
|
4b74bc8988 | ||
|
|
f09e552e3d | ||
|
|
6de2e8728c | ||
|
|
60f08ea640 |
No files matched your search
@@ -35,7 +35,7 @@ jobs:
|
||||
|
||||
gitea-release:
|
||||
needs: detect-provider
|
||||
if: needs.detect-provider.outputs.provider == 'gitea'
|
||||
if: needs.detect-provider.outputs.provider == 'gitea' && !contains(github.ref_name, '-beta')
|
||||
uses: ./.github/workflows/gitea-release.yml
|
||||
secrets:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
|
||||
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"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+28
-23
@@ -2,17 +2,18 @@
|
||||
|
||||
⚠️ **Wichtig: Ab Version 3.0.0 erfordert dieses System das [FilaMan-System](https://github.com/Fire-Devils/filaman-system) Backend. Frühere direkte Integrationen (Spoolman, MQTT, Bambu Lab) wurden in das zentrale FilaMan-System verschoben.**
|
||||
|
||||
FilaMan ist ein Werkzeug zur Filamentverwaltung für den 3D-Druck. Es verwendet ESP32-Hardware zur Gewichtsmessung und Verwaltung von NFC-Tags.
|
||||
Benutzer können Filamentspulen verwalten und das Gerät über eine Weboberfläche konfigurieren.
|
||||
FilaMan ist ein Werkzeug zur Filamentverwaltung für den 3D-Druck. Es verwendet ESP32-Hardware zur Gewichtsmessung und Verwaltung von NFC-Tags.
|
||||
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).
|
||||
|
||||
**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).
|
||||
|
||||

|
||||
|
||||
|
||||
Weitere Bilder finden Sie im [img Ordner](/img/)
|
||||
oder auf meiner Website: [FilaMan Website](https://www.filaman.app)
|
||||
Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
|
||||
Weitere Bilder finden Sie im [img Ordner](/img/)
|
||||
oder auf meiner Website: [FilaMan Website](https://www.filaman.app)
|
||||
Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
|
||||
Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
|
||||
|
||||
## NEU: Recycling Fabrik
|
||||
@@ -27,7 +28,7 @@ dass die Spulen automatisch erkannt und über die FilaMan-Waage direkt in das Fi
|
||||
|
||||
**Was ist die Recycling Fabrik?**
|
||||
|
||||
Die Recycling Fabrik ist ein deutsches Unternehmen, das sich der Entwicklung und Herstellung von nachhaltigem 3D-Druck-Filament verschrieben hat.
|
||||
Die Recycling Fabrik ist ein deutsches Unternehmen, das sich der Entwicklung und Herstellung von nachhaltigem 3D-Druck-Filament verschrieben hat.
|
||||
Ihre Filamente bestehen zu 100 % aus recyceltem Material von Endkunden und aus der Industrie – für eine umweltbewusste und ressourcenschonende Zukunft.
|
||||
|
||||
Weitere Informationen und Produkte finden Sie hier: [www.recyclingfabrik.com](https://www.recyclingfabrik.com)
|
||||
@@ -45,7 +46,7 @@ Weitere Informationen und Produkte finden Sie hier: [www.recyclingfabrik.com](ht
|
||||
|
||||
### Weboberflächen-Features
|
||||
- **Echtzeit-Updates:** WebSocket-Verbindung für Live-Datenaktualisierungen.
|
||||
- **NFC-Tag-Verwaltung:**
|
||||
- **NFC-Tag-Verwaltung:**
|
||||
- Schreiben von Filamentdaten auf NFC-Tags.
|
||||
- Unterstützt automatische Spulenerkennung in kompatiblen Systemen.
|
||||
- **FilaMan-System Integration:**
|
||||
@@ -110,19 +111,23 @@ Wenn Sie einen Hersteller-NFC-Tag zum ersten Mal scannen:
|
||||
|
||||
|
||||
### Pin-Konfiguration
|
||||
| Komponente | ESP32 Pin |
|
||||
|-------------------|-----------|
|
||||
| HX711 DOUT | 16 |
|
||||
| HX711 SCK | 17 |
|
||||
| OLED SDA | 21 |
|
||||
| OLED SCL | 22 |
|
||||
| PN532 IRQ | 32 |
|
||||
| PN532 RESET | 33 |
|
||||
| PN532 SDA | 21 |
|
||||
| PN532 SCL | 22 |
|
||||
| TTP223 I/O | 25 |
|
||||
| Komponente | ESP32 Pin | ESP32-S3 Pin |
|
||||
|-------------------|-----------|--------------|
|
||||
| HX711 DOUT | 16 | 5 |
|
||||
| HX711 SCK | 17 | 6 |
|
||||
| OLED SDA | 21 | 8 |
|
||||
| OLED SCL | 22 | 9 |
|
||||
| PN532 IRQ | 32 | 15 |
|
||||
| PN532 RESET | 33 | 16 |
|
||||
| PN532 SDA | 21 | 8 |
|
||||
| PN532 SCL | 22 | 9 |
|
||||
| TTP223 I/O | 25 | 7 |
|
||||
|
||||
**!! Stellen Sie sicher, dass die DIP-Schalter am PN532 auf I2C eingestellt sind.**
|
||||
Die I2C-Pins sind die Arduino-Standardwerte des jeweiligen Chips und werden im Code nicht explizit gesetzt.
|
||||
|
||||
**!! ESP32-S3: GPIO19/GPIO20 nicht für den HX711 verwenden.** Das sind die nativen USB-Datenleitungen (D-/D+), die auf dem DevKitC-1 an der "USB"-Buchse liegen. Der HX711 wird dort nur unzuverlässig erkannt.
|
||||
|
||||
**!! Stellen Sie sicher, dass die DIP-Schalter am PN532 auf I2C eingestellt sind.**
|
||||
**Verwenden Sie den 3V-Pin des ESP für den Touch-Sensor.**
|
||||
|
||||

|
||||
@@ -130,10 +135,10 @@ Wenn Sie einen Hersteller-NFC-Tag zum ersten Mal scannen:
|
||||

|
||||

|
||||
|
||||
*Die Wägezelle wird an die meisten HX711-Module wie folgt angeschlossen:
|
||||
E+ rot
|
||||
E- schwarz
|
||||
A- weiß
|
||||
*Die Wägezelle wird an die meisten HX711-Module wie folgt angeschlossen:
|
||||
E+ rot
|
||||
E- schwarz
|
||||
A- weiß
|
||||
A+ grün*
|
||||
|
||||
## Software-Abhängigkeiten
|
||||
|
||||
@@ -2,17 +2,18 @@
|
||||
|
||||
⚠️ **Important: Starting with v3.0.0, this system requires the [FilaMan-System](https://github.com/Fire-Devils/filaman-system) backend. Previous direct integrations (Spoolman, MQTT, Bambu Lab) have been moved to the central FilaMan-System.**
|
||||
|
||||
FilaMan is a filament management tool for 3D printing. It uses ESP32 hardware for weight measurement and NFC tag management.
|
||||
Users can manage filament spools and configure the device via a web interface.
|
||||
FilaMan is a filament management tool for 3D printing. It uses ESP32 hardware for weight measurement and NFC tag management.
|
||||
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).
|
||||
|
||||
**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).
|
||||
|
||||

|
||||
|
||||
|
||||
More Images can be found in the [img Folder](/img/)
|
||||
or my website: [FilaMan Website](https://www.filaman.app)
|
||||
german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
|
||||
More Images can be found in the [img Folder](/img/)
|
||||
or my website: [FilaMan Website](https://www.filaman.app)
|
||||
german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaOHU)
|
||||
Discord Server: [https://discord.gg/my7Gvaxj2v](https://discord.gg/my7Gvaxj2v)
|
||||
|
||||
## NEW: Recycling Fabrik
|
||||
@@ -27,7 +28,7 @@ that the spools can be automatically recognized and imported into the FilaMan-Sy
|
||||
|
||||
**What is Recycling Fabrik?**
|
||||
|
||||
Recycling Fabrik is a German company dedicated to developing and manufacturing sustainable 3D printing filament.
|
||||
Recycling Fabrik is a German company dedicated to developing and manufacturing sustainable 3D printing filament.
|
||||
Their filaments are made from 100% recycled material from both end customers and industry – for an environmentally conscious and resource-saving future.
|
||||
|
||||
More information and products can be found here: [www.recyclingfabrik.com](https://www.recyclingfabrik.com)
|
||||
@@ -45,7 +46,7 @@ More information and products can be found here: [www.recyclingfabrik.com](https
|
||||
|
||||
### Web Interface Features
|
||||
- **Real-time Updates:** WebSocket connection for live data updates.
|
||||
- **NFC Tag Management:**
|
||||
- **NFC Tag Management:**
|
||||
- Write filament data to NFC tags.
|
||||
- Supports automatic Spool detection in compatible systems.
|
||||
- **FilaMan-System Integration:**
|
||||
@@ -110,19 +111,23 @@ When you scan a manufacturer NFC tag for the first time:
|
||||
|
||||
|
||||
### Pin Configuration
|
||||
| Component | ESP32 Pin |
|
||||
|-------------------|-----------|
|
||||
| HX711 DOUT | 16 |
|
||||
| HX711 SCK | 17 |
|
||||
| OLED SDA | 21 |
|
||||
| OLED SCL | 22 |
|
||||
| PN532 IRQ | 32 |
|
||||
| PN532 RESET | 33 |
|
||||
| PN532 SDA | 21 |
|
||||
| PN532 SCL | 22 |
|
||||
| TTP223 I/O | 25 |
|
||||
| Component | ESP32 Pin | ESP32-S3 Pin |
|
||||
|-------------------|-----------|--------------|
|
||||
| HX711 DOUT | 16 | 5 |
|
||||
| HX711 SCK | 17 | 6 |
|
||||
| OLED SDA | 21 | 8 |
|
||||
| OLED SCL | 22 | 9 |
|
||||
| PN532 IRQ | 32 | 15 |
|
||||
| PN532 RESET | 33 | 16 |
|
||||
| PN532 SDA | 21 | 8 |
|
||||
| PN532 SCL | 22 | 9 |
|
||||
| TTP223 I/O | 25 | 7 |
|
||||
|
||||
**!! Make sure that the DIP switches on the PN532 are set to I2C**
|
||||
The I2C pins are the Arduino defaults for each chip and are not set explicitly in the code.
|
||||
|
||||
**!! ESP32-S3: do not use GPIO19/GPIO20 for the HX711.** These are the native USB data lines (D-/D+) and are wired to the "USB" connector on the DevKitC-1, which makes the HX711 detection unreliable.
|
||||
|
||||
**!! Make sure that the DIP switches on the PN532 are set to I2C**
|
||||
**Use the 3V pin from the ESP for the touch sensor**
|
||||
|
||||

|
||||
@@ -130,10 +135,10 @@ When you scan a manufacturer NFC tag for the first time:
|
||||

|
||||

|
||||
|
||||
*The load cell is connected to most HX711 modules as follows:
|
||||
E+ red
|
||||
E- black
|
||||
A- white
|
||||
*The load cell is connected to most HX711 modules as follows:
|
||||
E+ red
|
||||
E- black
|
||||
A- white
|
||||
A+ green*
|
||||
|
||||
## Software Dependencies
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,4 @@
|
||||
- The **low version** has the same dimensions as the casing of [FilaMan Revamped](https://makerworld.com/de/models/1258715-filaman-revamped-nfc-based-spoolman-scale?designId=1258715-filaman-revamped-nfc-based-spoolman-scale#profileId-1367621).
|
||||
But because of the missing scale the distance between the PN532 and a NFC tag placed on the marked area might be too narrow, what leads to weak/failed connection.
|
||||
|
||||
- The **high version** takes account of this but makes the casing 10mm higher
|
||||
+74
-3
@@ -87,6 +87,24 @@
|
||||
</div>
|
||||
<div id="sleepStatusMessage" style="margin-top: 0.5rem;"></div>
|
||||
</div>
|
||||
|
||||
<div class="fm-card">
|
||||
<h2>WiFi Settings</h2>
|
||||
|
||||
<div class="fm-form-group" style="margin-top: 1rem;">
|
||||
<label class="fm-label" for="txPowerSelect">WiFi Transmit Power</label>
|
||||
<select id="txPowerSelect" class="fm-input">
|
||||
<option value="195">19.5 dBm (default, maximum range)</option>
|
||||
<option value="170">17 dBm</option>
|
||||
<option value="150">15 dBm</option>
|
||||
<option value="130">13 dBm</option>
|
||||
<option value="110">11 dBm</option>
|
||||
<option value="85">8.5 dBm (lowest)</option>
|
||||
</select>
|
||||
<p style="font-size: 0.8rem; margin-top: 0.5rem;">Only lower this if your router keeps dropping the device, or if it sits right next to the access point. Applies immediately, no restart needed.</p>
|
||||
</div>
|
||||
<div id="txPowerStatusMessage" style="margin-top: 0.5rem;"></div>
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
@@ -160,6 +178,45 @@
|
||||
});
|
||||
});
|
||||
|
||||
// WiFi transmit power setting
|
||||
fetch('/api/wifi-power')
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
const sel = document.getElementById('txPowerSelect');
|
||||
const val = String(data.txPower);
|
||||
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 = '195';
|
||||
})
|
||||
.catch(error => console.error('Error fetching wifi power:', error));
|
||||
|
||||
document.getElementById('txPowerSelect').addEventListener('change', function() {
|
||||
const msg = document.getElementById('txPowerStatusMessage');
|
||||
fetch('/api/wifi-power', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ txPower: 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);
|
||||
} else {
|
||||
msg.textContent = 'Error saving setting.';
|
||||
msg.style.color = 'var(--error-text)';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
msg.textContent = 'Error saving setting.';
|
||||
msg.style.color = 'var(--error-text)';
|
||||
console.error('Error saving wifi power:', error);
|
||||
});
|
||||
});
|
||||
|
||||
document.getElementById('registerBtn').addEventListener('click', () => {
|
||||
const url = document.getElementById('filamanUrl').value;
|
||||
const code = document.getElementById('deviceCode').value;
|
||||
@@ -182,9 +239,10 @@
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
statusMessage.textContent = 'Registration successful!';
|
||||
statusMessage.style.color = 'var(--success-text)';
|
||||
setTimeout(() => location.reload(), 2000);
|
||||
// 202 Accepted: Registrierung wurde nur eingereiht. Das
|
||||
// tatsaechliche Ergebnis kommt per WebSocket ('registerResult').
|
||||
statusMessage.textContent = 'Registering device...';
|
||||
statusMessage.style.color = 'var(--text-muted)';
|
||||
} else {
|
||||
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
||||
statusMessage.style.color = 'var(--error-text)';
|
||||
@@ -208,6 +266,19 @@
|
||||
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
|
||||
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
|
||||
}
|
||||
else if (data.type === 'registerResult') {
|
||||
// Die Registrierung laeuft asynchron im API-Task; /api/register
|
||||
// antwortet sofort mit 202, das Ergebnis kommt hier an.
|
||||
const statusMessage = document.getElementById('statusMessage');
|
||||
if (data.success) {
|
||||
statusMessage.textContent = 'Registration successful!';
|
||||
statusMessage.style.color = 'var(--success-text)';
|
||||
setTimeout(() => location.reload(), 2000);
|
||||
} else {
|
||||
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
||||
statusMessage.style.color = 'var(--error-text)';
|
||||
}
|
||||
}
|
||||
};
|
||||
ws.onclose = () => setTimeout(connectWebSocket, 2000);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
# 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.
|
||||
|
||||
## Druck-Dateien
|
||||
[STLs](../_3D%20Print%20Files/FilaMan_Lite/)
|
||||
@@ -0,0 +1,79 @@
|
||||
# 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.
|
||||
|
||||
## Print Files
|
||||
[STLs](../_3D%20Print%20Files/FilaMan_Lite/)
|
||||
Binary file not shown.
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 |
+53
-63
@@ -9,79 +9,69 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "3.2.7-beta1"
|
||||
to_old_version = "3.0.9"
|
||||
version = "3.4.9"
|
||||
to_old_version = "3.4.0"
|
||||
|
||||
##
|
||||
[env:esp32dev]
|
||||
platform = espressif32@^6.0.0
|
||||
board = esp32dev
|
||||
framework = arduino
|
||||
monitor_speed = 115200
|
||||
#monitor_port = /dev/cu.usbmodem01
|
||||
|
||||
lib_deps =
|
||||
tzapu/WiFiManager @ ^2.0.17
|
||||
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
||||
https://github.com/esphome/AsyncTCP.git
|
||||
bogde/HX711 @ ^0.7.5
|
||||
adafruit/Adafruit SSD1306 @ ^2.5.13
|
||||
adafruit/Adafruit GFX Library @ ^1.11.11
|
||||
adafruit/Adafruit PN532 @ ^1.3.3
|
||||
bblanchon/ArduinoJson @ ^7.3.0
|
||||
knolleary/PubSubClient @ ^2.8
|
||||
digitaldragon/SSLClient @ ^1.3.2
|
||||
|
||||
; Enable SPIFFS upload
|
||||
board_build.filesystem = littlefs
|
||||
; Update partition settings
|
||||
board_build.partitions = partitions.csv
|
||||
board_upload.flash_size = 4MB
|
||||
board_build.flash_mode = dio
|
||||
board_upload.flash_freq = "40m"
|
||||
|
||||
build_flags =
|
||||
-Os
|
||||
-ffunction-sections
|
||||
-fdata-sections
|
||||
#-DNDEBUG
|
||||
-mtext-section-literals
|
||||
-DVERSION=\"${common.version}\"
|
||||
-DTOOLDVERSION=\"${common.to_old_version}\"
|
||||
#-DENABLE_HEAP_DEBUGGING
|
||||
-DASYNCWEBSERVER_REGEX
|
||||
#-DCORE_DEBUG_LEVEL=3
|
||||
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
||||
#-DOTA_DEBUG=1
|
||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
||||
-DBOOT_APP_PARTITION_OTA_0=1
|
||||
|
||||
# ===== AsyncTCP Optimierungen - KRITISCH für WiFi-Stabilität =====
|
||||
# Core 1 = Arduino/App Core (nicht Core 0 = WiFi/Protocol Core!)
|
||||
# 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 aktivieren für Crash-Recovery (war deaktiviert!)
|
||||
-DCONFIG_ASYNC_TCP_USE_WDT=1
|
||||
|
||||
# ===== 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 =
|
||||
scripts/extra_script.py
|
||||
extra_scripts = scripts/extra_script.py
|
||||
|
||||
[platformio]
|
||||
default_envs = esp32dev
|
||||
default_envs =
|
||||
esp32dev
|
||||
esp32-s3-devkitc-1
|
||||
|
||||
[env]
|
||||
build_flags =
|
||||
-Os
|
||||
-ffunction-sections
|
||||
-fdata-sections
|
||||
-mtext-section-literals
|
||||
-DVERSION=\"${common.version}\"
|
||||
-DTOOLDVERSION=\"${common.to_old_version}\"
|
||||
-DASYNCWEBSERVER_REGEX
|
||||
-DCONFIG_ARDUHAL_LOG_COLORS=1
|
||||
-DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
|
||||
-DBOOT_APP_PARTITION_OTA_0=1
|
||||
-DCONFIG_ASYNC_TCP_RUNNING_CORE=1
|
||||
-DCONFIG_ASYNC_TCP_MAX_ACK_TIME=10000
|
||||
-DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
|
||||
-DCONFIG_ASYNC_TCP_STACK_SIZE=8192
|
||||
-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_LWIP_TCP_MSL=30000
|
||||
-DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=8192
|
||||
-DCONFIG_LWIP_MAX_ACTIVE_TCP=16
|
||||
lib_deps =
|
||||
tzapu/WiFiManager
|
||||
https://github.com/me-no-dev/ESPAsyncWebServer.git#master
|
||||
https://github.com/esphome/AsyncTCP.git
|
||||
bogde/HX711 @ ^0.7.5
|
||||
adafruit/Adafruit SSD1306 @ ^2.5.13
|
||||
adafruit/Adafruit GFX Library @ ^1.11.11
|
||||
adafruit/Adafruit PN532 @ ^1.3.3
|
||||
bblanchon/ArduinoJson @ ^7.3.0
|
||||
knolleary/PubSubClient @ ^2.8
|
||||
digitaldragon/SSLClient @ ^1.3.2
|
||||
monitor_speed = 115200
|
||||
|
||||
[env:esp32-s3-devkitc-1]
|
||||
board = esp32-s3-devkitc-1
|
||||
framework = arduino
|
||||
extra_scripts = scripts/extra_script.py
|
||||
upload_protocol = esptool
|
||||
board_build.flash_mode = dio
|
||||
platform = espressif32
|
||||
board_build.filesystem = littlefs
|
||||
board_build.partitions = partitions.csv
|
||||
board_upload.flash_size = 8MB
|
||||
+78
-7
@@ -136,7 +136,7 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
||||
Serial.printf("API payload: %s\n", payload.c_str());
|
||||
int httpCode = http.POST(payload);
|
||||
Serial.printf("API response code: %d\n", httpCode);
|
||||
|
||||
|
||||
if (httpCode == 200) {
|
||||
String response = http.getString();
|
||||
JsonDocument responseDoc;
|
||||
@@ -157,7 +157,7 @@ bool sendWeight(int spoolId, String tagUuid, float measuredWeight) {
|
||||
vTaskDelay(pdMS_TO_TICKS(2000));
|
||||
oledClearPriority();
|
||||
}
|
||||
|
||||
|
||||
http.end();
|
||||
return false;
|
||||
}
|
||||
@@ -192,7 +192,7 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
http.addHeader("Authorization", "Device " + filamanToken);
|
||||
http.addHeader("Connection", "keep-alive");
|
||||
|
||||
|
||||
JsonDocument doc;
|
||||
doc["success"] = success;
|
||||
if (tagUuid.length() > 0) doc["tag_uuid"] = tagUuid;
|
||||
@@ -200,7 +200,7 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
|
||||
if (locationId > 0) doc["location_id"] = locationId;
|
||||
if (errorMessage.length() > 0) doc["error_message"] = errorMessage;
|
||||
if (remainingWeight > 0) doc["remaining_weight_g"] = remainingWeight;
|
||||
|
||||
|
||||
String payload;
|
||||
serializeJson(doc, payload);
|
||||
int httpCode = http.POST(payload);
|
||||
@@ -208,11 +208,30 @@ bool sendRfidResult(String tagUuid, int spoolId, int locationId, bool success, S
|
||||
return (httpCode == 200);
|
||||
}
|
||||
|
||||
bool sendTagData(String tagJson) {
|
||||
if (!checkFilamanRegistration() || WiFi.status() != WL_CONNECTED) return false;
|
||||
HTTPClient http;
|
||||
http.setTimeout(10000);
|
||||
http.setReuse(true);
|
||||
http.begin(filamanUrl + "/api/v1/devices/tag-data");
|
||||
http.addHeader("Content-Type", "application/json");
|
||||
http.addHeader("Authorization", "Device " + filamanToken);
|
||||
http.addHeader("Connection", "keep-alive");
|
||||
JsonDocument doc;
|
||||
doc["tag_json"] = tagJson;
|
||||
String payload;
|
||||
serializeJson(doc, payload);
|
||||
int httpCode = http.POST(payload);
|
||||
http.end();
|
||||
Serial.printf("sendTagData: HTTP %d\n", httpCode);
|
||||
return (httpCode == 200);
|
||||
}
|
||||
|
||||
void filamanApiTask(void* pvParameters) {
|
||||
for (;;) {
|
||||
ApiRequest req;
|
||||
bool hasReq = false;
|
||||
|
||||
|
||||
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(100)) == pdTRUE) {
|
||||
for(int i=0; i<MAX_API_QUEUE; i++) {
|
||||
if(apiQueue[i].active) {
|
||||
@@ -228,10 +247,21 @@ void filamanApiTask(void* pvParameters) {
|
||||
if (hasReq) {
|
||||
filamanApiState = API_TRANSMITTING;
|
||||
switch (req.type) {
|
||||
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break; // Mit Retry-Logik
|
||||
case API_REQUEST_REGISTER: {
|
||||
// URL übernehmen und persistieren, dann blockierend
|
||||
// registrieren - hier unkritisch, da eigener Task.
|
||||
if (req.str2.length() > 0) filamanUrl = req.str2;
|
||||
saveFilamanConfig();
|
||||
bool ok = registerDevice(req.str1);
|
||||
Serial.printf("registerDevice: %s\n", ok ? "success" : "failed");
|
||||
sendRegisterResult(ok);
|
||||
break;
|
||||
}
|
||||
case API_REQUEST_HEARTBEAT: sendHeartbeatWithRetry(2); break;
|
||||
case API_REQUEST_WEIGHT: sendWeight(req.id1, req.str1, req.val); break;
|
||||
case API_REQUEST_LOCATE: sendLocation(req.id1, req.str1, req.id2, req.str2); break;
|
||||
case API_REQUEST_RFID_RESULT: sendRfidResult(req.str1, req.id1, req.id2, req.bool1, req.str3, req.remainingWeight); break;
|
||||
case API_REQUEST_TAG_DATA: sendTagData(req.str1); break;
|
||||
default: break;
|
||||
}
|
||||
filamanApiState = API_IDLE;
|
||||
@@ -240,6 +270,29 @@ void filamanApiTask(void* pvParameters) {
|
||||
}
|
||||
}
|
||||
|
||||
// Reiht die Registrierung ein, statt sie im AsyncTCP-Kontext auszuführen.
|
||||
// str2 = FilaMan-URL, str1 = Device-Code.
|
||||
bool registerDeviceAsync(const String& url, const String& deviceCode) {
|
||||
bool queued = false;
|
||||
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_REGISTER;
|
||||
apiQueue[i].id1 = 0;
|
||||
apiQueue[i].id2 = 0;
|
||||
apiQueue[i].str1 = deviceCode;
|
||||
apiQueue[i].str2 = url;
|
||||
apiQueue[i].val = 0.0f;
|
||||
apiQueue[i].active = true;
|
||||
queued = true;
|
||||
break;
|
||||
}
|
||||
xSemaphoreGive(queueMutex);
|
||||
}
|
||||
// Ohne Queue-Platz kaeme nie ein "registerResult" - der Aufrufer muss
|
||||
// dem Frontend dann sofort einen Fehler zurueckgeben.
|
||||
return queued;
|
||||
}
|
||||
|
||||
void sendHeartbeatAsync() {
|
||||
if (!checkFilamanRegistration()) return;
|
||||
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
|
||||
@@ -323,12 +376,30 @@ void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool succe
|
||||
}
|
||||
}
|
||||
|
||||
void sendTagDataAsync(String tagJson) {
|
||||
if (!checkFilamanRegistration()) return;
|
||||
if (xSemaphoreTake(queueMutex, pdMS_TO_TICKS(50)) == pdTRUE) {
|
||||
for(int i=0; i<MAX_API_QUEUE; i++) if(!apiQueue[i].active) {
|
||||
apiQueue[i].type = API_REQUEST_TAG_DATA;
|
||||
apiQueue[i].str1 = tagJson;
|
||||
apiQueue[i].id1 = 0;
|
||||
apiQueue[i].id2 = 0;
|
||||
apiQueue[i].str2 = "";
|
||||
apiQueue[i].val = 0.0f;
|
||||
apiQueue[i].active = true;
|
||||
break;
|
||||
}
|
||||
xSemaphoreGive(queueMutex);
|
||||
}
|
||||
}
|
||||
|
||||
bool initFilaman() {
|
||||
oledShowProgressBar(3, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_API_INIT));
|
||||
loadFilamanConfig();
|
||||
queueMutex = xSemaphoreCreateMutex();
|
||||
// Move to Core 1 (Hardware Core) to free up Core 0 for WiFi/Webserver
|
||||
// Set priority to 1 (same as Scale/NFC) to ensure fair scheduling
|
||||
xTaskCreatePinnedToCore(filamanApiTask, "FilaManApi", 6144, NULL, 1, NULL, 1);
|
||||
xTaskCreatePinnedToCore(filamanApiTask, "FilaManApi", 6144, NULL, 1, NULL, 1);
|
||||
if (checkFilamanRegistration()) sendHeartbeatAsync();
|
||||
return true;
|
||||
}
|
||||
@@ -17,7 +17,8 @@ typedef enum {
|
||||
API_REQUEST_HEARTBEAT,
|
||||
API_REQUEST_WEIGHT,
|
||||
API_REQUEST_LOCATE,
|
||||
API_REQUEST_RFID_RESULT
|
||||
API_REQUEST_RFID_RESULT,
|
||||
API_REQUEST_TAG_DATA
|
||||
} FilamanApiRequestType;
|
||||
|
||||
extern volatile filamanApiStateType filamanApiState;
|
||||
@@ -26,10 +27,12 @@ extern bool filamanConnected;
|
||||
// FilaMan API functions
|
||||
bool initFilaman();
|
||||
bool registerDevice(const String& deviceCode);
|
||||
bool registerDeviceAsync(const String& url, const String& deviceCode);
|
||||
void sendHeartbeatAsync();
|
||||
void sendWeightAsync(int spoolId, String tagUuid, float weight);
|
||||
void sendLocationAsync(int spoolId, String spoolTagUuid, int locationId, String locationTagUuid);
|
||||
void sendRfidResultAsync(String tagUuid, int spoolId, int locationId, bool success, String errorMessage, float remainingWeight = 0);
|
||||
void sendTagDataAsync(String tagJson);
|
||||
|
||||
// Internal blocking functions (used by async task)
|
||||
bool sendHeartbeat();
|
||||
|
||||
+25
-2
@@ -6,21 +6,38 @@
|
||||
//#define PN532_MOSI 23
|
||||
//#define PN532_SS 5
|
||||
//#define PN532_MISO 19
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t PN532_IRQ = 15;
|
||||
const uint8_t PN532_RESET = 16;
|
||||
#else
|
||||
const uint8_t PN532_IRQ = 32;
|
||||
const uint8_t PN532_RESET = 33;
|
||||
#endif
|
||||
// ***** PN532
|
||||
|
||||
// ***** HX711 (Waage)
|
||||
// HX711 circuit wiring
|
||||
const uint8_t LOADCELL_DOUT_PIN = 16; //16;
|
||||
const uint8_t LOADCELL_SCK_PIN = 17; //17;
|
||||
// ACHTUNG ESP32-S3: GPIO19/20 sind die nativen USB-Leitungen (D-/D+) und liegen auf
|
||||
// dem DevKitC-1 an der "USB"-Buchse. Der HX711 wird dort unzuverlaessig erkannt.
|
||||
// Pins hier nur zusammen mit den Tabellen in README.md / README.de.md aendern.
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t LOADCELL_DOUT_PIN = 5;
|
||||
const uint8_t LOADCELL_SCK_PIN = 6;
|
||||
#else
|
||||
const uint8_t LOADCELL_DOUT_PIN = 16;
|
||||
const uint8_t LOADCELL_SCK_PIN = 17;
|
||||
#endif
|
||||
const uint8_t calVal_eepromAdress = 0;
|
||||
const uint16_t SCALE_LEVEL_WEIGHT = 500;
|
||||
// ***** HX711
|
||||
|
||||
// ***** TTP223 (Touch Sensor)
|
||||
// TTP223 circuit wiring
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t TTP223_PIN = 7;
|
||||
#else
|
||||
const uint8_t TTP223_PIN = 25;
|
||||
#endif
|
||||
// ***** TTP223
|
||||
|
||||
|
||||
@@ -46,6 +63,12 @@ bool filamanRegistered = false;
|
||||
uint16_t oledSleepTimeout = 60; // Default 60 seconds (0 = disabled)
|
||||
// ***** Display Sleep
|
||||
|
||||
// ***** WiFi
|
||||
// Sendeleistung in 0.1 dBm. Default 19.5dBm = Maximum; nur senken, wenn der AP
|
||||
// das Geraet rauswirft (reason=2/4) oder es direkt neben dem AP steht.
|
||||
int16_t wifiTxPowerDeciDbm = 195;
|
||||
// ***** WiFi
|
||||
|
||||
// ***** Task Prios
|
||||
uint8_t rfidTaskCore = 1;
|
||||
uint8_t rfidTaskPrio = 1;
|
||||
|
||||
+8
-2
@@ -15,6 +15,7 @@
|
||||
#define NVS_NAMESPACE_SETTINGS "settings"
|
||||
#define NVS_KEY_LANGUAGE "language"
|
||||
#define NVS_KEY_OLED_SLEEP "oled_sleep"
|
||||
#define NVS_KEY_WIFI_TXPOWER "wifi_txpwr"
|
||||
#define SCALE_DEFAULT_CALIBRATION_VALUE 430.0f;
|
||||
|
||||
#define OLED_RESET -1 // Reset pin # (or -1 if sharing Arduino reset pin)
|
||||
@@ -25,10 +26,12 @@
|
||||
#define SCREEN_PROGRESS_BAR_HEIGHT 12U
|
||||
#define DISPLAY_BOOT_TEXT "FilaMan"
|
||||
|
||||
#define WIFI_CHECK_INTERVAL 60000U
|
||||
#define WIFI_CHECK_INTERVAL 15000U
|
||||
#define DISPLAY_UPDATE_INTERVAL 1000U
|
||||
#define FILAMAN_HEARTBEAT_INTERVAL 60000U
|
||||
|
||||
#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_RESET;
|
||||
|
||||
@@ -72,4 +75,7 @@ extern uint8_t scaleTaskPrio;
|
||||
|
||||
extern uint16_t defaultScaleCalibrationValue;
|
||||
extern uint16_t oledSleepTimeout;
|
||||
#endif
|
||||
|
||||
// WLAN-Sendeleistung in 0.1 dBm (195 = 19.5dBm). Siehe txPowerFromDeciDbm() in wlan.cpp.
|
||||
extern int16_t wifiTxPowerDeciDbm;
|
||||
#endif
|
||||
+53
-31
@@ -115,7 +115,7 @@ void setupDisplay() {
|
||||
lastActivityMillis = millis();
|
||||
|
||||
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() {
|
||||
@@ -144,14 +144,14 @@ int oled_center_v(const String &text) {
|
||||
std::vector<String> splitTextIntoLines(const String &text, uint8_t textSize) {
|
||||
std::vector<String> lines;
|
||||
display.setTextSize(textSize);
|
||||
|
||||
|
||||
// Text in Wörter aufteilen
|
||||
std::vector<String> words;
|
||||
int pos = 0;
|
||||
while (pos < text.length()) {
|
||||
// Überspringe Leerzeichen am Anfang
|
||||
while (pos < text.length() && text[pos] == ' ') pos++;
|
||||
|
||||
|
||||
// Finde nächstes Leerzeichen
|
||||
int nextSpace = text.indexOf(' ', pos);
|
||||
if (nextSpace == -1) {
|
||||
@@ -165,19 +165,19 @@ std::vector<String> splitTextIntoLines(const String &text, uint8_t textSize) {
|
||||
words.push_back(text.substring(pos, nextSpace));
|
||||
pos = nextSpace + 1;
|
||||
}
|
||||
|
||||
|
||||
// Wörter zu Zeilen zusammenfügen
|
||||
String currentLine = "";
|
||||
for (size_t i = 0; i < words.size(); i++) {
|
||||
String testLine = currentLine;
|
||||
if (currentLine.length() > 0) testLine += " ";
|
||||
testLine += words[i];
|
||||
|
||||
|
||||
// Prüfe ob diese Kombination auf die Zeile passt
|
||||
int16_t x1, y1;
|
||||
uint16_t lineWidth, h;
|
||||
display.getTextBounds(testLine, 0, OLED_DATA_START, &x1, &y1, &lineWidth, &h);
|
||||
|
||||
|
||||
if (lineWidth <= SCREEN_WIDTH) {
|
||||
// Passt noch in diese Zeile
|
||||
currentLine = testLine;
|
||||
@@ -192,40 +192,40 @@ std::vector<String> splitTextIntoLines(const String &text, uint8_t textSize) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Letzte Zeile hinzufügen
|
||||
if (currentLine.length() > 0) {
|
||||
lines.push_back(currentLine);
|
||||
}
|
||||
|
||||
|
||||
return lines;
|
||||
}
|
||||
|
||||
void oledShowMultilineMessage(const String &message, uint8_t size) {
|
||||
std::vector<String> lines;
|
||||
int maxLines = 3; // Maximale Anzahl Zeilen für size 2
|
||||
|
||||
|
||||
// Erste Prüfung mit aktueller Größe
|
||||
lines = splitTextIntoLines(message, size);
|
||||
|
||||
|
||||
// Wenn mehr als maxLines Zeilen, reduziere Textgröße
|
||||
if (lines.size() > maxLines && size > 1) {
|
||||
size = 1;
|
||||
lines = splitTextIntoLines(message, size);
|
||||
}
|
||||
|
||||
|
||||
// Ausgabe
|
||||
display.setTextSize(size);
|
||||
int lineHeight = size * 8;
|
||||
int totalHeight = lines.size() * lineHeight;
|
||||
int startY = OLED_DATA_START + ((OLED_DATA_END - OLED_DATA_START - totalHeight) / 2);
|
||||
|
||||
|
||||
uint8_t lineDistance = (lines.size() == 2) ? 5 : 0;
|
||||
for (size_t i = 0; i < lines.size(); i++) {
|
||||
display.setCursor(oled_center_h(lines[i]), startY + (i * lineHeight) + (i == 1 ? lineDistance : 0));
|
||||
display.print(lines[i]);
|
||||
}
|
||||
|
||||
|
||||
display.display();
|
||||
}
|
||||
|
||||
@@ -233,12 +233,12 @@ void oledDisplayText(const String &message, uint8_t size) {
|
||||
oledcleardata();
|
||||
display.setTextSize(size);
|
||||
display.setTextWrap(false);
|
||||
|
||||
|
||||
// Prüfe ob Text in eine Zeile passt
|
||||
int16_t x1, y1;
|
||||
uint16_t textWidth, h;
|
||||
display.getTextBounds(message, 0, 0, &x1, &y1, &textWidth, &h);
|
||||
|
||||
|
||||
// Text passt in eine Zeile?
|
||||
if (textWidth <= SCREEN_WIDTH) {
|
||||
display.setCursor(oled_center_h(message), oled_center_v(message));
|
||||
@@ -250,6 +250,12 @@ void oledDisplayText(const String &message, uint8_t size) {
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
display.setTextSize(1);
|
||||
@@ -259,29 +265,45 @@ void oledShowTopRow() {
|
||||
|
||||
iconToggle = !iconToggle;
|
||||
|
||||
// draw symbols from right to left
|
||||
// Do not show status indicators during boot
|
||||
if(!booting){
|
||||
if (filamanConnected) {
|
||||
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
|
||||
// WiFi
|
||||
x_pos = rightmost_x;
|
||||
if (wifiOn == 1) {
|
||||
display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, WHITE);
|
||||
} else {
|
||||
if(iconToggle){
|
||||
display.drawBitmap(80, 0, bitmap_spoolman_on , 16, 16, WHITE);
|
||||
display.drawLine(80, 15, 96, 0, WHITE);
|
||||
display.drawLine(81, 15, 97, 0, WHITE);
|
||||
display.drawBitmap(x_pos, 0, wifi_on , symbol_width, symbol_height, 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);
|
||||
}
|
||||
}
|
||||
|
||||
if (wifiOn == 1) {
|
||||
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
|
||||
// Backend
|
||||
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 {
|
||||
if(iconToggle){
|
||||
display.drawBitmap(107, 0, wifi_on , 16, 16, WHITE);
|
||||
display.drawLine(107, 15, 123, 0, WHITE);
|
||||
display.drawLine(108, 15, 124, 0, WHITE);
|
||||
display.drawBitmap(x_pos, 0, bitmap_spoolman_on , symbol_width, symbol_height, 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);
|
||||
}
|
||||
}
|
||||
|
||||
// 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();
|
||||
}
|
||||
|
||||
@@ -313,7 +335,7 @@ void oledShowProgressBar(const uint8_t step, const uint8_t numSteps, const char*
|
||||
// clear data and bar area
|
||||
display.fillRect(0, OLED_DATA_START, SCREEN_WIDTH, SCREEN_HEIGHT-16, BLACK);
|
||||
|
||||
|
||||
|
||||
display.setTextWrap(false);
|
||||
display.setTextSize(2);
|
||||
display.setCursor(0, OLED_DATA_START+4);
|
||||
@@ -343,7 +365,7 @@ void oledShowRemainingWeight(uint16_t remainingWeight) {
|
||||
display.setTextSize(1);
|
||||
display.setCursor(oled_center_h(tr(STR_WEIGHT_SENT_REST)), OLED_DATA_START + 4);
|
||||
display.print(tr(STR_WEIGHT_SENT_REST));
|
||||
|
||||
|
||||
display.setTextSize(3);
|
||||
String weightStr = String(remainingWeight) + " g";
|
||||
display.setCursor(oled_center_h(weightStr), OLED_DATA_START + 22);
|
||||
@@ -354,15 +376,15 @@ void oledShowRemainingWeight(uint16_t remainingWeight) {
|
||||
void oledShowConnectionError(const char* error, const String& ip) {
|
||||
oledcleardata();
|
||||
display.setTextSize(1);
|
||||
|
||||
|
||||
// Error Message
|
||||
display.setCursor(oled_center_h(error), OLED_DATA_START + 4);
|
||||
display.print(error);
|
||||
|
||||
|
||||
// IP Address
|
||||
display.setTextSize(1);
|
||||
display.setCursor(oled_center_h(ip), OLED_DATA_START + 24);
|
||||
display.print(ip);
|
||||
|
||||
|
||||
display.display();
|
||||
}
|
||||
+81
-75
@@ -1,7 +1,7 @@
|
||||
#include <Arduino.h>
|
||||
|
||||
/*
|
||||
// Create Icons
|
||||
// Create Icons
|
||||
https://javl.github.io/image2cpp/
|
||||
Size: 47x47
|
||||
BG Color: Black
|
||||
@@ -10,117 +10,123 @@ Ohters in default
|
||||
*/
|
||||
|
||||
const unsigned char wifi_on [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x1f, 0xf8, 0x78, 0x1e, 0x60, 0x06, 0x07, 0xe0,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x1f, 0xf8, 0x78, 0x1e, 0x60, 0x06, 0x07, 0xe0,
|
||||
0x0f, 0xf0, 0x08, 0x10, 0x00, 0x00, 0x03, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
|
||||
const unsigned char wifi_off [] PROGMEM = {
|
||||
0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0x1b, 0xf0, 0x3d, 0xfc, 0x7e, 0x1e, 0x63, 0x06, 0x07, 0xa0,
|
||||
0x00, 0x00, 0x20, 0x00, 0x30, 0x00, 0x1b, 0xf0, 0x3d, 0xfc, 0x7e, 0x1e, 0x63, 0x06, 0x07, 0xa0,
|
||||
0x1f, 0xd8, 0x08, 0x60, 0x01, 0xb0, 0x03, 0xd8, 0x01, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'off', 16x16px
|
||||
const unsigned char bitmap_off [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'spoolman_on', 16x16px
|
||||
const unsigned char bitmap_spoolman_on [] PROGMEM = {
|
||||
0x03, 0xc0, 0x08, 0xf0, 0x20, 0xfc, 0x00, 0xfc, 0x40, 0xfe, 0x70, 0xf0, 0xf8, 0xc1, 0xff, 0xc1,
|
||||
0x03, 0xc0, 0x08, 0xf0, 0x20, 0xfc, 0x00, 0xfc, 0x40, 0xfe, 0x70, 0xf0, 0xf8, 0xc1, 0xff, 0xc1,
|
||||
0xff, 0xc1, 0xf9, 0xc1, 0x70, 0xf0, 0x40, 0xfe, 0x00, 0xfc, 0x20, 0xfc, 0x08, 0xf0, 0x03, 0xc0
|
||||
};
|
||||
|
||||
// 'bambu_on', 16x16px
|
||||
const unsigned char bitmap_bambu_on [] PROGMEM = {
|
||||
0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x1c, 0x3e, 0x00, 0x3e, 0x40,
|
||||
0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x7c, 0x3e, 0x1c, 0x3e, 0x00, 0x3e, 0x40,
|
||||
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
|
||||
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, 0x0f, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x1f, 0xfc, 0x7f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xf8, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x07, 0x80, 0x00, 0x00,
|
||||
0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x1f, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x1e, 0x03,
|
||||
0x80, 0x07, 0x80, 0xf0, 0x3e, 0x03, 0xc0, 0x07, 0x80, 0xf0, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x78, 0x00, 0xf8, 0x3e, 0x00, 0x38, 0x78, 0x00, 0x7c, 0x7c,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3c, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0, 0x00, 0x3c, 0x70, 0x00,
|
||||
0x1f, 0xf0, 0x00, 0x3c, 0x70, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0xf0, 0x00, 0x07, 0xc0, 0x00, 0x1c,
|
||||
0xf0, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0x70, 0x00, 0x1f, 0xf0, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3e, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x7c, 0x7c, 0x00, 0x3c, 0x78, 0x00,
|
||||
0xf8, 0x3e, 0x00, 0x3c, 0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3e, 0x03, 0xc0, 0x0f, 0x80, 0xf0, 0x1e, 0x03, 0x80, 0x07, 0x80, 0xf0, 0x1f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x07, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0,
|
||||
0x00, 0x00, 0x0f, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xf8, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
||||
0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x1f, 0xfc, 0x7f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xf8, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x07, 0x80, 0x00, 0x00,
|
||||
0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x1f, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x1e, 0x03,
|
||||
0x80, 0x07, 0x80, 0xf0, 0x3e, 0x03, 0xc0, 0x07, 0x80, 0xf0, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x78, 0x00, 0xf8, 0x3e, 0x00, 0x38, 0x78, 0x00, 0x7c, 0x7c,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3c, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0, 0x00, 0x3c, 0x70, 0x00,
|
||||
0x1f, 0xf0, 0x00, 0x3c, 0x70, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0xf0, 0x00, 0x07, 0xc0, 0x00, 0x1c,
|
||||
0xf0, 0x00, 0x0f, 0xe0, 0x00, 0x3c, 0x70, 0x00, 0x1f, 0xf0, 0x00, 0x3c, 0x78, 0x00, 0x3f, 0xf0,
|
||||
0x00, 0x3c, 0x78, 0x00, 0x3e, 0xf8, 0x00, 0x3c, 0x78, 0x00, 0x7c, 0x7c, 0x00, 0x3c, 0x78, 0x00,
|
||||
0xf8, 0x3e, 0x00, 0x3c, 0x3c, 0x01, 0xf0, 0x1f, 0x00, 0x78, 0x3c, 0x03, 0xe0, 0x0f, 0x80, 0x78,
|
||||
0x3e, 0x03, 0xc0, 0x0f, 0x80, 0xf0, 0x1e, 0x03, 0x80, 0x07, 0x80, 0xf0, 0x1f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x07, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0,
|
||||
0x00, 0x00, 0x0f, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xf8, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'loading', 47x47px
|
||||
const unsigned char icon_loading [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80,
|
||||
0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00,
|
||||
0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xfe,
|
||||
0x00, 0x00, 0x00, 0x3f, 0xf9, 0xfc, 0x00, 0x00, 0x00, 0x7f, 0x83, 0xf8, 0x38, 0x00, 0x00, 0xff,
|
||||
0x07, 0xf0, 0x7c, 0x00, 0x00, 0xfc, 0x07, 0xe0, 0x7e, 0x00, 0x01, 0xf8, 0x0f, 0xc0, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x07, 0x80, 0x1f, 0x00, 0x03, 0xe0, 0x03, 0x00, 0x1f, 0x80, 0x07, 0xe0, 0x00, 0x00,
|
||||
0x0f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0,
|
||||
0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00,
|
||||
0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0,
|
||||
0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0x80, 0x03, 0xe0, 0x00, 0x00,
|
||||
0x1f, 0x80, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00, 0x01, 0xfc,
|
||||
0x00, 0x00, 0x7e, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xfc, 0x00, 0x00, 0x7f, 0x80, 0x07, 0xf8, 0x00,
|
||||
0x00, 0x3f, 0xf0, 0x3f, 0xf0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff,
|
||||
0xc0, 0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80,
|
||||
0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00,
|
||||
0x00, 0x01, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x07, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xfe,
|
||||
0x00, 0x00, 0x00, 0x3f, 0xf9, 0xfc, 0x00, 0x00, 0x00, 0x7f, 0x83, 0xf8, 0x38, 0x00, 0x00, 0xff,
|
||||
0x07, 0xf0, 0x7c, 0x00, 0x00, 0xfc, 0x07, 0xe0, 0x7e, 0x00, 0x01, 0xf8, 0x0f, 0xc0, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x07, 0x80, 0x1f, 0x00, 0x03, 0xe0, 0x03, 0x00, 0x1f, 0x80, 0x07, 0xe0, 0x00, 0x00,
|
||||
0x0f, 0x80, 0x07, 0xc0, 0x00, 0x00, 0x0f, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0,
|
||||
0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00,
|
||||
0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80, 0x00, 0x00, 0x03, 0xe0, 0x0f, 0x80,
|
||||
0x00, 0x00, 0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0,
|
||||
0x07, 0xc0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0x80, 0x03, 0xe0, 0x00, 0x00,
|
||||
0x1f, 0x80, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00, 0x01, 0xfc,
|
||||
0x00, 0x00, 0x7e, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xfc, 0x00, 0x00, 0x7f, 0x80, 0x07, 0xf8, 0x00,
|
||||
0x00, 0x3f, 0xf0, 0x3f, 0xf0, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x07, 0xff, 0xff,
|
||||
0xc0, 0x00, 0x00, 0x01, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00,
|
||||
0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'success', 47x47px
|
||||
const unsigned char icon_success [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
||||
0x80, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x1f, 0xfc, 0x3f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xfc, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x03, 0xe0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00,
|
||||
0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x01, 0xf0, 0x1e, 0x00,
|
||||
0x00, 0x00, 0x00, 0xf0, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0x3c, 0x00, 0x00, 0x01, 0xe0, 0x78,
|
||||
0x3c, 0x00, 0x00, 0x03, 0xe0, 0x78, 0x38, 0x00, 0x00, 0x03, 0xc0, 0x3c, 0x78, 0x00, 0x00, 0x07,
|
||||
0xc0, 0x3c, 0x78, 0x00, 0x00, 0x0f, 0x80, 0x3c, 0x78, 0x00, 0x00, 0x1f, 0x00, 0x1c, 0x78, 0x00,
|
||||
0x00, 0x1e, 0x00, 0x1c, 0x78, 0x0f, 0x00, 0x3e, 0x00, 0x1e, 0x78, 0x0f, 0x80, 0x7c, 0x00, 0x1e,
|
||||
0x78, 0x0f, 0xc0, 0xf8, 0x00, 0x1e, 0x78, 0x07, 0xe0, 0xf0, 0x00, 0x1c, 0x78, 0x03, 0xf1, 0xf0,
|
||||
0x00, 0x1c, 0x78, 0x01, 0xfb, 0xe0, 0x00, 0x3c, 0x78, 0x00, 0xff, 0xc0, 0x00, 0x3c, 0x38, 0x00,
|
||||
0x7f, 0x80, 0x00, 0x3c, 0x3c, 0x00, 0x3f, 0x80, 0x00, 0x78, 0x3c, 0x00, 0x1f, 0x00, 0x00, 0x78,
|
||||
0x1e, 0x00, 0x0e, 0x00, 0x00, 0xf8, 0x1e, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xf0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x07, 0xc0, 0x00, 0x00, 0x03, 0xc0, 0x03, 0xe0,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xfc, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
|
||||
0x80, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x1f, 0xfc, 0x3f, 0xf0, 0x00, 0x00, 0x7f,
|
||||
0x80, 0x03, 0xfc, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x03, 0xe0, 0x00, 0x00, 0x07, 0xc0, 0x07, 0xc0, 0x00, 0x00,
|
||||
0x03, 0xc0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0x01, 0xf0, 0x1e, 0x00,
|
||||
0x00, 0x00, 0x00, 0xf0, 0x1e, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0x3c, 0x00, 0x00, 0x01, 0xe0, 0x78,
|
||||
0x3c, 0x00, 0x00, 0x03, 0xe0, 0x78, 0x38, 0x00, 0x00, 0x03, 0xc0, 0x3c, 0x78, 0x00, 0x00, 0x07,
|
||||
0xc0, 0x3c, 0x78, 0x00, 0x00, 0x0f, 0x80, 0x3c, 0x78, 0x00, 0x00, 0x1f, 0x00, 0x1c, 0x78, 0x00,
|
||||
0x00, 0x1e, 0x00, 0x1c, 0x78, 0x0f, 0x00, 0x3e, 0x00, 0x1e, 0x78, 0x0f, 0x80, 0x7c, 0x00, 0x1e,
|
||||
0x78, 0x0f, 0xc0, 0xf8, 0x00, 0x1e, 0x78, 0x07, 0xe0, 0xf0, 0x00, 0x1c, 0x78, 0x03, 0xf1, 0xf0,
|
||||
0x00, 0x1c, 0x78, 0x01, 0xfb, 0xe0, 0x00, 0x3c, 0x78, 0x00, 0xff, 0xc0, 0x00, 0x3c, 0x38, 0x00,
|
||||
0x7f, 0x80, 0x00, 0x3c, 0x3c, 0x00, 0x3f, 0x80, 0x00, 0x78, 0x3c, 0x00, 0x1f, 0x00, 0x00, 0x78,
|
||||
0x1e, 0x00, 0x0e, 0x00, 0x00, 0xf8, 0x1e, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00,
|
||||
0x01, 0xf0, 0x0f, 0x80, 0x00, 0x00, 0x01, 0xe0, 0x07, 0xc0, 0x00, 0x00, 0x03, 0xc0, 0x03, 0xe0,
|
||||
0x00, 0x00, 0x07, 0xc0, 0x03, 0xf0, 0x00, 0x00, 0x1f, 0x80, 0x01, 0xf8, 0x00, 0x00, 0x3f, 0x00,
|
||||
0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x7f, 0x80, 0x03, 0xfc, 0x00, 0x00, 0x1f, 0xfc, 0x3f,
|
||||
0xf0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x03, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00,
|
||||
0x7f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
// 'transfer', 47x47px
|
||||
const unsigned char icon_transfer [] PROGMEM = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xe0, 0x01,
|
||||
0xfe, 0x00, 0x00, 0x3f, 0xe0, 0x07, 0xff, 0x80, 0x00, 0xff, 0xc0, 0x0f, 0xff, 0xc0, 0x01, 0xfb,
|
||||
0xc0, 0x1f, 0x03, 0xe0, 0x03, 0xe3, 0x80, 0x3c, 0x00, 0xf0, 0x07, 0xc3, 0x80, 0x78, 0x00, 0x78,
|
||||
0x0f, 0x80, 0x00, 0x70, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x70, 0x00, 0x38, 0x1e, 0x00, 0x00, 0xf0,
|
||||
0x00, 0x3c, 0x1c, 0x00, 0x00, 0xe0, 0x00, 0x3c, 0x3c, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x38, 0x00,
|
||||
0x00, 0xe0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0xf0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0x70, 0x00, 0x38,
|
||||
0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x30, 0x00, 0x00, 0x3c,
|
||||
0x00, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00,
|
||||
0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xfc, 0x00,
|
||||
0x00, 0x00, 0x1f, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x00, 0x18, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c,
|
||||
0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x38, 0x38, 0x00, 0x0e, 0x00,
|
||||
0x00, 0x38, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x78, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x70, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0xf0, 0x38, 0x00, 0x0e, 0x00, 0x01, 0xe0, 0x38, 0x00, 0x0e, 0x01, 0x83, 0xe0,
|
||||
0x38, 0x00, 0x0e, 0x03, 0x87, 0xc0, 0x3c, 0x00, 0x1e, 0x03, 0x9f, 0x80, 0x1f, 0x80, 0xfc, 0x07,
|
||||
0xff, 0x00, 0x1f, 0xff, 0xf8, 0x07, 0xfc, 0x00, 0x07, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0x01, 0xff,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xe0, 0x01,
|
||||
0xfe, 0x00, 0x00, 0x3f, 0xe0, 0x07, 0xff, 0x80, 0x00, 0xff, 0xc0, 0x0f, 0xff, 0xc0, 0x01, 0xfb,
|
||||
0xc0, 0x1f, 0x03, 0xe0, 0x03, 0xe3, 0x80, 0x3c, 0x00, 0xf0, 0x07, 0xc3, 0x80, 0x78, 0x00, 0x78,
|
||||
0x0f, 0x80, 0x00, 0x70, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x70, 0x00, 0x38, 0x1e, 0x00, 0x00, 0xf0,
|
||||
0x00, 0x3c, 0x1c, 0x00, 0x00, 0xe0, 0x00, 0x3c, 0x3c, 0x00, 0x00, 0xe0, 0x00, 0x1c, 0x38, 0x00,
|
||||
0x00, 0xe0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0xf0, 0x00, 0x3c, 0x38, 0x00, 0x00, 0x70, 0x00, 0x38,
|
||||
0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x38, 0x00, 0x00, 0x78, 0x00, 0x78, 0x30, 0x00, 0x00, 0x3c,
|
||||
0x00, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 0x00,
|
||||
0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x01, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xfc, 0x00,
|
||||
0x00, 0x00, 0x1f, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x1e, 0x00, 0x00, 0x18, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c,
|
||||
0x38, 0x00, 0x0e, 0x00, 0x00, 0x3c, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x38, 0x38, 0x00, 0x0e, 0x00,
|
||||
0x00, 0x38, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x78, 0x38, 0x00, 0x0e, 0x00, 0x00, 0x70, 0x38, 0x00,
|
||||
0x0e, 0x00, 0x00, 0xf0, 0x38, 0x00, 0x0e, 0x00, 0x01, 0xe0, 0x38, 0x00, 0x0e, 0x01, 0x83, 0xe0,
|
||||
0x38, 0x00, 0x0e, 0x03, 0x87, 0xc0, 0x3c, 0x00, 0x1e, 0x03, 0x9f, 0x80, 0x1f, 0x80, 0xfc, 0x07,
|
||||
0xff, 0x00, 0x1f, 0xff, 0xf8, 0x07, 0xfc, 0x00, 0x07, 0xff, 0xf0, 0x0f, 0xf0, 0x00, 0x01, 0xff,
|
||||
0xc0, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
@@ -10,8 +10,10 @@ Lang currentLang = LANG_EN;
|
||||
static const char EN_DISPLAY_INIT[] = "Display init";
|
||||
static const char EN_WIFI_INIT[] = "WiFi init";
|
||||
static const char EN_WEBSERVER_INIT[] = "Webserver init";
|
||||
static const char EN_API_INIT[] = "API init";
|
||||
static const char EN_NFC_INIT[] = "NFC init";
|
||||
static const char EN_SEARCHING_SCALE[] = "Searching scale";
|
||||
static const char EN_INIT_DONE[] = "Setup finished";
|
||||
|
||||
static const char EN_TARE_SCALE[] = "TARE Scale";
|
||||
static const char EN_SCALE_NOT_CAL[] = "Scale not calibrated";
|
||||
@@ -76,14 +78,19 @@ static const char EN_WIFI_RECONN[] = "WiFi reconnecting";
|
||||
static const char EN_UPDATE[] = "Update";
|
||||
static const char EN_DOWNLOAD[] = "Download";
|
||||
|
||||
static const char EN_NOSCALE_MODE[] = "Activate NFC-only mode";
|
||||
static const char EN_NOSCALE_PROMPT[] = "ready...";
|
||||
|
||||
// =====================================================================
|
||||
// German strings
|
||||
// =====================================================================
|
||||
static const char DE_DISPLAY_INIT[] = "Display init";
|
||||
static const char DE_WIFI_INIT[] = "WiFi init";
|
||||
static const char DE_WEBSERVER_INIT[] = "Webserver init";
|
||||
static const char DE_API_INIT[] = "API init";
|
||||
static const char DE_NFC_INIT[] = "NFC init";
|
||||
static const char DE_SEARCHING_SCALE[] = "Suche Waage";
|
||||
static const char DE_INIT_DONE[] = "Setup abgeschlossen";
|
||||
|
||||
static const char DE_TARE_SCALE[] = "Waage tarieren";
|
||||
static const char DE_SCALE_NOT_CAL[] = "Waage nicht kalibriert";
|
||||
@@ -148,6 +155,9 @@ static const char DE_WIFI_RECONN[] = "WiFi Neuverbindung";
|
||||
static const char DE_UPDATE[] = "Update";
|
||||
static const char DE_DOWNLOAD[] = "Download";
|
||||
|
||||
static const char DE_NOSCALE_MODE[] = "Aktiviere NFC-only Modus";
|
||||
static const char DE_NOSCALE_PROMPT[] = "bereit...";
|
||||
|
||||
// =====================================================================
|
||||
// String table: [StringID][Lang]
|
||||
// =====================================================================
|
||||
@@ -156,8 +166,10 @@ static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
|
||||
{ EN_DISPLAY_INIT, DE_DISPLAY_INIT },
|
||||
{ EN_WIFI_INIT, DE_WIFI_INIT },
|
||||
{ EN_WEBSERVER_INIT, DE_WEBSERVER_INIT },
|
||||
{ EN_API_INIT, DE_API_INIT },
|
||||
{ EN_NFC_INIT, DE_NFC_INIT },
|
||||
{ EN_SEARCHING_SCALE, DE_SEARCHING_SCALE },
|
||||
{ EN_INIT_DONE, DE_INIT_DONE },
|
||||
|
||||
// Scale
|
||||
{ EN_TARE_SCALE, DE_TARE_SCALE },
|
||||
@@ -227,6 +239,10 @@ static const char* const stringTable[STR_COUNT][LANG_COUNT] = {
|
||||
// OTA
|
||||
{ EN_UPDATE, DE_UPDATE },
|
||||
{ EN_DOWNLOAD, DE_DOWNLOAD },
|
||||
|
||||
// No-Scale mode
|
||||
{ EN_NOSCALE_MODE, DE_NOSCALE_MODE },
|
||||
{ EN_NOSCALE_PROMPT, DE_NOSCALE_PROMPT },
|
||||
};
|
||||
|
||||
const char* tr(StringID id) {
|
||||
|
||||
@@ -16,8 +16,10 @@ enum StringID : uint8_t {
|
||||
STR_DISPLAY_INIT,
|
||||
STR_WIFI_INIT,
|
||||
STR_WEBSERVER_INIT,
|
||||
STR_API_INIT,
|
||||
STR_NFC_INIT,
|
||||
STR_SEARCHING_SCALE,
|
||||
STR_INIT_DONE,
|
||||
|
||||
// Scale
|
||||
STR_TARE_SCALE,
|
||||
@@ -88,6 +90,10 @@ enum StringID : uint8_t {
|
||||
STR_UPDATE,
|
||||
STR_DOWNLOAD,
|
||||
|
||||
// No-Scale mode
|
||||
STR_NOSCALE_MODE,
|
||||
STR_NOSCALE_PROMPT,
|
||||
|
||||
STR_COUNT // must be last
|
||||
};
|
||||
|
||||
|
||||
+41
-20
@@ -53,7 +53,7 @@ void setup() {
|
||||
|
||||
// Touch Sensor
|
||||
pinMode(TTP223_PIN, INPUT_PULLUP);
|
||||
if (digitalRead(TTP223_PIN) == LOW)
|
||||
if (digitalRead(TTP223_PIN) == LOW)
|
||||
{
|
||||
Serial.println("Touch Sensor is connected");
|
||||
touchSensorConnected = true;
|
||||
@@ -61,15 +61,24 @@ void setup() {
|
||||
|
||||
// Scale
|
||||
start_scale(touchSensorConnected);
|
||||
scaleTareRequest = true;
|
||||
if (scaleConnected){
|
||||
scaleTareRequest = true;
|
||||
}
|
||||
|
||||
// WDT initialisieren mit 10 Sekunden Timeout
|
||||
bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
|
||||
esp_task_wdt_init(10, panic);
|
||||
|
||||
booting = false;
|
||||
oledShowProgressBar(6, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_INIT_DONE));
|
||||
|
||||
// Aktuellen Task (loopTask) zum Watchdog hinzufügen
|
||||
esp_task_wdt_add(NULL);
|
||||
|
||||
if ( !scaleConnected ) {
|
||||
// Clear Display after Boot
|
||||
oledDisplayText(tr(STR_NOSCALE_PROMPT));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -119,11 +128,14 @@ void loop() {
|
||||
oledShowConnectionError(tr(STR_API_CONN_LOST), WiFi.localIP().toString());
|
||||
oledSetPriority(DISPLAY_PRIORITY_WARNING, 3000);
|
||||
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
|
||||
if (touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
|
||||
// Überprüfe den Status des Touch Sensors (nur wenn Waage vorhanden)
|
||||
if (scaleConnected && touchSensorConnected && digitalRead(TTP223_PIN) == HIGH && currentMillis - lastButtonPress > debounceDelay)
|
||||
{
|
||||
lastButtonPress = currentMillis;
|
||||
scaleTareRequest = true;
|
||||
@@ -131,18 +143,18 @@ void loop() {
|
||||
}
|
||||
|
||||
// Überprüfe regelmäßig die WLAN-Verbindung
|
||||
if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL))
|
||||
if (intervalElapsed(currentMillis, lastWifiCheckTime, WIFI_CHECK_INTERVAL))
|
||||
{
|
||||
checkWiFiConnection();
|
||||
}
|
||||
|
||||
// Periodic display update
|
||||
if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL))
|
||||
if (intervalElapsed(currentMillis, lastTopRowUpdateTime, DISPLAY_UPDATE_INTERVAL))
|
||||
{
|
||||
oledShowTopRow();
|
||||
oledCheckSleep(); // Put display to sleep if timeout elapsed
|
||||
}
|
||||
|
||||
|
||||
// WebSocket Cleanup alle 5 Sekunden (häufiger als vorher)
|
||||
// Tote Clients können WiFi-Ressourcen blockieren
|
||||
static unsigned long lastWsCleanup = 0;
|
||||
@@ -152,21 +164,22 @@ void loop() {
|
||||
}
|
||||
|
||||
// Periodic FilaMan heartbeat
|
||||
if (intervalElapsed(currentMillis, lastFilamanHeartbeatTime, FILAMAN_HEARTBEAT_INTERVAL))
|
||||
if (intervalElapsed(currentMillis, lastFilamanHeartbeatTime, FILAMAN_HEARTBEAT_INTERVAL))
|
||||
{
|
||||
sendHeartbeatAsync();
|
||||
}
|
||||
|
||||
// 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
|
||||
if(!scaleCalibrationActive){
|
||||
oledDisplayText(tr(STR_SCALE_NOT_CALIBRATED));
|
||||
vTaskDelay(pdMS_TO_TICKS(1000));
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
|
||||
if (scaleConnected && scaleCalibrated)
|
||||
{
|
||||
// Ausgabe der Waage auf Display
|
||||
// Block weight display during NFC write operations and higher-priority display messages
|
||||
@@ -186,9 +199,17 @@ void loop() {
|
||||
mainTaskWasPaused = true;
|
||||
}
|
||||
|
||||
// Während eines expliziten Scan-Requests darf kein regulärer Wiegevorgang
|
||||
// an das Backend gesendet werden.
|
||||
if (scanRequestActive) {
|
||||
weightCounterToApi = 0;
|
||||
weightSend = 0;
|
||||
lastWeight = weight;
|
||||
}
|
||||
|
||||
|
||||
// Wenn Timer abgelaufen und nicht gerade ein RFID-Tag geschrieben wird
|
||||
if (currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
|
||||
if (!scanRequestActive && currentMillis - lastWeightReadTime >= weightReadInterval && nfcReaderState < NFC_WRITING)
|
||||
{
|
||||
lastWeightReadTime = currentMillis;
|
||||
|
||||
@@ -201,8 +222,8 @@ void loop() {
|
||||
oledShowProgressBar(2, 4, tr(STR_SPOOL_TAG), tr(STR_WEIGHT_STABLE));
|
||||
oledSetPriority(DISPLAY_PRIORITY_INFO, 1000);
|
||||
}
|
||||
}
|
||||
else
|
||||
}
|
||||
else
|
||||
{
|
||||
// Show visual feedback when tag is present and weight is unstable
|
||||
if (weightCounterToApi > 0 && nfcReaderState == NFC_READ_SUCCESS && !tagProcessed && weightSend == 0) {
|
||||
@@ -216,10 +237,10 @@ void loop() {
|
||||
lastWeight = weight;
|
||||
|
||||
// Wenn ein Tag erkannt wurde und das Gewicht stabil ist (4+ seconds), an FilaMan senden
|
||||
if (weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||
if (!scanRequestActive && weightCounterToApi > 3 && weightSend == 0 && nfcReaderState == NFC_READ_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
|
||||
|
||||
// Check if it's a Bambu tag - if so, send only UUID without spoolId
|
||||
if (isBambuTag) {
|
||||
sendWeightAsync(0, activeTagUuid, weight);
|
||||
@@ -231,24 +252,24 @@ void loop() {
|
||||
Serial.println("Weight queued for FilaMan");
|
||||
}
|
||||
weightSend = 1;
|
||||
|
||||
|
||||
// Feedback to user
|
||||
oledShowProgressBar(3, 4, tr(STR_SPOOL_TAG), tr(STR_SENDING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
}
|
||||
|
||||
// Handle successful tag write
|
||||
if (nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||
if (!scanRequestActive && nfcReaderState == NFC_WRITE_SUCCESS && tagProcessed == false)
|
||||
{
|
||||
tagProcessed = true;
|
||||
|
||||
|
||||
// Only send weight if a valid spoolId exists (spool tag, not location tag)
|
||||
if (activeSpoolId.length() > 0 && activeSpoolId != "0") {
|
||||
int sId = activeSpoolId.toInt();
|
||||
sendWeightAsync(sId, activeTagUuid, weight);
|
||||
weightSend = 1;
|
||||
Serial.println("Weight queued for FilaMan after spool tag write");
|
||||
|
||||
|
||||
// Feedback to user
|
||||
oledShowProgressBar(3, 4, tr(STR_TAG_WRITTEN), tr(STR_SENDING));
|
||||
oledSetPriority(DISPLAY_PRIORITY_ACTION, 2000);
|
||||
|
||||
+438
-318
File diff suppressed because it is too large.
Load diff
@@ -28,6 +28,7 @@ void scanRfidTask(void * parameter);
|
||||
void startWriteJsonToTag(const bool isSpoolTag, const char* payload, int spoolId = 0, int locationId = 0);
|
||||
bool quickSpoolIdCheck(String uidString);
|
||||
bool readCompleteJsonForFastPath(); // Read complete JSON data for fast-path web interface display
|
||||
void setScanRequest(bool active);
|
||||
|
||||
extern TaskHandle_t RfidReaderTask;
|
||||
extern String nfcJsonData;
|
||||
@@ -36,6 +37,7 @@ extern String activeTagUuid;
|
||||
extern String lastSpoolId;
|
||||
extern volatile nfcReaderStateType nfcReaderState;
|
||||
extern volatile bool nfcWriteInProgress;
|
||||
extern volatile bool scanRequestActive;
|
||||
extern bool tagProcessed;
|
||||
extern bool isBambuTag;
|
||||
|
||||
|
||||
+172
-61
@@ -35,10 +35,22 @@ uint8_t scale_tare_counter = 0;
|
||||
bool scaleTareRequest = false;
|
||||
uint8_t pauseMainTask = 0;
|
||||
bool scaleCalibrated;
|
||||
bool scaleConnected;
|
||||
bool autoTare = true;
|
||||
bool scaleCalibrationActive = 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 #####
|
||||
|
||||
/**
|
||||
@@ -50,7 +62,7 @@ void resetWeightFilter() {
|
||||
filteredWeight = 0.0f;
|
||||
lastDisplayedWeight = 0;
|
||||
lastStableWeight = 0; // Reset stable weight for API actions
|
||||
|
||||
|
||||
// Initialize buffer with zeros
|
||||
for (int i = 0; i < MOVING_AVERAGE_SIZE; i++) {
|
||||
weightBuffer[i] = 0.0f;
|
||||
@@ -63,11 +75,11 @@ void resetWeightFilter() {
|
||||
float calculateMovingAverage() {
|
||||
float sum = 0.0f;
|
||||
int count = bufferFilled ? MOVING_AVERAGE_SIZE : bufferIndex;
|
||||
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
sum += weightBuffer[i];
|
||||
}
|
||||
|
||||
|
||||
return (count > 0) ? sum / count : 0.0f;
|
||||
}
|
||||
|
||||
@@ -88,33 +100,33 @@ int16_t processWeightReading(float rawWeight) {
|
||||
// Add to moving average buffer
|
||||
weightBuffer[bufferIndex] = rawWeight;
|
||||
bufferIndex = (bufferIndex + 1) % MOVING_AVERAGE_SIZE;
|
||||
|
||||
|
||||
if (bufferIndex == 0) {
|
||||
bufferFilled = true;
|
||||
}
|
||||
|
||||
|
||||
// Calculate moving average
|
||||
float avgWeight = calculateMovingAverage();
|
||||
|
||||
|
||||
// Apply low-pass filter
|
||||
float smoothedWeight = applyLowPassFilter(avgWeight);
|
||||
|
||||
|
||||
// Round to nearest gram
|
||||
int16_t newWeight = round(smoothedWeight);
|
||||
|
||||
|
||||
// Update displayed weight if display threshold is reached
|
||||
if (abs(newWeight - lastDisplayedWeight) >= DISPLAY_THRESHOLD) {
|
||||
lastDisplayedWeight = newWeight;
|
||||
}
|
||||
|
||||
|
||||
// Update global weight for API actions only if stable threshold is reached
|
||||
int16_t weightToReturn = weight; // Default: keep current weight
|
||||
|
||||
|
||||
if (abs(newWeight - lastStableWeight) >= API_THRESHOLD) {
|
||||
lastStableWeight = newWeight;
|
||||
weightToReturn = newWeight;
|
||||
}
|
||||
|
||||
|
||||
return weightToReturn;
|
||||
}
|
||||
|
||||
@@ -145,7 +157,7 @@ uint8_t tareScale() {
|
||||
Serial.println("Tare scale");
|
||||
scale.tare();
|
||||
resetWeightFilter();
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -161,13 +173,13 @@ void scale_loop(void * parameter) {
|
||||
|
||||
for(;;) {
|
||||
unsigned long currentTime = millis();
|
||||
|
||||
|
||||
// Only measure at defined intervals to reduce noise
|
||||
if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) {
|
||||
if (scale.is_ready())
|
||||
if (scale.is_ready())
|
||||
{
|
||||
// Waage manuell Taren
|
||||
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
||||
if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 20))
|
||||
{
|
||||
Serial.println("Re-Tare scale");
|
||||
oledDisplayText(tr(STR_TARE_SCALE));
|
||||
@@ -189,16 +201,16 @@ void scale_loop(void * parameter) {
|
||||
|
||||
// Get raw weight reading
|
||||
float rawWeight = scale.get_units();
|
||||
|
||||
|
||||
// Process weight with stabilization
|
||||
int16_t stabilizedWeight = processWeightReading(rawWeight);
|
||||
|
||||
|
||||
// Update global weight variable only if it changed significantly (for API actions)
|
||||
if (stabilizedWeight != weight) {
|
||||
weight = stabilizedWeight;
|
||||
oledResetActivityTimer(); // Wake display on weight change
|
||||
}
|
||||
|
||||
|
||||
// Prüfen ob die Waage korrekt genullt ist
|
||||
// Abweichung von 2g ignorieren
|
||||
if (autoTare && (rawWeight > 2 && rawWeight < 7) || rawWeight < -2)
|
||||
@@ -215,15 +227,111 @@ void scale_loop(void * parameter) {
|
||||
if (currentTime - lastDebugTime > 2000) { // Print every 2 seconds
|
||||
lastDebugTime = currentTime;
|
||||
}
|
||||
|
||||
|
||||
lastMeasurementTime = currentTime;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
vTaskDelay(pdMS_TO_TICKS(10)); // Shorter delay for more responsive loop
|
||||
}
|
||||
}
|
||||
|
||||
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; // 1 second timeout for waiting for the chip to respond
|
||||
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) {
|
||||
Serial.println("Prüfe Calibration Value");
|
||||
float calibrationValue;
|
||||
@@ -238,7 +346,7 @@ void start_scale(bool touchSensorConnected) {
|
||||
calibrationValue = SCALE_DEFAULT_CALIBRATION_VALUE;
|
||||
scaleCalibrated = false;
|
||||
}
|
||||
|
||||
|
||||
// auto Tare
|
||||
// Wenn Touch Sensor verbunden, dann autoTare auf false setzen
|
||||
// Danach prüfen was in NVS gespeichert ist
|
||||
@@ -252,40 +360,43 @@ void start_scale(bool touchSensorConnected) {
|
||||
|
||||
scale.begin(LOADCELL_DOUT_PIN, LOADCELL_SCK_PIN);
|
||||
|
||||
oledShowProgressBar(6, 7, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE));
|
||||
for (uint16_t i = 0; i < 3000; i++) {
|
||||
yield();
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
oledShowProgressBar(5, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_SEARCHING_SCALE));
|
||||
friendlyWait(3000);
|
||||
|
||||
scaleConnected = scaleDetected();
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
while(!scale.is_ready()) {
|
||||
vTaskDelay(pdMS_TO_TICKS(5000));
|
||||
}
|
||||
|
||||
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 {
|
||||
// No HX711 - switching to NFC-only mode
|
||||
Serial.println("Kann kein HX711 Board finden !"); // Sende Text "Kann kein..." an seriellen Monitor
|
||||
oledDisplayText(tr(STR_HX711_NOT_FOUND));
|
||||
vTaskDelay(pdMS_TO_TICKS(1500));
|
||||
oledDisplayText(tr(STR_NOSCALE_MODE));
|
||||
vTaskDelay(pdMS_TO_TICKS(1500));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -300,10 +411,10 @@ uint8_t calibrate_scale() {
|
||||
if (ScaleTask != NULL && xTaskGetCurrentTaskHandle() != ScaleTask) vTaskSuspend(ScaleTask);
|
||||
|
||||
pauseMainTask = 1;
|
||||
|
||||
|
||||
if (scale.wait_ready_timeout(1000))
|
||||
{
|
||||
|
||||
|
||||
scale.set_scale();
|
||||
oledShowProgressBar(0, 3, tr(STR_SCALE_CAL), tr(STR_EMPTY_SCALE));
|
||||
|
||||
@@ -324,7 +435,7 @@ uint8_t calibrate_scale() {
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
|
||||
|
||||
float newCalibrationValue = scale.get_units(10);
|
||||
Serial.print("Result: ");
|
||||
Serial.println(newCalibrationValue);
|
||||
@@ -359,7 +470,7 @@ uint8_t calibrate_scale() {
|
||||
vTaskDelay(pdMS_TO_TICKS(1));
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
|
||||
|
||||
oledShowProgressBar(3, 3, tr(STR_SCALE_CAL), tr(STR_COMPLETED));
|
||||
|
||||
// For some reason it is not possible to re-tare the scale here, it will result in a wdt timeout. Instead let the scale loop do the taring
|
||||
@@ -387,12 +498,12 @@ uint8_t calibrate_scale() {
|
||||
esp_task_wdt_reset();
|
||||
}
|
||||
returnState = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
Serial.println("HX711 not found.");
|
||||
|
||||
|
||||
oledDisplayText(tr(STR_HX711_NOT_FOUND));
|
||||
|
||||
for (uint16_t i = 0; i < 30000; i++) {
|
||||
|
||||
@@ -23,6 +23,7 @@ extern uint8_t scale_tare_counter;
|
||||
extern bool scaleTareRequest;
|
||||
extern uint8_t pauseMainTask;
|
||||
extern bool scaleCalibrated;
|
||||
extern bool scaleConnected;
|
||||
extern bool autoTare;
|
||||
extern bool scaleCalibrationActive;
|
||||
extern volatile bool scaleCalibrationRequest;
|
||||
|
||||
+55
-10
@@ -12,6 +12,7 @@
|
||||
#include "config.h"
|
||||
#include "debug.h"
|
||||
#include "lang.h"
|
||||
#include "wlan.h"
|
||||
|
||||
#ifndef VERSION
|
||||
#define VERSION "1.2.0"
|
||||
@@ -105,6 +106,12 @@ void sendWriteResult(AsyncWebSocketClient *client, uint8_t success) {
|
||||
if (client) client->text(response); else ws.textAll(response);
|
||||
}
|
||||
|
||||
// Ergebnis der asynchronen Geräte-Registrierung. Der HTTP-Request ist zu diesem
|
||||
// Zeitpunkt längst beantwortet (202), das Frontend wartet auf diese WS-Nachricht.
|
||||
void sendRegisterResult(bool success) {
|
||||
ws.textAll("{\"type\":\"registerResult\",\"success\":" + String(success ? "true" : "false") + "}");
|
||||
}
|
||||
|
||||
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success) {
|
||||
if (success == lastSuccess && client == nullptr) return;
|
||||
ws.textAll("{\"type\":\"nfcTag\", \"payload\":{\"found\": " + String(success) + "}}");
|
||||
@@ -124,8 +131,8 @@ void sendNfcData() {
|
||||
}
|
||||
|
||||
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);
|
||||
server.addHandler(&ws);
|
||||
|
||||
@@ -138,7 +145,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
.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){
|
||||
Serial.println("Web: Request /");
|
||||
@@ -189,12 +196,16 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid JSON\"}");
|
||||
return;
|
||||
}
|
||||
if (doc["url"].is<String>()) filamanUrl = doc["url"].as<String>();
|
||||
saveFilamanConfig();
|
||||
if (registerDevice(doc["code"].as<String>())) {
|
||||
request->send(200, "application/json", "{\"success\": true}");
|
||||
// WICHTIG: registerDevice() macht einen blockierenden HTTPClient-Call
|
||||
// (5s Timeout). Direkt hier aufgerufen friert das den AsyncTCP-Task ein
|
||||
// und reisst alle laufenden HTTP-/WebSocket-Verbindungen ab. Daher nur
|
||||
// einreihen und sofort antworten; das Ergebnis kommt per WebSocket
|
||||
// ("registerResult") vom filamanApiTask.
|
||||
String url = doc["url"].is<String>() ? doc["url"].as<String>() : String("");
|
||||
if (registerDeviceAsync(url, doc["code"].as<String>())) {
|
||||
request->send(202, "application/json", "{\"success\": true, \"pending\": true}");
|
||||
} else {
|
||||
request->send(400, "application/json", "{\"success\": false}");
|
||||
request->send(503, "application/json", "{\"success\": false, \"error\": \"API queue full\"}");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -214,7 +225,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
|
||||
String payloadString;
|
||||
serializeJson(doc, payloadString);
|
||||
|
||||
|
||||
bool hasSpoolId = !doc["spool_id"].isNull() || !doc["sm_id"].isNull();
|
||||
int spoolId = doc["spool_id"] | 0;
|
||||
if (spoolId == 0 && doc["sm_id"].is<String>()) {
|
||||
@@ -223,7 +234,7 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
int locationId = doc["location_id"] | 0;
|
||||
|
||||
startWriteJsonToTag(hasSpoolId, payloadString.c_str(), spoolId, locationId);
|
||||
|
||||
|
||||
// Respond immediately
|
||||
request->send(200, "application/json", "{\"success\": true, \"message\": \"Schreibvorgang wurde gestartet. Bitte Tag bereit halten...\"}");
|
||||
});
|
||||
@@ -285,6 +296,40 @@ void setupWebserver(AsyncWebServer &server) {
|
||||
request->send(200, "application/json", "{\"success\": true}");
|
||||
});
|
||||
|
||||
// WiFi TX Power API (Wert in 0.1 dBm, z.B. 195 = 19.5dBm)
|
||||
server.on("/api/wifi-power", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
JsonDocument doc;
|
||||
doc["txPower"] = wifiTxPowerDeciDbm;
|
||||
String response;
|
||||
serializeJson(doc, response);
|
||||
request->send(200, "application/json", response);
|
||||
});
|
||||
|
||||
server.on("/api/wifi-power", 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["txPower"].is<int>()) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Missing txPower\"}");
|
||||
return;
|
||||
}
|
||||
int16_t txPower = (int16_t)doc["txPower"].as<int>();
|
||||
if (!isValidTxPowerDeciDbm(txPower)) {
|
||||
request->send(400, "application/json", "{\"success\": false, \"error\": \"Invalid txPower\"}");
|
||||
return;
|
||||
}
|
||||
saveWifiTxPower(txPower);
|
||||
request->send(200, "application/json", "{\"success\": true}");
|
||||
});
|
||||
|
||||
server.on("/api/v1/rfid/scan-request", HTTP_POST, [](AsyncWebServerRequest *request){}, NULL, [](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total){
|
||||
setScanRequest(true);
|
||||
request->send(200, "application/json", "{\"success\": true}");
|
||||
});
|
||||
|
||||
server.on("/reboot", HTTP_GET, [](AsyncWebServerRequest *request){
|
||||
request->send(200, "text/plain", "Rebooting...");
|
||||
delay(500);
|
||||
|
||||
@@ -26,5 +26,6 @@ void sendAmsData(AsyncWebSocketClient *client);
|
||||
void sendNfcData();
|
||||
void foundNfcTag(AsyncWebSocketClient *client, uint8_t success);
|
||||
void sendWriteResult(AsyncWebSocketClient *client, uint8_t success);
|
||||
void sendRegisterResult(bool success);
|
||||
|
||||
#endif
|
||||
+131
-41
@@ -7,26 +7,124 @@
|
||||
#include "display.h"
|
||||
#include "config.h"
|
||||
#include "lang.h"
|
||||
#include <Preferences.h>
|
||||
|
||||
WiFiManager wm;
|
||||
bool wm_nonblocking = false;
|
||||
uint8_t wifiErrorCounter = 0;
|
||||
|
||||
// Erlaubte Stufen in 0.1 dBm. Der ESP32-Treiber kennt nur diese festen Werte;
|
||||
// alles andere fällt auf das Maximum (19.5dBm) zurück.
|
||||
wifi_power_t txPowerFromDeciDbm(int16_t deciDbm) {
|
||||
switch (deciDbm) {
|
||||
case 85: return WIFI_POWER_8_5dBm;
|
||||
case 110: return WIFI_POWER_11dBm;
|
||||
case 130: return WIFI_POWER_13dBm;
|
||||
case 150: return WIFI_POWER_15dBm;
|
||||
case 170: return WIFI_POWER_17dBm;
|
||||
case 195: return WIFI_POWER_19_5dBm;
|
||||
default: return WIFI_POWER_19_5dBm;
|
||||
}
|
||||
}
|
||||
|
||||
bool isValidTxPowerDeciDbm(int16_t deciDbm) {
|
||||
return deciDbm == 85 || deciDbm == 110 || deciDbm == 130 ||
|
||||
deciDbm == 150 || deciDbm == 170 || deciDbm == 195;
|
||||
}
|
||||
|
||||
void loadWifiTxPower() {
|
||||
Preferences preferences;
|
||||
preferences.begin(NVS_NAMESPACE_SETTINGS, true);
|
||||
int16_t stored = preferences.getShort(NVS_KEY_WIFI_TXPOWER, 195);
|
||||
preferences.end();
|
||||
wifiTxPowerDeciDbm = isValidTxPowerDeciDbm(stored) ? stored : 195;
|
||||
Serial.print("WiFi TX power loaded: ");
|
||||
Serial.print(wifiTxPowerDeciDbm / 10.0, 1);
|
||||
Serial.println(" dBm");
|
||||
}
|
||||
|
||||
void saveWifiTxPower(int16_t deciDbm) {
|
||||
if (!isValidTxPowerDeciDbm(deciDbm)) return;
|
||||
wifiTxPowerDeciDbm = deciDbm;
|
||||
Preferences preferences;
|
||||
preferences.begin(NVS_NAMESPACE_SETTINGS, false);
|
||||
preferences.putShort(NVS_KEY_WIFI_TXPOWER, deciDbm);
|
||||
preferences.end();
|
||||
// Sofort anwenden, ein Neustart ist nicht noetig.
|
||||
WiFi.setTxPower(txPowerFromDeciDbm(deciDbm));
|
||||
}
|
||||
|
||||
void wifiSettings() {
|
||||
// Standard WiFi-Einstellungen für höchste Stabilität mit ESPAsyncWebServer
|
||||
WiFi.mode(WIFI_STA);
|
||||
WiFi.mode(WIFI_STA);
|
||||
WiFi.setHostname("FilaMan");
|
||||
|
||||
|
||||
// ESP32-Core Auto-Reconnect aktivieren (unabhängig vom WiFiManager-Flag).
|
||||
// Sorgt dafür, dass der WiFi-Stack autonom direkt nach einem Disconnect
|
||||
// neu verbindet, ohne auf das 15s-Polling in checkWiFiConnection() warten zu müssen.
|
||||
WiFi.setAutoReconnect(true);
|
||||
WiFi.persistent(true);
|
||||
|
||||
// KRITISCH: Power-Save deaktivieren für stabilen Webserver-Betrieb
|
||||
// Ohne dies geht WiFi in Modem-Sleep und verpasst Requests/Responses
|
||||
// Dies ist die Hauptursache für Verbindungsabbrüche bei regelmäßigen API-Calls
|
||||
WiFi.setSleep(false);
|
||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||
|
||||
// Angemessene Sendeleistung (reduziert Hitzeprobleme)
|
||||
WiFi.setTxPower(WIFI_POWER_17dBm);
|
||||
|
||||
// Aktiviere WiFi-Roaming für bessere Stabilität bei schwachem Signal
|
||||
esp_wifi_set_rssi_threshold(-80);
|
||||
|
||||
// Sendeleistung, einstellbar unter Setup (Default 19.5dBm = Maximum).
|
||||
// 17dBm war früher ein Kompromiss gegen Hitzeprobleme, führte bei marginalem
|
||||
// Empfang aber zu AP-seitigen Auth-/Assoc-Kicks (reason=2/4/9/202). Umgekehrt
|
||||
// kann volle Leistung direkt neben dem AP dessen Empfaenger uebersteuern -
|
||||
// dann hilft ein niedrigerer Wert (beim ESP32-S3 z.B. 8.5dBm).
|
||||
loadWifiTxPower();
|
||||
WiFi.setTxPower(txPowerFromDeciDbm(wifiTxPowerDeciDbm));
|
||||
|
||||
// Hinweis: Kein esp_wifi_set_rssi_threshold() mehr.
|
||||
// Der vorherige Wert (-80 dBm) löste in Single-AP-Heimnetzen häufige
|
||||
// Disconnects aus, sobald das Signal in den normalen Wohnungs-Empfangsbereich
|
||||
// fiel. Ohne Mesh-/Roaming-Setup bringt der Threshold keinen Vorteil.
|
||||
}
|
||||
|
||||
// Reagiert sofort auf Verbindungsverlust, statt bis zum nächsten
|
||||
// checkWiFiConnection()-Tick zu warten. Das ESP32-Auto-Reconnect übernimmt
|
||||
// die eigentliche Wiederherstellung; hier nur Logging + Display-Update.
|
||||
void onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
|
||||
switch (event) {
|
||||
case ARDUINO_EVENT_WIFI_STA_DISCONNECTED: {
|
||||
// BSSID/RSSI mitloggen: wechselt die BSSID zwischen den Reconnects,
|
||||
// pendelt das Gerät zwischen zwei APs (Mesh/Repeater) - dann kommen
|
||||
// die Abbrüche vom Roaming, nicht vom Webserver.
|
||||
const uint8_t *bssid = info.wifi_sta_disconnected.bssid;
|
||||
Serial.printf("WiFi event: STA_DISCONNECTED, reason=%u, "
|
||||
"bssid=%02X:%02X:%02X:%02X:%02X:%02X, rssi=%d\n",
|
||||
info.wifi_sta_disconnected.reason,
|
||||
bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5],
|
||||
WiFi.RSSI());
|
||||
if (wifiOn) {
|
||||
wifiOn = false;
|
||||
oledShowTopRow();
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ARDUINO_EVENT_WIFI_STA_GOT_IP:
|
||||
Serial.printf("WiFi event: STA_GOT_IP %s, bssid=%s, rssi=%d, ch=%d\n",
|
||||
WiFi.localIP().toString().c_str(),
|
||||
WiFi.BSSIDstr().c_str(),
|
||||
WiFi.RSSI(),
|
||||
WiFi.channel());
|
||||
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);
|
||||
// Gleiches gilt für die Sendeleistung: nach einem Reconnect erneut setzen.
|
||||
WiFi.setTxPower(txPowerFromDeciDbm(wifiTxPowerDeciDbm));
|
||||
oledShowTopRow();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void configModeCallback (WiFiManager *myWiFiManager) {
|
||||
@@ -39,6 +137,10 @@ void initWiFi() {
|
||||
// load Wifi settings
|
||||
wifiSettings();
|
||||
|
||||
// WiFi-Events abonnieren, bevor autoConnect() läuft, damit auch frühe
|
||||
// Disconnects/Reconnects schon erfasst werden.
|
||||
WiFi.onEvent(onWiFiEvent);
|
||||
|
||||
wm.setAPCallback(configModeCallback);
|
||||
|
||||
wm.setSaveConfigCallback([]() {
|
||||
@@ -48,22 +150,25 @@ void initWiFi() {
|
||||
|
||||
if(wm_nonblocking) wm.setConfigPortalBlocking(false);
|
||||
//wm.setConfigPortalTimeout(320); // Portal nach 5min schließen
|
||||
wm.setWiFiAutoReconnect(true);
|
||||
// WiFiManager-Reconnect deaktiviert: der ESP32-Stack übernimmt das via
|
||||
// setAutoReconnect(true). Zwei parallele Reconnect-Mechanismen erzeugen
|
||||
// sonst einen Verbindungssturm, der den Router zu AUTH_EXPIRE-Kicks verleitet.
|
||||
wm.setWiFiAutoReconnect(false);
|
||||
wm.setConnectTimeout(10);
|
||||
|
||||
oledShowProgressBar(1, 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
|
||||
if(!wm.autoConnect("FilaMan")) {
|
||||
Serial.println("Failed to connect or hit timeout");
|
||||
// ESP.restart();
|
||||
oledShowTopRow();
|
||||
oledDisplayText(tr(STR_WIFI_NOT_CONNECTED));
|
||||
}
|
||||
}
|
||||
else {
|
||||
wifiOn = true;
|
||||
|
||||
//if you get here you have connected to the WiFi
|
||||
//if you get here you have connected to the WiFi
|
||||
Serial.println("connected...yeey :)");
|
||||
Serial.print("IP address: ");
|
||||
Serial.println(WiFi.localIP());
|
||||
@@ -73,41 +178,26 @@ void initWiFi() {
|
||||
}
|
||||
|
||||
void checkWiFiConnection() {
|
||||
if (WiFi.status() != WL_CONNECTED)
|
||||
if (WiFi.status() != WL_CONNECTED)
|
||||
{
|
||||
if (wifiOn) {
|
||||
Serial.println("WiFi connection lost. Attempting active reconnect...");
|
||||
wifiOn = false;
|
||||
oledShowTopRow();
|
||||
oledDisplayText(tr(STR_WIFI_RECONNECTING));
|
||||
|
||||
// Aktiver Reconnect-Versuch statt nur auf LwIP auto-reconnect zu warten
|
||||
WiFi.reconnect();
|
||||
}
|
||||
|
||||
// setAutoReconnect(true) übernimmt die Wiederverbindung automatisch.
|
||||
// Hier nur Display-Update und Fehler zählen für den Neustart-Watchdog.
|
||||
oledDisplayText(tr(STR_WIFI_RECONNECTING));
|
||||
wifiErrorCounter++;
|
||||
|
||||
// Only restart after a significant time of no connection (e.g. 5 minutes)
|
||||
// Assuming WIFI_CHECK_INTERVAL is 60000ms (1 minute), 5 errors = 5 minutes
|
||||
if (wifiErrorCounter >= 5)
|
||||
// Nach ca. 5 Minuten ohne Verbindung Neustart (bei WIFI_CHECK_INTERVAL
|
||||
// = 15s entspricht das 20 Fehlern).
|
||||
const uint8_t maxErrors = (uint8_t)(300000UL / WIFI_CHECK_INTERVAL);
|
||||
if (wifiErrorCounter >= maxErrors)
|
||||
{
|
||||
Serial.println("WiFi unable to reconnect for 5 minutes. Restarting...");
|
||||
Serial.println("WiFi unable to reconnect for ~5 minutes. Restarting...");
|
||||
ESP.restart();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!wifiOn) {
|
||||
Serial.println("WiFi reconnected successfully.");
|
||||
wifiErrorCounter = 0;
|
||||
wifiOn = true;
|
||||
oledShowTopRow();
|
||||
|
||||
// Power-Save erneut deaktivieren nach Reconnect (wird manchmal zurückgesetzt)
|
||||
esp_wifi_set_ps(WIFI_PS_NONE);
|
||||
} else {
|
||||
// Reset error counter if we are connected (just to be safe)
|
||||
wifiErrorCounter = 0;
|
||||
}
|
||||
// Connected: Fehlerzähler zurücksetzen. wifiOn wird vom GOT_IP-Event
|
||||
// gepflegt, daher hier nichts weiter zu tun.
|
||||
wifiErrorCounter = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,4 +6,9 @@
|
||||
void initWiFi();
|
||||
void checkWiFiConnection();
|
||||
|
||||
// Sendeleistung in 0.1 dBm (85/110/130/150/170/195). Ungueltige Werte werden ignoriert.
|
||||
bool isValidTxPowerDeciDbm(int16_t deciDbm);
|
||||
void loadWifiTxPower();
|
||||
void saveWifiTxPower(int16_t deciDbm);
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user