andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-10 01:39:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2238 from proddy/dev

Browse Source 
comment cleanup
This commit is contained in:
Proddy
2024-11-22 11:08:37 +01:00
committed by GitHub
parent 3752247d1c c80ec368a9
commit 3680fad909
13 changed files with 605 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

582
interface/.yarn/releases/yarn-4.5.1.cjs → interface/.yarn/releases/yarn-4.5.2.cjs vendored
View File

File diff suppressed because one or more lines are too long

2
interface/.yarnrc.yml
View File

@@ -1,3 +1,3 @@
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.5.1.cjs yarnPath: .yarn/releases/yarn-4.5.2.cjs

4
interface/package.json
View File

@@ -31,7 +31,7 @@
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
"jwt-decode": "^4.0.0", "jwt-decode": "^4.0.0",
"mime-types": "^2.1.35", "mime-types": "^2.1.35",
"preact": "^10.24.3", "preact": "^10.25.0",
"react": "^18.3.1", "react": "^18.3.1",
"react-dom": "^18.3.1", "react-dom": "^18.3.1",
"react-icons": "^5.3.0", "react-icons": "^5.3.0",
@@ -63,5 +63,5 @@
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.3" "vite-tsconfig-paths": "^5.1.3"
}, },
"packageManager": "yarn@4.5.1" "packageManager": "yarn@4.5.2"
} }

7
interface/src/app/settings/Version.tsx
View File

@@ -153,7 +153,12 @@ const Version = () => {
onClick={() => setOpenDialog(false)} onClick={() => setOpenDialog(false)}
color="primary" color="primary"
> >
<Link underline="none" target="_blank" href={getBinURL(useDev)} color="primary"> <Link
underline="none"
target="_blank"
href={getBinURL(useDev)}
color="primary"
>
{LL.DOWNLOAD(1)} {LL.DOWNLOAD(1)}
</Link> </Link>
</Button> </Button>

2
interface/src/components/routing/RouterTabs.tsx
View File

@@ -16,7 +16,7 @@ const RouterTabs: FC<RouterTabsProps> = ({ value, children }) => {
const smallDown = useMediaQuery(theme.breakpoints.down('sm')); const smallDown = useMediaQuery(theme.breakpoints.down('sm'));
const handleTabChange = (_event: unknown, path: string) => { const handleTabChange = (_event: unknown, path: string) => {
navigate(path); void navigate(path);
}; };
return ( return (

10
interface/yarn.lock
View File

@@ -1721,7 +1721,7 @@ __metadata:
formidable: "npm:^3.5.2" formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0" jwt-decode: "npm:^4.0.0"
mime-types: "npm:^2.1.35" mime-types: "npm:^2.1.35"
preact: "npm:^10.24.3" preact: "npm:^10.25.0"
prettier: "npm:^3.3.3" prettier: "npm:^3.3.3"
react: "npm:^18.3.1" react: "npm:^18.3.1"
react-dom: "npm:^18.3.1" react-dom: "npm:^18.3.1"
@@ -5635,10 +5635,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"preact@npm:^10.24.3": "preact@npm:^10.25.0":
version: 10.24.3 version: 10.25.0
resolution: "preact@npm:10.24.3" resolution: "preact@npm:10.25.0"
checksum: 10c0/c863df6d7be6a660480189762d8a8f2d4148733fc2bb9efbd9d2fd27315d2c7ede850a16077d716c91666c915c0349bd3c9699733e4f08457226a0519f408761 checksum: 10c0/703e021e7a268aea929e9c896484608e18dd9f5aa62c71d3205fedf69269d9592e4cfe17adda78ca4cec1f5f0057a062300daeeb477333ba2005a4d9e3fbc970
languageName: node languageName: node
linkType: hard linkType: hard

582
mock-api/.yarn/releases/yarn-4.5.1.cjs → mock-api/.yarn/releases/yarn-4.5.2.cjs vendored
View File

File diff suppressed because one or more lines are too long

2
mock-api/.yarnrc.yml
View File

@@ -1,3 +1,3 @@
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.5.1.cjs yarnPath: .yarn/releases/yarn-4.5.2.cjs

2
mock-api/package.json
View File

@@ -15,5 +15,5 @@
"itty-router": "^5.0.18", "itty-router": "^5.0.18",
"prettier": "^3.3.3" "prettier": "^3.3.3"
}, },
"packageManager": "yarn@4.5.1" "packageManager": "yarn@4.5.2"
} }

2
scripts/generate-modbus-register-doc.py
View File

@@ -104,7 +104,7 @@ print("# Entity/Register Mapping")
print() print()
print("!!! note") print("!!! note")
print() print()
print(" This file has been auto-generated. Do not edit.") print(" This file has been auto-generated. Do not modify.")
print() print()
for device_type, devices in grouped_by(entities, device_type_key): for device_type, devices in grouped_by(entities, device_type_key):

6
scripts/generate_csv_and_headers.sh
View File

@@ -2,9 +2,7 @@
# #
# Builds the dump CSV files, modbus headers and documentation. # Builds the dump CSV files, modbus headers and documentation.
# To be run before a release with # Called by /scripts/generate_csv_and_headers.sh
# sh ./scripts/generate_csv_and_headers.sh
#
# build dummy modbus_entity_parameters.hpp so it compiles # build dummy modbus_entity_parameters.hpp so it compiles
cat >./src/modbus_entity_parameters.hpp <<EOL cat >./src/modbus_entity_parameters.hpp <<EOL
@@ -12,7 +10,7 @@ cat >./src/modbus_entity_parameters.hpp <<EOL
#include "emsdevice.h" #include "emsdevice.h"
/* /*
* This file is auto-generated by the update_modbus_registers.sh script. Do not modify. * This file is auto-generated. Do not modify.
*/ */
// clang-format off // clang-format off

10
scripts/update_modbus_registers.py
View File

@@ -1,13 +1,7 @@
# #
# Update modbus parameters from entity definitions. # Update modbus parameters from entity definitions.
# This script generates c++ code for the modbus parameter definitions. # This script generates c++ code for the modbus parameter definitions.
# # Called by /scripts/generate_csv_and_headers.sh
# Usage:
# - first, dump all entities to csv by running 'sh ./scripts/dump_entities.sh'
# - then run 'cat ../dump_entities.csv | python3 update_modbus_registers.py > ../src/modbus_entity_parameters.hpp'
# from the "scripts" folder
# OR
# run `sh ./scripts/update_modbus_registers.sh` from the root folder
import fileinput import fileinput
import csv import csv
@@ -118,7 +112,7 @@ cpp_file_template = Template('''#include "modbus.h"
#include "emsdevice.h" #include "emsdevice.h"
/* /*
* This file is auto-generated by the update_modbus_registers.sh script. Do not modify. * This file is auto-generated. Do not modify.
*/ */
// clang-format off // clang-format off

2
src/modbus_entity_parameters.hpp
View File

@@ -2,7 +2,7 @@
#include "emsdevice.h" #include "emsdevice.h"
/* /*
* This file is auto-generated by the update_modbus_registers.sh script. Do not modify. * This file is auto-generated. Do not modify.
*/ */
// clang-format off // clang-format off