mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-07 08:19:52 +03:00
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev
This commit is contained in:
MichaelDvP
@@ -1,4 +1,4 @@
|
|||||||
name: 'github-releases-to-discord'
|
name: 'Publish releases to discord'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
|
|||||||
2
.github/workflows/pr_check.yml
vendored
2
.github/workflows/pr_check.yml
vendored
@@ -1,4 +1,4 @@
|
|||||||
name: 'pr_check'
|
name: 'Pre-check on PR'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|||||||
2
.github/workflows/pre_release.yml
vendored
2
.github/workflows/pre_release.yml
vendored
@@ -1,4 +1,4 @@
|
|||||||
name: 'pre-release'
|
name: 'Build dev release'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|||||||
23
.github/workflows/stale_issues.yml
vendored
Normal file
23
.github/workflows/stale_issues.yml
vendored
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
name: "Mark or close stale issues and PRs"
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: "30 * * * *"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
stale:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/stale@v9
|
||||||
|
with:
|
||||||
|
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
days-before-stale: 30
|
||||||
|
days-before-close: 5
|
||||||
|
stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment otherwise this will be closed in 5 days."
|
||||||
|
stale-pr-message: "This PR has been automatically marked as stale because there has been no activity in last 30 days. It will be closed if no further activity occurs. Thank you for your contributions."
|
||||||
|
close-issue-message: "This issue was closed because it has been stalled for 5 days with no activity."
|
||||||
|
close-pr-message: "This PR was automatically closed because of being stale."
|
||||||
|
stale-pr-label: "stale"
|
||||||
|
stale-issue-label: "stale"
|
||||||
|
exempt-issue-labels: "bug,enhancement,pinned,security"
|
||||||
|
exempt-pr-labels: "bug,enhancement,pinned,security"
|
||||||
2
.github/workflows/tagged_release.yml
vendored
2
.github/workflows/tagged_release.yml
vendored
@@ -1,4 +1,4 @@
|
|||||||
name: 'tagged-release'
|
name: 'Build stable release'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|||||||
2
.github/workflows/test_release.yml
vendored
2
.github/workflows/test_release.yml
vendored
@@ -1,4 +1,4 @@
|
|||||||
name: 'test-release'
|
name: 'Build test release'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|||||||
@@ -554,7 +554,7 @@ const ApplicationSettings = () => {
|
|||||||
<Grid>
|
<Grid>
|
||||||
<TextField
|
<TextField
|
||||||
name="led_type"
|
name="led_type"
|
||||||
label={'LED ' + LL.TYPE()}
|
label={'LED ' + LL.TYPE(0)}
|
||||||
value={data.led_type}
|
value={data.led_type}
|
||||||
fullWidth
|
fullWidth
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
|
|||||||
@@ -187,7 +187,7 @@ const sk: Translation = {
|
|||||||
COMPACT: 'Kompaktné',
|
COMPACT: 'Kompaktné',
|
||||||
DOWNLOAD_SETTINGS_TEXT: 'Vytvorte zálohu svojej konfigurácie a nastavení',
|
DOWNLOAD_SETTINGS_TEXT: 'Vytvorte zálohu svojej konfigurácie a nastavení',
|
||||||
UPLOAD_TEXT: 'Nahrajte nový súbor firmvéru (.bin) alebo súbor zálohy (.json)',
|
UPLOAD_TEXT: 'Nahrajte nový súbor firmvéru (.bin) alebo súbor zálohy (.json)',
|
||||||
UPLOAD_DROP_TEXT: 'Drop a firmware .bin file or click here', // TODO translate
|
UPLOAD_DROP_TEXT: 'Presuňte súbor .bin firmvéru alebo kliknite sem',
|
||||||
ERROR: 'Neočakávaná chyba, prosím skúste to znova',
|
ERROR: 'Neočakávaná chyba, prosím skúste to znova',
|
||||||
TIME_SET: 'Nastavený čas',
|
TIME_SET: 'Nastavený čas',
|
||||||
MANAGE_USERS: 'Správa používateľov',
|
MANAGE_USERS: 'Správa používateľov',
|
||||||
@@ -340,8 +340,8 @@ const sk: Translation = {
|
|||||||
AUTO_SCROLL: 'Automatické rolovanie',
|
AUTO_SCROLL: 'Automatické rolovanie',
|
||||||
DASHBOARD: 'Panel',
|
DASHBOARD: 'Panel',
|
||||||
DEVELOPER_MODE: 'Režim vývojára',
|
DEVELOPER_MODE: 'Režim vývojára',
|
||||||
BYTES: 'Bytes', // TODO translate
|
BYTES: 'Bytov',
|
||||||
BITMASK: 'Bit Mask',// TODO translate
|
BITMASK: 'Bitová maska',
|
||||||
DUPLICATE: 'Duplicitné',
|
DUPLICATE: 'Duplicitné',
|
||||||
UPGRADE: 'Inovovať',
|
UPGRADE: 'Inovovať',
|
||||||
DASHBOARD_1: 'Všetky entity EMS, ktoré sú aktívne a označené ako obľúbené, plus všetky vlastné entity, plány a údaje externých senzorov sú zobrazené nižšie.',
|
DASHBOARD_1: 'Všetky entity EMS, ktoré sú aktívne a označené ako obľúbené, plus všetky vlastné entity, plány a údaje externých senzorov sú zobrazené nižšie.',
|
||||||
|
|||||||
@@ -1089,135 +1089,135 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-android-arm-eabi@npm:4.35.0":
|
"@rollup/rollup-android-arm-eabi@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-android-arm-eabi@npm:4.35.0"
|
resolution: "@rollup/rollup-android-arm-eabi@npm:4.36.0"
|
||||||
conditions: os=android & cpu=arm
|
conditions: os=android & cpu=arm
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-android-arm64@npm:4.35.0":
|
"@rollup/rollup-android-arm64@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-android-arm64@npm:4.35.0"
|
resolution: "@rollup/rollup-android-arm64@npm:4.36.0"
|
||||||
conditions: os=android & cpu=arm64
|
conditions: os=android & cpu=arm64
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-darwin-arm64@npm:4.35.0":
|
"@rollup/rollup-darwin-arm64@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-darwin-arm64@npm:4.35.0"
|
resolution: "@rollup/rollup-darwin-arm64@npm:4.36.0"
|
||||||
conditions: os=darwin & cpu=arm64
|
conditions: os=darwin & cpu=arm64
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-darwin-x64@npm:4.35.0":
|
"@rollup/rollup-darwin-x64@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-darwin-x64@npm:4.35.0"
|
resolution: "@rollup/rollup-darwin-x64@npm:4.36.0"
|
||||||
conditions: os=darwin & cpu=x64
|
conditions: os=darwin & cpu=x64
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-freebsd-arm64@npm:4.35.0":
|
"@rollup/rollup-freebsd-arm64@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-freebsd-arm64@npm:4.35.0"
|
resolution: "@rollup/rollup-freebsd-arm64@npm:4.36.0"
|
||||||
conditions: os=freebsd & cpu=arm64
|
conditions: os=freebsd & cpu=arm64
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-freebsd-x64@npm:4.35.0":
|
"@rollup/rollup-freebsd-x64@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-freebsd-x64@npm:4.35.0"
|
resolution: "@rollup/rollup-freebsd-x64@npm:4.36.0"
|
||||||
conditions: os=freebsd & cpu=x64
|
conditions: os=freebsd & cpu=x64
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0":
|
"@rollup/rollup-linux-arm-gnueabihf@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=arm & libc=glibc
|
conditions: os=linux & cpu=arm & libc=glibc
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-arm-musleabihf@npm:4.35.0":
|
"@rollup/rollup-linux-arm-musleabihf@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=arm & libc=musl
|
conditions: os=linux & cpu=arm & libc=musl
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-arm64-gnu@npm:4.35.0":
|
"@rollup/rollup-linux-arm64-gnu@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=arm64 & libc=glibc
|
conditions: os=linux & cpu=arm64 & libc=glibc
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-arm64-musl@npm:4.35.0":
|
"@rollup/rollup-linux-arm64-musl@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=arm64 & libc=musl
|
conditions: os=linux & cpu=arm64 & libc=musl
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0":
|
"@rollup/rollup-linux-loongarch64-gnu@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=loong64 & libc=glibc
|
conditions: os=linux & cpu=loong64 & libc=glibc
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0":
|
"@rollup/rollup-linux-powerpc64le-gnu@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=ppc64 & libc=glibc
|
conditions: os=linux & cpu=ppc64 & libc=glibc
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-riscv64-gnu@npm:4.35.0":
|
"@rollup/rollup-linux-riscv64-gnu@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=riscv64 & libc=glibc
|
conditions: os=linux & cpu=riscv64 & libc=glibc
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-s390x-gnu@npm:4.35.0":
|
"@rollup/rollup-linux-s390x-gnu@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=s390x & libc=glibc
|
conditions: os=linux & cpu=s390x & libc=glibc
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-x64-gnu@npm:4.35.0":
|
"@rollup/rollup-linux-x64-gnu@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=x64 & libc=glibc
|
conditions: os=linux & cpu=x64 & libc=glibc
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-linux-x64-musl@npm:4.35.0":
|
"@rollup/rollup-linux-x64-musl@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-linux-x64-musl@npm:4.35.0"
|
resolution: "@rollup/rollup-linux-x64-musl@npm:4.36.0"
|
||||||
conditions: os=linux & cpu=x64 & libc=musl
|
conditions: os=linux & cpu=x64 & libc=musl
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-win32-arm64-msvc@npm:4.35.0":
|
"@rollup/rollup-win32-arm64-msvc@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.35.0"
|
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.36.0"
|
||||||
conditions: os=win32 & cpu=arm64
|
conditions: os=win32 & cpu=arm64
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-win32-ia32-msvc@npm:4.35.0":
|
"@rollup/rollup-win32-ia32-msvc@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.35.0"
|
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.36.0"
|
||||||
conditions: os=win32 & cpu=ia32
|
conditions: os=win32 & cpu=ia32
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@rollup/rollup-win32-x64-msvc@npm:4.35.0":
|
"@rollup/rollup-win32-x64-msvc@npm:4.36.0":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.35.0"
|
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.36.0"
|
||||||
conditions: os=win32 & cpu=x64
|
conditions: os=win32 & cpu=x64
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
@@ -1406,16 +1406,7 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"@types/node@npm:*":
|
"@types/node@npm:*, @types/node@npm:^22.13.11":
|
||||||
version: 22.13.10
|
|
||||||
resolution: "@types/node@npm:22.13.10"
|
|
||||||
dependencies:
|
|
||||||
undici-types: "npm:~6.20.0"
|
|
||||||
checksum: 10c0/a3865f9503d6f718002374f7b87efaadfae62faa499c1a33b12c527cfb9fd86f733e1a1b026b80c5a0e4a965701174bc3305595a7d36078aa1abcf09daa5dee9
|
|
||||||
languageName: node
|
|
||||||
linkType: hard
|
|
||||||
|
|
||||||
"@types/node@npm:^22.13.11":
|
|
||||||
version: 22.13.11
|
version: 22.13.11
|
||||||
resolution: "@types/node@npm:22.13.11"
|
resolution: "@types/node@npm:22.13.11"
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -2048,9 +2039,9 @@ __metadata:
|
|||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"caniuse-lite@npm:^1.0.30001688":
|
"caniuse-lite@npm:^1.0.30001688":
|
||||||
version: 1.0.30001704
|
version: 1.0.30001707
|
||||||
resolution: "caniuse-lite@npm:1.0.30001704"
|
resolution: "caniuse-lite@npm:1.0.30001707"
|
||||||
checksum: 10c0/4efa0ece51ef58e7ce7e7c8cd7b50372bcb910581a47397be5c086c046c3cd436d123b734351fb20f638c322b339198edf89b5b632ff59bdd171c74ff7f4efcf
|
checksum: 10c0/a1beaf84bad4f6617bbc5616d6bc0c9cab73e73f7e9e09b6466af5195b1bc393e0f6f19643d7a1c88bd3f4bfa122d7bea81cf6225ec3ade57d5b1dd3478c1a1b
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -2631,9 +2622,9 @@ __metadata:
|
|||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"electron-to-chromium@npm:^1.5.73":
|
"electron-to-chromium@npm:^1.5.73":
|
||||||
version: 1.5.119
|
version: 1.5.123
|
||||||
resolution: "electron-to-chromium@npm:1.5.119"
|
resolution: "electron-to-chromium@npm:1.5.123"
|
||||||
checksum: 10c0/f4ca0eb3af21d16d2c1fd480c5a43428ce4423ca887338d69bd3eadae818b6d6e799c62b1baac1bc4f76e4226f5fb15a6b0dc8965f601ac053e86508d3e8e41c
|
checksum: 10c0/ffaa65e9337f5ba0b51d5709795c3d1074e0cae8efda24116561feed6cedd281f523be50339d991c2fc65344e66e65e7308a157ff87047a8bb4e8008412e9eb1
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -4764,9 +4755,9 @@ __metadata:
|
|||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"mime-db@npm:^1.28.0":
|
"mime-db@npm:^1.28.0":
|
||||||
version: 1.53.0
|
version: 1.54.0
|
||||||
resolution: "mime-db@npm:1.53.0"
|
resolution: "mime-db@npm:1.54.0"
|
||||||
checksum: 10c0/1dcc37ba8ed5d1c179f5c6f0837e8db19371d5f2ea3690c3c2f3fa8c3858f976851d3460b172b4dee78ebd606762cbb407aa398545fbacd539e519f858cd7bf4
|
checksum: 10c0/8d907917bc2a90fa2df842cdf5dfeaf509adc15fe0531e07bb2f6ab15992416479015828d6a74200041c492e42cce3ebf78e5ce714388a0a538ea9c53eece284
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -4924,11 +4915,11 @@ __metadata:
|
|||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"nanoid@npm:^3.3.8":
|
"nanoid@npm:^3.3.8":
|
||||||
version: 3.3.9
|
version: 3.3.11
|
||||||
resolution: "nanoid@npm:3.3.9"
|
resolution: "nanoid@npm:3.3.11"
|
||||||
bin:
|
bin:
|
||||||
nanoid: bin/nanoid.cjs
|
nanoid: bin/nanoid.cjs
|
||||||
checksum: 10c0/4515abe53db7b150cf77074558efc20d8e916d6910d557b5ce72e8bbf6f8e7554d3d7a0d180bfa65e5d8e99aa51b207aa8a3bf5f3b56233897b146d592e30b24
|
checksum: 10c0/40e7f70b3d15f725ca072dfc4f74e81fcf1fbb02e491cf58ac0c79093adc9b0a73b152bcde57df4b79cd097e13023d7504acb38404a4da7bc1cd8e887b82fe0b
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -5872,28 +5863,28 @@ __metadata:
|
|||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"rollup@npm:^4.30.1":
|
"rollup@npm:^4.30.1":
|
||||||
version: 4.35.0
|
version: 4.36.0
|
||||||
resolution: "rollup@npm:4.35.0"
|
resolution: "rollup@npm:4.36.0"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@rollup/rollup-android-arm-eabi": "npm:4.35.0"
|
"@rollup/rollup-android-arm-eabi": "npm:4.36.0"
|
||||||
"@rollup/rollup-android-arm64": "npm:4.35.0"
|
"@rollup/rollup-android-arm64": "npm:4.36.0"
|
||||||
"@rollup/rollup-darwin-arm64": "npm:4.35.0"
|
"@rollup/rollup-darwin-arm64": "npm:4.36.0"
|
||||||
"@rollup/rollup-darwin-x64": "npm:4.35.0"
|
"@rollup/rollup-darwin-x64": "npm:4.36.0"
|
||||||
"@rollup/rollup-freebsd-arm64": "npm:4.35.0"
|
"@rollup/rollup-freebsd-arm64": "npm:4.36.0"
|
||||||
"@rollup/rollup-freebsd-x64": "npm:4.35.0"
|
"@rollup/rollup-freebsd-x64": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.35.0"
|
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-arm-musleabihf": "npm:4.35.0"
|
"@rollup/rollup-linux-arm-musleabihf": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-arm64-gnu": "npm:4.35.0"
|
"@rollup/rollup-linux-arm64-gnu": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-arm64-musl": "npm:4.35.0"
|
"@rollup/rollup-linux-arm64-musl": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-loongarch64-gnu": "npm:4.35.0"
|
"@rollup/rollup-linux-loongarch64-gnu": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.35.0"
|
"@rollup/rollup-linux-powerpc64le-gnu": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-riscv64-gnu": "npm:4.35.0"
|
"@rollup/rollup-linux-riscv64-gnu": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-s390x-gnu": "npm:4.35.0"
|
"@rollup/rollup-linux-s390x-gnu": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-x64-gnu": "npm:4.35.0"
|
"@rollup/rollup-linux-x64-gnu": "npm:4.36.0"
|
||||||
"@rollup/rollup-linux-x64-musl": "npm:4.35.0"
|
"@rollup/rollup-linux-x64-musl": "npm:4.36.0"
|
||||||
"@rollup/rollup-win32-arm64-msvc": "npm:4.35.0"
|
"@rollup/rollup-win32-arm64-msvc": "npm:4.36.0"
|
||||||
"@rollup/rollup-win32-ia32-msvc": "npm:4.35.0"
|
"@rollup/rollup-win32-ia32-msvc": "npm:4.36.0"
|
||||||
"@rollup/rollup-win32-x64-msvc": "npm:4.35.0"
|
"@rollup/rollup-win32-x64-msvc": "npm:4.36.0"
|
||||||
"@types/estree": "npm:1.0.6"
|
"@types/estree": "npm:1.0.6"
|
||||||
fsevents: "npm:~2.3.2"
|
fsevents: "npm:~2.3.2"
|
||||||
dependenciesMeta:
|
dependenciesMeta:
|
||||||
@@ -5939,7 +5930,7 @@ __metadata:
|
|||||||
optional: true
|
optional: true
|
||||||
bin:
|
bin:
|
||||||
rollup: dist/bin/rollup
|
rollup: dist/bin/rollup
|
||||||
checksum: 10c0/5a04add5a48173b1d95deb5422a96833b7df91b14ccec462c048be48241a79ecee2c1b843511b91ca8b6124bdbae134ccfebe80d4222a93e98e73795d161d3cc
|
checksum: 10c0/52ad34ba18edb3613253ecbc7db5c8d6067ed103d8786051e96d42bcb383f7473bbda91b25297435b8a531fe308726cf1bb978456b9fcce044e4885510d73252
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
@@ -6591,11 +6582,11 @@ __metadata:
|
|||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"ts-api-utils@npm:^2.0.1":
|
"ts-api-utils@npm:^2.0.1":
|
||||||
version: 2.0.1
|
version: 2.1.0
|
||||||
resolution: "ts-api-utils@npm:2.0.1"
|
resolution: "ts-api-utils@npm:2.1.0"
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
typescript: ">=4.8.4"
|
typescript: ">=4.8.4"
|
||||||
checksum: 10c0/23fd56a958b332cac00150a652e4c84730df30571bd2faa1ba6d7b511356d1a61656621492bb6c7f15dd6e18847a1408357a0e406671d358115369a17f5bfedd
|
checksum: 10c0/9806a38adea2db0f6aa217ccc6bc9c391ddba338a9fe3080676d0d50ed806d305bb90e8cef0276e793d28c8a929f400abb184ddd7ff83a416959c0f4d2ce754f
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ let settings = {
|
|||||||
eth_power: 15,
|
eth_power: 15,
|
||||||
eth_phy_addr: 0,
|
eth_phy_addr: 0,
|
||||||
eth_clock_mode: 1,
|
eth_clock_mode: 1,
|
||||||
|
led_type: 0,
|
||||||
platform: 'ESP32',
|
platform: 'ESP32',
|
||||||
modbus_enabled: false,
|
modbus_enabled: false,
|
||||||
modbus_port: 502,
|
modbus_port: 502,
|
||||||
@@ -175,7 +176,7 @@ switch (emulate_esp as string) {
|
|||||||
settings.platform = 'ESP32';
|
settings.platform = 'ESP32';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// ESP32S3
|
// ESP32 S3
|
||||||
case 'ESP32S3':
|
case 'ESP32S3':
|
||||||
default:
|
default:
|
||||||
system_status.esp_platform = 'ESP32S3';
|
system_status.esp_platform = 'ESP32S3';
|
||||||
@@ -185,7 +186,7 @@ switch (emulate_esp as string) {
|
|||||||
system_status.psram = true;
|
system_status.psram = true;
|
||||||
system_status.psram_size = 8189;
|
system_status.psram_size = 8189;
|
||||||
system_status.free_psram = 8166;
|
system_status.free_psram = 8166;
|
||||||
settings.board_profile = 'S3';
|
settings.board_profile = 'S32S3';
|
||||||
settings.platform = 'ESP32S3';
|
settings.platform = 'ESP32S3';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -269,10 +270,10 @@ function updateMask(entity: any, de: any, dd: any) {
|
|||||||
const old_custom_name = dd.nodes[dd_objIndex].cn;
|
const old_custom_name = dd.nodes[dd_objIndex].cn;
|
||||||
console.log(
|
console.log(
|
||||||
'comparing names, old (' +
|
'comparing names, old (' +
|
||||||
old_custom_name +
|
old_custom_name +
|
||||||
') with new (' +
|
') with new (' +
|
||||||
new_custom_name +
|
new_custom_name +
|
||||||
')'
|
')'
|
||||||
);
|
);
|
||||||
if (old_custom_name !== new_custom_name) {
|
if (old_custom_name !== new_custom_name) {
|
||||||
changed = true;
|
changed = true;
|
||||||
@@ -367,15 +368,15 @@ function check_upgrade(version: string) {
|
|||||||
const stable_version = version.split(',')[1];
|
const stable_version = version.split(',')[1];
|
||||||
console.log(
|
console.log(
|
||||||
'latest dev version: ' +
|
'latest dev version: ' +
|
||||||
dev_version +
|
dev_version +
|
||||||
', latest stable version: ' +
|
', latest stable version: ' +
|
||||||
stable_version
|
stable_version
|
||||||
);
|
);
|
||||||
console.log(
|
console.log(
|
||||||
'Version upgrade check from version ' +
|
'Version upgrade check from version ' +
|
||||||
THIS_VERSION +
|
THIS_VERSION +
|
||||||
', upgradable: ' +
|
', upgradable: ' +
|
||||||
VERSION_IS_UPGRADEABLE
|
VERSION_IS_UPGRADEABLE
|
||||||
);
|
);
|
||||||
data = {
|
data = {
|
||||||
emsesp_version: THIS_VERSION,
|
emsesp_version: THIS_VERSION,
|
||||||
@@ -4864,7 +4865,8 @@ router
|
|||||||
phy_type: settings.phy_type,
|
phy_type: settings.phy_type,
|
||||||
eth_power: settings.eth_power,
|
eth_power: settings.eth_power,
|
||||||
eth_phy_addr: settings.eth_phy_addr,
|
eth_phy_addr: settings.eth_phy_addr,
|
||||||
eth_clock_mode: settings.eth_clock_mode
|
eth_clock_mode: settings.eth_clock_mode,
|
||||||
|
led_type: settings.led_type
|
||||||
};
|
};
|
||||||
|
|
||||||
if (board_profile == 'S32') {
|
if (board_profile == 'S32') {
|
||||||
@@ -4878,6 +4880,19 @@ router
|
|||||||
data.eth_power = 0;
|
data.eth_power = 0;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
|
} else if (board_profile == 'S32S3') {
|
||||||
|
// BBQKees Gateway S3
|
||||||
|
data.led_gpio = 2;
|
||||||
|
data.dallas_gpio = 18;
|
||||||
|
data.rx_gpio = 5;
|
||||||
|
data.tx_gpio = 17;
|
||||||
|
data.pbutton_gpio = 0;
|
||||||
|
data.phy_type = 0;
|
||||||
|
data.eth_power = 0;
|
||||||
|
data.eth_phy_addr = 0;
|
||||||
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'E32') {
|
} else if (board_profile == 'E32') {
|
||||||
// BBQKees Gateway E32
|
// BBQKees Gateway E32
|
||||||
data.led_gpio = 2;
|
data.led_gpio = 2;
|
||||||
@@ -4889,6 +4904,19 @@ router
|
|||||||
data.eth_power = 16;
|
data.eth_power = 16;
|
||||||
data.eth_phy_addr = 1;
|
data.eth_phy_addr = 1;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
|
} else if (board_profile == 'E32V2') {
|
||||||
|
// BBQKees Gateway E32 V2
|
||||||
|
data.led_gpio = 2;
|
||||||
|
data.dallas_gpio = 14;
|
||||||
|
data.rx_gpio = 4;
|
||||||
|
data.tx_gpio = 5;
|
||||||
|
data.pbutton_gpio = 34;
|
||||||
|
data.phy_type = 1;
|
||||||
|
data.eth_power = 15;
|
||||||
|
data.eth_phy_addr = 0;
|
||||||
|
data.eth_clock_mode = 1;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'MH-ET') {
|
} else if (board_profile == 'MH-ET') {
|
||||||
// MH-ET Live D1 Mini
|
// MH-ET Live D1 Mini
|
||||||
data.led_gpio = 2;
|
data.led_gpio = 2;
|
||||||
@@ -4900,6 +4928,7 @@ router
|
|||||||
data.eth_power = 0;
|
data.eth_power = 0;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'NODEMCU') {
|
} else if (board_profile == 'NODEMCU') {
|
||||||
// NodeMCU 32S
|
// NodeMCU 32S
|
||||||
data.led_gpio = 2;
|
data.led_gpio = 2;
|
||||||
@@ -4911,6 +4940,7 @@ router
|
|||||||
data.eth_power = 0;
|
data.eth_power = 0;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'LOLIN') {
|
} else if (board_profile == 'LOLIN') {
|
||||||
// Lolin D32
|
// Lolin D32
|
||||||
data.led_gpio = 2;
|
data.led_gpio = 2;
|
||||||
@@ -4922,6 +4952,7 @@ router
|
|||||||
data.eth_power = 0;
|
data.eth_power = 0;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'OLIMEX') {
|
} else if (board_profile == 'OLIMEX') {
|
||||||
// Olimex ESP32-EVB (uses U1TXD/U1RXD/BUTTON, no LED or Dallas)
|
// Olimex ESP32-EVB (uses U1TXD/U1RXD/BUTTON, no LED or Dallas)
|
||||||
data.led_gpio = 0;
|
data.led_gpio = 0;
|
||||||
@@ -4933,6 +4964,7 @@ router
|
|||||||
data.eth_power = -1;
|
data.eth_power = -1;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'OLIMEXPOE') {
|
} else if (board_profile == 'OLIMEXPOE') {
|
||||||
// Olimex ESP32-POE
|
// Olimex ESP32-POE
|
||||||
data.led_gpio = 0;
|
data.led_gpio = 0;
|
||||||
@@ -4944,6 +4976,7 @@ router
|
|||||||
data.eth_power = 12;
|
data.eth_power = 12;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 3;
|
data.eth_clock_mode = 3;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'C3MINI') {
|
} else if (board_profile == 'C3MINI') {
|
||||||
// Lolin C3 mini
|
// Lolin C3 mini
|
||||||
data.led_gpio = 7;
|
data.led_gpio = 7;
|
||||||
@@ -4955,6 +4988,7 @@ router
|
|||||||
data.eth_power = 0;
|
data.eth_power = 0;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'S2MINI') {
|
} else if (board_profile == 'S2MINI') {
|
||||||
// Lolin C3 mini
|
// Lolin C3 mini
|
||||||
data.led_gpio = 15;
|
data.led_gpio = 15;
|
||||||
@@ -4966,6 +5000,7 @@ router
|
|||||||
data.eth_power = 0;
|
data.eth_power = 0;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
} else if (board_profile == 'S3MINI') {
|
} else if (board_profile == 'S3MINI') {
|
||||||
// Liligo S3 mini
|
// Liligo S3 mini
|
||||||
data.led_gpio = 17;
|
data.led_gpio = 17;
|
||||||
@@ -4977,6 +5012,7 @@ router
|
|||||||
data.eth_power = 0;
|
data.eth_power = 0;
|
||||||
data.eth_phy_addr = 0;
|
data.eth_phy_addr = 0;
|
||||||
data.eth_clock_mode = 0;
|
data.eth_clock_mode = 0;
|
||||||
|
data.led_type = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
data.board_profile =
|
data.board_profile =
|
||||||
|
|||||||
@@ -1821,7 +1821,7 @@ bool System::command_test(const char * value, const int8_t id) {
|
|||||||
// takes a board profile and populates a data array with GPIO configurations
|
// takes a board profile and populates a data array with GPIO configurations
|
||||||
// returns false if profile is unknown
|
// returns false if profile is unknown
|
||||||
//
|
//
|
||||||
// data = led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode
|
// data = led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode, led_type
|
||||||
//
|
//
|
||||||
// clock modes:
|
// clock modes:
|
||||||
// 0 = RMII clock input to GPIO0
|
// 0 = RMII clock input to GPIO0
|
||||||
|
|||||||
Reference in New Issue
Block a user