Skip to content

Commit

Permalink
Merge pull request #2208 from proddy/dev
Browse files Browse the repository at this point in the history 
Wifi Reconnect #2207
  • Loading branch information
@proddy
proddy authored Nov 16, 2024
2 parents 402f560 + c628b4b commit da77d52
Show file tree
Hide file tree
Showing 27 changed files with 1,833 additions and 1,778 deletions.
1,511 changes: 757 additions & 754 deletions docs/Modbus-Entity-Registers.md
View file

Large diffs are not rendered by default.

1,511 changes: 757 additions & 754 deletions docs/dump_entities.csv
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions interface/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"devDependencies": {
"@babel/core": "^7.26.0",
"@eslint/js": "^9.14.0",
"@eslint/js": "^9.15.0",
"@preact/compat": "^18.3.1",
"@preact/preset-vite": "^2.9.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
Expand All @@ -52,7 +52,7 @@
"@types/react-dom": "^18.3.1",
"@types/react-router-dom": "^5.3.3",
"concurrently": "^9.1.0",
"eslint": "^9.14.0",
"eslint": "^9.15.0",
"eslint-config-prettier": "^9.1.0",
"formidable": "^3.5.2",
"prettier": "^3.3.3",
Expand Down
5 changes: 4 additions & 1 deletion interface/src/app/main/Dashboard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,10 @@ const Dashboard = () => {
{me.admin &&
di.dv?.c &&
!hasMask(di.dv.id, DeviceEntityMask.DV_READONLY) && (
<IconButton onClick={() => editDashboardValue(di)}>
<IconButton
size="small"
onClick={() => editDashboardValue(di)}
>
<EditIcon
color="primary"
sx={{ fontSize: 16 }}
Expand Down
2 changes: 1 addition & 1 deletion interface/src/app/main/Help.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const Help = () => {
const [customSupportHTML, setCustomSupportHTML] = useState<string | null>(null);
const [notFound, setNotFound] = useState<boolean>(false);

useRequest(() => callAction({ action: 'customSupport' })).onSuccess((event) => {
useRequest(() => callAction({ action: 'getCustomSupport' })).onSuccess((event) => {
if (event && event.data && Object.keys(event.data).length !== 0) {
const data = event.data.Support;
if (data.img_url) {
Expand Down
12 changes: 7 additions & 5 deletions interface/src/app/status/NetworkStatus.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,22 @@ const NetworkStatus = () => {

const networkStatus = ({ status }: NetworkStatusType) => {
switch (status) {
case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
return LL.CONNECTED(0) + ' (Ethernet)';
case NetworkConnectionStatus.WIFI_STATUS_NO_SHIELD:
return LL.INACTIVE(1);
case NetworkConnectionStatus.WIFI_STATUS_IDLE:
return LL.IDLE();
case NetworkConnectionStatus.WIFI_STATUS_NO_SSID_AVAIL:
return 'No SSID Available';
case NetworkConnectionStatus.WIFI_STATUS_CONNECTED:
return LL.CONNECTED(0) + ' (WiFi)';
case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
return LL.CONNECTED(0) + ' (Ethernet)';
return LL.CONNECTED(0) + ' (WiFi) (' + data.reconnect_count + ')';
case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
return LL.CONNECTED(1) + ' ' + LL.FAILED(0);
return (
LL.CONNECTED(1) + ' ' + LL.FAILED(0) + ' (' + data.reconnect_count + ')'
);
case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
return LL.CONNECTED(1) + ' ' + LL.LOST();
return LL.CONNECTED(1) + ' ' + LL.LOST() + ' (' + data.reconnect_count + ')';
case NetworkConnectionStatus.WIFI_STATUS_DISCONNECTED:
return LL.DISCONNECTED();
default:
Expand Down
1 change: 1 addition & 0 deletions interface/src/types/network.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export interface NetworkStatusType {
dns_ip_1: string;
dns_ip_2: string;
hostname: string;
reconnect_count: number;
}

export interface NetworkSettingsType {
Expand Down
95 changes: 49 additions & 46 deletions interface/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,27 +678,27 @@ __metadata:
languageName: node
linkType: hard

"@eslint/config-array@npm:^0.18.0":
version: 0.18.0
resolution: "@eslint/config-array@npm:0.18.0"
"@eslint/config-array@npm:^0.19.0":
version: 0.19.0
resolution: "@eslint/config-array@npm:0.19.0"
dependencies:
"@eslint/object-schema": "npm:^2.1.4"
debug: "npm:^4.3.1"
minimatch: "npm:^3.1.2"
checksum: 10c0/0234aeb3e6b052ad2402a647d0b4f8a6aa71524bafe1adad0b8db1dfe94d7f5f26d67c80f79bb37ac61361a1d4b14bb8fb475efe501de37263cf55eabb79868f
checksum: 10c0/def23c6c67a8f98dc88f1b87e17a5668e5028f5ab9459661aabfe08e08f2acd557474bbaf9ba227be0921ae4db232c62773dbb7739815f8415678eb8f592dbf5
languageName: node
linkType: hard

"@eslint/core@npm:^0.7.0":
version: 0.7.0
resolution: "@eslint/core@npm:0.7.0"
checksum: 10c0/3cdee8bc6cbb96ac6103d3ead42e59830019435839583c9eb352b94ed558bd78e7ffad5286dc710df21ec1e7bd8f52aa6574c62457a4dd0f01f3736fa4a7d87a
"@eslint/core@npm:^0.9.0":
version: 0.9.0
resolution: "@eslint/core@npm:0.9.0"
checksum: 10c0/6d8e8e0991cef12314c49425d8d2d9394f5fb1a36753ff82df7c03185a4646cb7c8736cf26638a4a714782cedf4b23cfc17667d282d3e5965b3920a0e7ce20d4
languageName: node
linkType: hard

"@eslint/eslintrc@npm:^3.1.0":
version: 3.1.0
resolution: "@eslint/eslintrc@npm:3.1.0"
"@eslint/eslintrc@npm:^3.2.0":
version: 3.2.0
resolution: "@eslint/eslintrc@npm:3.2.0"
dependencies:
ajv: "npm:^6.12.4"
debug: "npm:^4.3.2"
Expand All @@ -709,14 +709,14 @@ __metadata:
js-yaml: "npm:^4.1.0"
minimatch: "npm:^3.1.2"
strip-json-comments: "npm:^3.1.1"
checksum: 10c0/5b7332ed781edcfc98caa8dedbbb843abfb9bda2e86538529c843473f580e40c69eb894410eddc6702f487e9ee8f8cfa8df83213d43a8fdb549f23ce06699167
checksum: 10c0/43867a07ff9884d895d9855edba41acf325ef7664a8df41d957135a81a477ff4df4196f5f74dc3382627e5cc8b7ad6b815c2cea1b58f04a75aced7c43414ab8b
languageName: node
linkType: hard

"@eslint/js@npm:9.14.0, @eslint/js@npm:^9.14.0":
version: 9.14.0
resolution: "@eslint/js@npm:9.14.0"
checksum: 10c0/a423dd435e10aa3b461599aa02f6cbadd4b5128cb122467ee4e2c798e7ca4f9bb1fce4dcea003b29b983090238cf120899c1af657cf86300b399e4f996b83ddc
"@eslint/js@npm:9.15.0, @eslint/js@npm:^9.15.0":
version: 9.15.0
resolution: "@eslint/js@npm:9.15.0"
checksum: 10c0/56552966ab1aa95332f70d0e006db5746b511c5f8b5e0c6a9b2d6764ff6d964e0b2622731877cbc4e3f0e74c5b39191290d5f48147be19175292575130d499ab
languageName: node
linkType: hard

Expand All @@ -727,12 +727,12 @@ __metadata:
languageName: node
linkType: hard

"@eslint/plugin-kit@npm:^0.2.0":
version: 0.2.1
resolution: "@eslint/plugin-kit@npm:0.2.1"
"@eslint/plugin-kit@npm:^0.2.3":
version: 0.2.3
resolution: "@eslint/plugin-kit@npm:0.2.3"
dependencies:
levn: "npm:^0.4.1"
checksum: 10c0/34b1ecb35df97b0adeb6a43366fc1b8aa1a54d23fc9753019277e80a7295724fddb547a795fd59c9eb56d690bbf0d76d7f2286cb0f5db367a86a763d5acbde5f
checksum: 10c0/89a8035976bb1780e3fa8ffe682df013bd25f7d102d991cecd3b7c297f4ce8c1a1b6805e76dd16465b5353455b670b545eff2b4ec3133e0eab81a5f9e99bd90f
languageName: node
linkType: hard

Expand Down Expand Up @@ -767,10 +767,10 @@ __metadata:
languageName: node
linkType: hard

"@humanwhocodes/retry@npm:^0.4.0":
version: 0.4.0
resolution: "@humanwhocodes/retry@npm:0.4.0"
checksum: 10c0/28dcf1ed70b28ae8bc07b268c457a02f6b53fe4591b73e31f6735e7673dfd9e662f24a69e065aada1a64311bf5692d93d4ef35aba849314e8a87a870ba3b47aa
"@humanwhocodes/retry@npm:^0.4.1":
version: 0.4.1
resolution: "@humanwhocodes/retry@npm:0.4.1"
checksum: 10c0/be7bb6841c4c01d0b767d9bb1ec1c9359ee61421ce8ba66c249d035c5acdfd080f32d55a5c9e859cdd7868788b8935774f65b2caf24ec0b7bd7bf333791f063b
languageName: node
linkType: hard

Expand Down Expand Up @@ -1663,7 +1663,7 @@ __metadata:
"@babel/core": "npm:^7.26.0"
"@emotion/react": "npm:^11.13.3"
"@emotion/styled": "npm:^11.13.0"
"@eslint/js": "npm:^9.14.0"
"@eslint/js": "npm:^9.15.0"
"@mui/icons-material": "npm:^6.1.7"
"@mui/material": "npm:^6.1.7"
"@preact/compat": "npm:^18.3.1"
Expand All @@ -1678,7 +1678,7 @@ __metadata:
alova: "npm:3.2.3"
async-validator: "npm:^4.2.5"
concurrently: "npm:^9.1.0"
eslint: "npm:^9.14.0"
eslint: "npm:^9.15.0"
eslint-config-prettier: "npm:^9.1.0"
formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0"
Expand Down Expand Up @@ -2358,7 +2358,7 @@ __metadata:
languageName: node
linkType: hard

"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.3":
version: 7.0.3
resolution: "cross-spawn@npm:7.0.3"
dependencies:
Expand All @@ -2369,6 +2369,17 @@ __metadata:
languageName: node
linkType: hard

"cross-spawn@npm:^7.0.5":
version: 7.0.5
resolution: "cross-spawn@npm:7.0.5"
dependencies:
path-key: "npm:^3.1.0"
shebang-command: "npm:^2.0.0"
which: "npm:^2.0.1"
checksum: 10c0/aa82ce7ac0814a27e6f2b738c5a7cf1fa21a3558a1e42df449fc96541ba3ba731e4d3ecffa4435348808a86212f287c6f20a1ee551ef1ff95d01cfec5f434944
languageName: node
linkType: hard

"css-select@npm:^4.1.3":
version: 4.3.0
resolution: "css-select@npm:4.3.0"
Expand Down Expand Up @@ -3145,25 +3156,25 @@ __metadata:
languageName: node
linkType: hard

"eslint@npm:^9.14.0":
version: 9.14.0
resolution: "eslint@npm:9.14.0"
"eslint@npm:^9.15.0":
version: 9.15.0
resolution: "eslint@npm:9.15.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.2.0"
"@eslint-community/regexpp": "npm:^4.12.1"
"@eslint/config-array": "npm:^0.18.0"
"@eslint/core": "npm:^0.7.0"
"@eslint/eslintrc": "npm:^3.1.0"
"@eslint/js": "npm:9.14.0"
"@eslint/plugin-kit": "npm:^0.2.0"
"@eslint/config-array": "npm:^0.19.0"
"@eslint/core": "npm:^0.9.0"
"@eslint/eslintrc": "npm:^3.2.0"
"@eslint/js": "npm:9.15.0"
"@eslint/plugin-kit": "npm:^0.2.3"
"@humanfs/node": "npm:^0.16.6"
"@humanwhocodes/module-importer": "npm:^1.0.1"
"@humanwhocodes/retry": "npm:^0.4.0"
"@humanwhocodes/retry": "npm:^0.4.1"
"@types/estree": "npm:^1.0.6"
"@types/json-schema": "npm:^7.0.15"
ajv: "npm:^6.12.4"
chalk: "npm:^4.0.0"
cross-spawn: "npm:^7.0.2"
cross-spawn: "npm:^7.0.5"
debug: "npm:^4.3.2"
escape-string-regexp: "npm:^4.0.0"
eslint-scope: "npm:^8.2.0"
Expand All @@ -3183,15 +3194,14 @@ __metadata:
minimatch: "npm:^3.1.2"
natural-compare: "npm:^1.4.0"
optionator: "npm:^0.9.3"
text-table: "npm:^0.2.0"
peerDependencies:
jiti: "*"
peerDependenciesMeta:
jiti:
optional: true
bin:
eslint: bin/eslint.js
checksum: 10c0/e1cbf571b75519ad0b24c27e66a6575e57cab2671ef5296e7b345d9ac3adc1a549118dcc74a05b651a7a13a5e61ebb680be6a3e04a80e1f22eba1931921b5187
checksum: 10c0/d0d7606f36bfcccb1c3703d0a24df32067b207a616f17efe5fb1765a91d13f085afffc4fc97ecde4ab9c9f4edd64d9b4ce750e13ff7937a25074b24bee15b20f
languageName: node
linkType: hard

Expand Down Expand Up @@ -6636,13 +6646,6 @@ __metadata:
languageName: node
linkType: hard

"text-table@npm:^0.2.0":
version: 0.2.0
resolution: "text-table@npm:0.2.0"
checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c
languageName: node
linkType: hard

"through@npm:^2.3.8":
version: 2.3.8
resolution: "through@npm:2.3.8"
Expand Down
Loading

0 comments on commit da77d52

Please sign in to comment.