Merge pull request #1814 from proddy/dev

minor cleanup, fix codacy
2025-12-07 08:19:52 +03:00 · 2024-06-21 13:52:32 +01:00
parent 345c7378ad ddbd9dab79
commit 4b3d801312
8 changed files with 25 additions and 33 deletions
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![release-date](https://img.shields.io/github/release-date/emsesp/EMS-ESP32.svg?label=Released)](https://github.com/emsesp/EMS-ESP32/commits/main)
 [![license](https://img.shields.io/github/license/emsesp/EMS-ESP32.svg)](LICENSE)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=emsesp_EMS-ESP32&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=emsesp_EMS-ESP32)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9441142f49424ef891e8f5251866ee6b)](https://www.codacy.com/gh/emsesp/EMS-ESP32/dashboard?utm_source=github.com&utm_medium=referral&utm_content=emsesp/EMS-ESP32&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9441142f49424ef891e8f5251866ee6b)](https://app.codacy.com/gh/emsesp/EMS-ESP32/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![downloads](https://img.shields.io/github/downloads/emsesp/EMS-ESP32/total.svg)](https://github.com/emsesp/EMS-ESP32/releases)
 [![chat](https://img.shields.io/discord/816637840644505620.svg?style=flat-square&color=blueviolet)](https://discord.gg/3J3GgnzpyT)

@@ -59,14 +59,14 @@ This program is licensed under GPL-3.0

 |                                    |                                  |
 | ---------------------------------- | -------------------------------- |
-| <img src="media/web_settings.png"> | <img src="media/web_status.png"> |
-| <img src="media/web_devices.png">  | <img src="media/web_mqtt.png">   |
-| <img src="media/web_edit.png">     | <img src="media/web_log.png">    |
+| ![Web Settings](media/web_settings.png) | ![Web Status](media/web_status.png) |
+| ![Web Devices](media/web_devices.png)  | ![Web MQTT](media/web_mqtt.png)   |
+| ![Web Edit](media/web_edit.png)     | ![Web Log](media/web_log.png)    |

 ### Telnet Console

-<img src="media/console0.png" width=80% height=80%>
+![Console](media/console0.png)

 ### In Home Assistant

-<img src="media/ha_lovelace.png" width=80% height=80%>
+![Home Assistant](media/ha_lovelace.png)
--- a/interface/package.json
+++ b/interface/package.json
@@ -30,7 +30,7 @@
    "@mui/material": "^5.15.20",
    "@table-library/react-table-library": "4.1.7",
    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.14.6",
+    "@types/node": "^20.14.7",
    "@types/react": "^18.3.3",
    "@types/react-dom": "^18.3.0",
    "@types/react-router-dom": "^5.3.3",
@@ -47,7 +47,7 @@
    "react-router-dom": "^6.23.1",
    "react-toastify": "^10.0.5",
    "typesafe-i18n": "^5.26.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
  },
  "devDependencies": {
    "@babel/core": "^7.24.7",
--- a/interface/src/project/ApplicationSettings.tsx
+++ b/interface/src/project/ApplicationSettings.tsx
@@ -590,7 +590,7 @@ const ApplicationSettings: FC = () => {
              <ValidatedTextField
                fieldErrors={fieldErrors}
                name="shower_min_duration"
-                  label={LL.MIN_DURATION()}
+                label={LL.MIN_DURATION()}
                InputProps={{
                  endAdornment: (
                    <InputAdornment position="end">{LL.SECONDS()}</InputAdornment>
--- a/interface/src/project/ModulesDialog.tsx
+++ b/interface/src/project/ModulesDialog.tsx
@@ -76,7 +76,6 @@ const ModulesDialog = ({
            label="License Key"
            multiline
            rows={6}
-            columns={40}
            fullWidth
            value={editItem.license}
            onChange={updateFormValue}
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -1760,12 +1760,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/node@npm:^20.14.6":
-  version: 20.14.6
-  resolution: "@types/node@npm:20.14.6"
+"@types/node@npm:^20.14.7":
+  version: 20.14.7
+  resolution: "@types/node@npm:20.14.7"
  dependencies:
    undici-types: "npm:~5.26.4"
-  checksum: 10c0/22640f0eb2a955872e4529a93be1b719f67b527b80fdab51419756d20e21b5ce0f4ccbee9a3e2ff20e5def647f77baf77b4b0434ff8896791c102165ec0c3e48
+  checksum: 10c0/6211ffe86f769a58617e3bdca58610256021ef54bd99d2c442ee6109196cd6ee8e0bcd1cfac0e39bf4bb353f8900fa5fae540485a03816bd91ad1f86a0e18512
  languageName: node
  linkType: hard

@@ -1996,7 +1996,7 @@ __metadata:
    "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0"
    "@types/babel__core": "npm:^7"
    "@types/lodash-es": "npm:^4.17.12"
-    "@types/node": "npm:^20.14.6"
+    "@types/node": "npm:^20.14.7"
    "@types/react": "npm:^18.3.3"
    "@types/react-dom": "npm:^18.3.0"
    "@types/react-router-dom": "npm:^5.3.3"
@@ -2020,7 +2020,7 @@ __metadata:
    rollup-plugin-visualizer: "npm:^5.12.0"
    terser: "npm:^5.31.1"
    typesafe-i18n: "npm:^5.26.2"
-    typescript: "npm:^5.4.5"
+    typescript: "npm:^5.5.2"
    typescript-eslint: "npm:^7.13.1"
    vite: "npm:^5.3.1"
    vite-plugin-imagemin: "npm:^0.6.1"
@@ -7155,23 +7155,23 @@ __metadata:
  languageName: node
  linkType: hard

-"typescript@npm:^5.4.5":
-  version: 5.4.5
-  resolution: "typescript@npm:5.4.5"
+"typescript@npm:^5.5.2":
+  version: 5.5.2
+  resolution: "typescript@npm:5.5.2"
  bin:
    tsc: bin/tsc
    tsserver: bin/tsserver
-  checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e
+  checksum: 10c0/8ca39b27b5f9bd7f32db795045933ab5247897660627251e8254180b792a395bf061ea7231947d5d7ffa5cb4cc771970fd4ef543275f9b559f08c9325cccfce3
  languageName: node
  linkType: hard

-"typescript@patch:typescript@npm%3A^5.4.5#optional!builtin<compat/typescript>":
-  version: 5.4.5
-  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
+"typescript@patch:typescript@npm%3A^5.5.2#optional!builtin<compat/typescript>":
+  version: 5.5.2
+  resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin<compat/typescript>::version=5.5.2&hash=b45daf"
  bin:
    tsc: bin/tsc
    tsserver: bin/tsserver
-  checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9
+  checksum: 10c0/6721ac8933a70c252d7b640b345792e103d881811ff660355617c1836526dbb71c2044e2e77a8823fb3570b469f33276875a4cab6d3c4de4ae7d7ee1c3074ae4
  languageName: node
  linkType: hard

--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,8 +3,6 @@ sonar.projectKey=emsesp_EMS-ESP32
 sonar.projectName=EMS-ESP32
 sonar.projectVersion=3.7.0
 sonar.sources=./src
-# sonar.cfamily.build-wrapper-output=bw-output
 sonar.cfamily.compile-commands=compile_commands.json
 sonar.sourceEncoding=UTF-8
 sonar.host.url=https://sonarcloud.io
-# sonar.cfamily.threads=4
--- a/src/devices/solar.cpp
+++ b/src/devices/solar.cpp
@@ -113,12 +113,7 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const c
                              FL_(maxFlow),
                              DeviceValueUOM::LMIN,
                              MAKE_CF_CB(set_SM10MaxFlow));
-        register_device_value(DeviceValueTAG::TAG_DHW1,
-                              &wwMinTemp_,
-                              DeviceValueType::UINT8,
-                              FL_(wwMinTemp),
-                              DeviceValueUOM::DEGREES,
-                              MAKE_CF_CB(set_wwMinTemp));
+        register_device_value(DeviceValueTAG::TAG_DHW1, &wwMinTemp_, DeviceValueType::UINT8, FL_(wwMinTemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_wwMinTemp));
        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
                              &solarIsEnabled_,
                              DeviceValueType::BOOL,
--- a/src/system.h
+++ b/src/system.h
@@ -61,7 +61,7 @@ class System {
    static bool command_commands(const char * value, const int8_t id, JsonObject output);
    static bool command_response(const char * value, const int8_t id, JsonObject output);
    static bool command_allvalues(const char * value, const int8_t id, JsonObject output);
-    static bool get_value_info(JsonObject root, const char *cmd);
+    static bool get_value_info(JsonObject root, const char * cmd);

 #if defined(EMSESP_TEST)
    static bool command_test(const char * value, const int8_t id);