Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

comment cleanup #2238

Merged
merged 4 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion interface/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.2.cjs
4 changes: 2 additions & 2 deletions interface/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"async-validator": "^4.2.5",
"jwt-decode": "^4.0.0",
"mime-types": "^2.1.35",
"preact": "^10.24.3",
"preact": "^10.25.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
Expand Down Expand Up @@ -63,5 +63,5 @@
"vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.3"
},
"packageManager": "[email protected].1"
"packageManager": "[email protected].2"
}
7 changes: 6 additions & 1 deletion interface/src/app/settings/Version.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,12 @@ const Version = () => {
onClick={() => setOpenDialog(false)}
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)}
</Link>
</Button>
Expand Down
2 changes: 1 addition & 1 deletion interface/src/components/routing/RouterTabs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const RouterTabs: FC<RouterTabsProps> = ({ value, children }) => {
const smallDown = useMediaQuery(theme.breakpoints.down('sm'));

const handleTabChange = (_event: unknown, path: string) => {
navigate(path);
void navigate(path);
};

return (
Expand Down
10 changes: 5 additions & 5 deletions interface/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1721,7 +1721,7 @@ __metadata:
formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0"
mime-types: "npm:^2.1.35"
preact: "npm:^10.24.3"
preact: "npm:^10.25.0"
prettier: "npm:^3.3.3"
react: "npm:^18.3.1"
react-dom: "npm:^18.3.1"
Expand Down Expand Up @@ -5635,10 +5635,10 @@ __metadata:
languageName: node
linkType: hard

"preact@npm:^10.24.3":
version: 10.24.3
resolution: "preact@npm:10.24.3"
checksum: 10c0/c863df6d7be6a660480189762d8a8f2d4148733fc2bb9efbd9d2fd27315d2c7ede850a16077d716c91666c915c0349bd3c9699733e4f08457226a0519f408761
"preact@npm:^10.25.0":
version: 10.25.0
resolution: "preact@npm:10.25.0"
checksum: 10c0/703e021e7a268aea929e9c896484608e18dd9f5aa62c71d3205fedf69269d9592e4cfe17adda78ca4cec1f5f0057a062300daeeb477333ba2005a4d9e3fbc970
languageName: node
linkType: hard

Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mock-api/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.2.cjs
2 changes: 1 addition & 1 deletion mock-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
"itty-router": "^5.0.18",
"prettier": "^3.3.3"
},
"packageManager": "[email protected].1"
"packageManager": "[email protected].2"
}
2 changes: 1 addition & 1 deletion scripts/generate-modbus-register-doc.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def printDeviceTypeDevices(device_type, devices):
print()
print("!!! note")
print()
print(" This file has been auto-generated. Do not edit.")
print(" This file has been auto-generated. Do not modify.")
print()

for device_type, devices in grouped_by(entities, device_type_key):
Expand Down
6 changes: 2 additions & 4 deletions scripts/generate_csv_and_headers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@

#
# Builds the dump CSV files, modbus headers and documentation.
# To be run before a release with
# sh ./scripts/generate_csv_and_headers.sh
#
# Called by /scripts/generate_csv_and_headers.sh

# build dummy modbus_entity_parameters.hpp so it compiles
cat >./src/modbus_entity_parameters.hpp <<EOL
#include "modbus.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
Expand Down
10 changes: 2 additions & 8 deletions scripts/update_modbus_registers.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
#
# Update modbus parameters from entity definitions.
# This script generates c++ code for the modbus parameter definitions.
#
# 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
# Called by /scripts/generate_csv_and_headers.sh

import fileinput
import csv
Expand Down Expand Up @@ -118,7 +112,7 @@
#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
Expand Down
2 changes: 1 addition & 1 deletion src/modbus_entity_parameters.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#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
Expand Down