Merge pull request #1177 from proddy/dev

formatting

interface/package.json

@@ -25,7 +25,7 @@
     "@mui/material": "^5.13.2",
     "@table-library/react-table-library": "4.1.4",
     "@types/lodash-es": "^4.17.7",
-    "@types/node": "^20.2.3",
+    "@types/node": "^20.2.5",
     "@types/react": "^18.2.7",
     "@types/react-dom": "^18.2.4",
     "@types/react-router-dom": "^5.3.3",
@@ -64,7 +64,7 @@
     "prettier": "^2.8.8",
     "rollup-plugin-visualizer": "^5.9.0",
     "terser": "^5.17.6",
-    "vite": "^4.3.8",
+    "vite": "^4.3.9",
     "vite-plugin-svgr": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.0"
   },

interface/yarn.lock

@@ -1281,10 +1281,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^20.2.3":
-  version: 20.2.3
-  resolution: "@types/node@npm:20.2.3"
-  checksum: de79ce435f28354dd80f1203db2a5a0606543964400738007fe653d6248a75a9bbec7e7d9b350c475f3b0de514f4d2adbd642abe14f4a6dd40de92c0b8533b5e
+"@types/node@npm:^20.2.5":
+  version: 20.2.5
+  resolution: "@types/node@npm:20.2.5"
+  checksum: 1c3db8a4ceb5e5d12e7cb140e37c14a16ce013084c6d65579b91cefbe0ecaca57d85093d968172b11c3d1d95bcbc5d972b08aa3dc3935206fb39bc6c10751102
   languageName: node
   linkType: hard
 
@@ -1528,7 +1528,7 @@ __metadata:
     "@mui/material": ^5.13.2
     "@table-library/react-table-library": 4.1.4
     "@types/lodash-es": ^4.17.7
-    "@types/node": ^20.2.3
+    "@types/node": ^20.2.5
     "@types/react": ^18.2.7
     "@types/react-dom": ^18.2.4
     "@types/react-router-dom": ^5.3.3
@@ -1565,7 +1565,7 @@ __metadata:
     terser: ^5.17.6
     typesafe-i18n: ^5.24.3
     typescript: ^5.0.4
-    vite: ^4.3.8
+    vite: ^4.3.9
     vite-plugin-svgr: ^3.2.0
     vite-tsconfig-paths: ^4.2.0
   languageName: unknown
@@ -5793,9 +5793,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^4.3.8":
-  version: 4.3.8
-  resolution: "vite@npm:4.3.8"
+"vite@npm:^4.3.9":
+  version: 4.3.9
+  resolution: "vite@npm:4.3.9"
   dependencies:
     esbuild: ^0.17.5
     fsevents: ~2.3.2
@@ -5826,7 +5826,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 7eb7e28b8485ee30ceb2a758ad816d741d21a0e377ca7cc98d1db0a8686076e6bf3e620767afe4d9c497fc4d5fa1fe5f95a422c24c61fd92ac5368a78af43b31
+  checksum: 9eb1c99f16992e1b29e3eea76df312983f2e59915c369fede0f1e6716b80827857f88cfc75092aac807d20c73033c65be82a315a14ab312a52d22a9bdad1ca82
   languageName: node
   linkType: hard
 

scripts/build_interface.py

@@ -57,8 +57,5 @@ def buildWeb():
     finally:
         os.chdir("..")
 
-
-if (len(BUILD_TARGETS) == 0 or "upload" in BUILD_TARGETS):
+if not (env.IsCleanTarget()):
     buildWeb()
-else:
-    print("Skipping build web interface for target(s): " + ", ".join(BUILD_TARGETS))

src/console.cpp

@@ -43,7 +43,8 @@ static inline EMSESP & to_app(Shell & shell) {
 }
 
 #define NO_ARGUMENTS                                                                                                                                           \
-    std::vector<std::string> {}
+    std::vector<std::string> {                                                                                                                                 \
+    }
 
 // add static functions here....
 

src/devices/heatsource.cpp

@@ -24,7 +24,6 @@ REGISTER_FACTORY(Heatsource, EMSdevice::DeviceType::HEATSOURCE);
 
 Heatsource::Heatsource(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand)
     : EMSdevice(device_type, device_id, product_id, version, name, flags, brand) {
-
     // AM200 alternative heatsource
     if (device_id == EMSdevice::EMS_DEVICE_ID_BOILER || (device_id >= EMSdevice::EMS_DEVICE_ID_AHS1 && device_id < EMSdevice::EMS_DEVICE_ID_HS1)) {
         uint8_t tag = device_id == EMSdevice::EMS_DEVICE_ID_BOILER

src/system.cpp

@@ -658,9 +658,7 @@ void System::network_init(bool refresh) {
     last_system_check_ = 0; // force the LED to go from fast flash to pulse
 
     bool disableEth;
-    EMSESP::esp8266React.getNetworkSettingsService()->read([&](NetworkSettings & settings) {
-        disableEth = settings.ssid.length() > 0;
-    });
+    EMSESP::esp8266React.getNetworkSettingsService()->read([&](NetworkSettings & settings) { disableEth = settings.ssid.length() > 0; });
 
     // no ethernet present or disabled
     if (phy_type_ == PHY_type::PHY_TYPE_NONE || disableEth) {