Merge pull request #586 from proddy/dev

link to device entity details
2025-12-07 00:09:51 +03:00 · 2022-07-25 19:40:16 +02:00
parent d0bcbb8d1b a3a29132ab
commit beae2a2587
11 changed files with 93 additions and 94 deletions
--- a/interface/package-lock.json
+++ b/interface/package-lock.json
@@ -12,10 +12,10 @@
        "@emotion/styled": "^11.9.3",
        "@msgpack/msgpack": "^2.7.2",
        "@mui/icons-material": "^5.8.4",
-        "@mui/material": "^5.9.1",
+        "@mui/material": "^5.9.2",
        "@table-library/react-table-library": "4.0.10",
        "@types/lodash": "^4.14.182",
-        "@types/node": "^18.0.6",
+        "@types/node": "^18.6.1",
        "@types/react": "^18.0.15",
        "@types/react-dom": "^18.0.6",
        "@types/react-router-dom": "^5.3.3",
@@ -3044,13 +3044,13 @@
      }
    },
    "node_modules/@mui/base": {
-      "version": "5.0.0-alpha.90",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.90.tgz",
-      "integrity": "sha512-hNKwzr+RkiuGsGrakz8Q2i5ezr4Dz4b4Qsdipt9SiMrhuFAra/i501VSaEIzwec9LC4G+vtW4fE7yJBB0XaAYw==",
+      "version": "5.0.0-alpha.91",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.91.tgz",
+      "integrity": "sha512-/W5amPDz+Lout4FtX5HOyx2Q+YL/EtZciFrx2DDRuUm4M/pWnjfDZAtM+0aqimEvuk3FU+/PuFc7IAyhCSX4Cg==",
      "dependencies": {
        "@babel/runtime": "^7.17.2",
        "@emotion/is-prop-valid": "^1.1.3",
-        "@mui/types": "^7.1.4",
+        "@mui/types": "^7.1.5",
        "@mui/utils": "^5.9.1",
        "@popperjs/core": "^2.11.5",
        "clsx": "^1.2.1",
@@ -3101,14 +3101,14 @@
      }
    },
    "node_modules/@mui/material": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.9.1.tgz",
-      "integrity": "sha512-c09SbaMm7Rl7Df9JRkXwPWNbnfrutmHERTJC46OJ9OMAM9+HGQihIbGln1k2Xj65jb3E+G498FZFAoSrrBDvwQ==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.9.2.tgz",
+      "integrity": "sha512-FItBuj9bPdVier2g5OBG2HHlQLou4JuH3gdnY43tpJOrCpmWrbDVJZqrSufKJFO00qjvTYaGlJedIu+vXn79qw==",
      "dependencies": {
        "@babel/runtime": "^7.17.2",
-        "@mui/base": "5.0.0-alpha.90",
-        "@mui/system": "^5.9.1",
-        "@mui/types": "^7.1.4",
+        "@mui/base": "5.0.0-alpha.91",
+        "@mui/system": "^5.9.2",
+        "@mui/types": "^7.1.5",
        "@mui/utils": "^5.9.1",
        "@types/react-transition-group": "^4.4.5",
        "clsx": "^1.2.1",
@@ -3201,14 +3201,14 @@
      }
    },
    "node_modules/@mui/system": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.9.1.tgz",
-      "integrity": "sha512-ZixTmc2+sYp++avoYJ38eM70nfwwudN06vYCU4kfwa4nQPiH+bhLYZnfYkcXRKiDR/hfT0dptbOOfQGZqBYczQ==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.9.2.tgz",
+      "integrity": "sha512-iOvt9tVeFapHL7f7M6BSIiKGMx6RTRvAmc8ipMnQ/MR5Qsxwnyv7qKtNC/K11Rk13Xx0VPaPAhyvBcsr3KdpHA==",
      "dependencies": {
        "@babel/runtime": "^7.17.2",
        "@mui/private-theming": "^5.9.1",
        "@mui/styled-engine": "^5.8.7",
-        "@mui/types": "^7.1.4",
+        "@mui/types": "^7.1.5",
        "@mui/utils": "^5.9.1",
        "clsx": "^1.2.1",
        "csstype": "^3.1.0",
@@ -3240,9 +3240,9 @@
      }
    },
    "node_modules/@mui/types": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.4.tgz",
-      "integrity": "sha512-uveM3byMbthO+6tXZ1n2zm0W3uJCQYtwt/v5zV5I77v2v18u0ITkb8xwhsDD2i3V2Kye7SaNR6FFJ6lMuY/WqQ==",
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.5.tgz",
+      "integrity": "sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA==",
      "peerDependencies": {
        "@types/react": "*"
      },
@@ -3954,9 +3954,9 @@
      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
    },
    "node_modules/@types/node": {
-      "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz",
-      "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw=="
+      "version": "18.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz",
+      "integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg=="
    },
    "node_modules/@types/parse-json": {
      "version": "4.0.0",
@@ -19908,13 +19908,13 @@
      "integrity": "sha512-rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="
    },
    "@mui/base": {
-      "version": "5.0.0-alpha.90",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.90.tgz",
-      "integrity": "sha512-hNKwzr+RkiuGsGrakz8Q2i5ezr4Dz4b4Qsdipt9SiMrhuFAra/i501VSaEIzwec9LC4G+vtW4fE7yJBB0XaAYw==",
+      "version": "5.0.0-alpha.91",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.91.tgz",
+      "integrity": "sha512-/W5amPDz+Lout4FtX5HOyx2Q+YL/EtZciFrx2DDRuUm4M/pWnjfDZAtM+0aqimEvuk3FU+/PuFc7IAyhCSX4Cg==",
      "requires": {
        "@babel/runtime": "^7.17.2",
        "@emotion/is-prop-valid": "^1.1.3",
-        "@mui/types": "^7.1.4",
+        "@mui/types": "^7.1.5",
        "@mui/utils": "^5.9.1",
        "@popperjs/core": "^2.11.5",
        "clsx": "^1.2.1",
@@ -19931,14 +19931,14 @@
      }
    },
    "@mui/material": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.9.1.tgz",
-      "integrity": "sha512-c09SbaMm7Rl7Df9JRkXwPWNbnfrutmHERTJC46OJ9OMAM9+HGQihIbGln1k2Xj65jb3E+G498FZFAoSrrBDvwQ==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.9.2.tgz",
+      "integrity": "sha512-FItBuj9bPdVier2g5OBG2HHlQLou4JuH3gdnY43tpJOrCpmWrbDVJZqrSufKJFO00qjvTYaGlJedIu+vXn79qw==",
      "requires": {
        "@babel/runtime": "^7.17.2",
-        "@mui/base": "5.0.0-alpha.90",
-        "@mui/system": "^5.9.1",
-        "@mui/types": "^7.1.4",
+        "@mui/base": "5.0.0-alpha.91",
+        "@mui/system": "^5.9.2",
+        "@mui/types": "^7.1.5",
        "@mui/utils": "^5.9.1",
        "@types/react-transition-group": "^4.4.5",
        "clsx": "^1.2.1",
@@ -19970,14 +19970,14 @@
      }
    },
    "@mui/system": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.9.1.tgz",
-      "integrity": "sha512-ZixTmc2+sYp++avoYJ38eM70nfwwudN06vYCU4kfwa4nQPiH+bhLYZnfYkcXRKiDR/hfT0dptbOOfQGZqBYczQ==",
+      "version": "5.9.2",
+      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.9.2.tgz",
+      "integrity": "sha512-iOvt9tVeFapHL7f7M6BSIiKGMx6RTRvAmc8ipMnQ/MR5Qsxwnyv7qKtNC/K11Rk13Xx0VPaPAhyvBcsr3KdpHA==",
      "requires": {
        "@babel/runtime": "^7.17.2",
        "@mui/private-theming": "^5.9.1",
        "@mui/styled-engine": "^5.8.7",
-        "@mui/types": "^7.1.4",
+        "@mui/types": "^7.1.5",
        "@mui/utils": "^5.9.1",
        "clsx": "^1.2.1",
        "csstype": "^3.1.0",
@@ -19985,9 +19985,9 @@
      }
    },
    "@mui/types": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.4.tgz",
-      "integrity": "sha512-uveM3byMbthO+6tXZ1n2zm0W3uJCQYtwt/v5zV5I77v2v18u0ITkb8xwhsDD2i3V2Kye7SaNR6FFJ6lMuY/WqQ==",
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.5.tgz",
+      "integrity": "sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA==",
      "requires": {}
    },
    "@mui/utils": {
@@ -20491,9 +20491,9 @@
      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
    },
    "@types/node": {
-      "version": "18.0.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz",
-      "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw=="
+      "version": "18.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz",
+      "integrity": "sha512-z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg=="
    },
    "@types/parse-json": {
      "version": "4.0.0",
--- a/interface/package.json
+++ b/interface/package.json
@@ -8,10 +8,10 @@
    "@emotion/styled": "^11.9.3",
    "@msgpack/msgpack": "^2.7.2",
    "@mui/icons-material": "^5.8.4",
-    "@mui/material": "^5.9.1",
+    "@mui/material": "^5.9.2",
    "@table-library/react-table-library": "4.0.10",
    "@types/lodash": "^4.14.182",
-    "@types/node": "^18.0.6",
+    "@types/node": "^18.6.1",
    "@types/react": "^18.0.15",
    "@types/react-dom": "^18.0.6",
    "@types/react-router-dom": "^5.3.3",
--- a/interface/src/project/SettingsCustomization.tsx
+++ b/interface/src/project/SettingsCustomization.tsx
@@ -13,7 +13,8 @@ import {
  ToggleButtonGroup,
  Tooltip,
  Grid,
-  TextField
+  TextField,
+  Link
 } from '@mui/material';

 import { Table } from '@table-library/react-table-library/table';
@@ -26,11 +27,6 @@ import { useSnackbar } from 'notistack';
 import SaveIcon from '@mui/icons-material/Save';
 import CancelIcon from '@mui/icons-material/Cancel';

-// import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined';
-// import StarIcon from '@mui/icons-material/Star';
-// import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined';
-// import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined';
-
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore';
 import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined';
 import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined';
@@ -48,13 +44,15 @@ import { extractErrorMessage } from '../utils';

 import { DeviceShort, Devices, DeviceEntity, DeviceEntityMask } from './types';

+export const APIURL = window.location.origin + '/api/';
+
 const SettingsCustomization: FC = () => {
  const { enqueueSnackbar } = useSnackbar();

  const [deviceEntities, setDeviceEntities] = useState<DeviceEntity[]>([{ id: '', v: 0, n: '', m: 0, w: false }]);
  const [devices, setDevices] = useState<Devices>();
  const [errorMessage, setErrorMessage] = useState<string>();
-  const [selectedDevice, setSelectedDevice] = useState<number>(0);
+  const [selectedDevice, setSelectedDevice] = useState<number>(-1);
  const [confirmReset, setConfirmReset] = useState<boolean>(false);
  const [selectedFilters, setSelectedFilters] = useState<number>(0);
  const [search, setSearch] = useState('');
@@ -94,7 +92,6 @@ const SettingsCustomization: FC = () => {
    Row: `
      background-color: #1e1e1e;
      position: relative;
-      cursor: pointer;
    
      .td {
        border-top: 1px solid #565656;
@@ -107,11 +104,6 @@ const SettingsCustomization: FC = () => {
        font-weight: normal;
      }

-      &:hover .td {
-        border-top: 1px solid #177ac9;
-        border-bottom: 1px solid #177ac9;
-      }
-
      &:nth-of-type(odd) .td {
        background-color: #303030;
      }
@@ -194,7 +186,15 @@ const SettingsCustomization: FC = () => {
    } else if (de.n === '') {
      return 'Command: ' + de.id;
    }
-    return de.n + ' (' + de.id + ')';
+    return (
+      <>
+        {de.n}&nbsp;(
+        <Link target="_blank" href={APIURL + devices?.devices[selectedDevice].t + '/' + de.id}>
+          {de.id}
+        </Link>
+        )
+      </>
+    );
  }

  const getMaskNumber = (newMask: string[]) => {
@@ -239,20 +239,12 @@ const SettingsCustomization: FC = () => {
    );
  };

-  function compareDevices(a: DeviceShort, b: DeviceShort) {
-    if (a.s < b.s) {
-      return -1;
-    }
-    if (a.s > b.s) {
-      return 1;
-    }
-    return 0;
-  }
-
  const changeSelectedDevice = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const selected_device = parseInt(event.target.value, 10);
-    setSelectedDevice(selected_device);
-    fetchDeviceEntities(selected_device);
+    if (devices) {
+      const selected_device = parseInt(event.target.value, 10);
+      setSelectedDevice(selected_device);
+      fetchDeviceEntities(devices?.devices[selected_device].i);
+    }
  };

  const resetCustomization = async () => {
@@ -267,7 +259,7 @@ const SettingsCustomization: FC = () => {
  };

  const saveCustomization = async () => {
-    if (deviceEntities && selectedDevice) {
+    if (devices && deviceEntities && selectedDevice !== -1) {
      const masked_entities = deviceEntities
        .filter((de) => de.m !== de.om)
        .map((new_de) => new_de.m.toString(16).padStart(2, '0') + new_de.id);
@@ -279,7 +271,7 @@ const SettingsCustomization: FC = () => {

      try {
        const response = await EMSESP.writeMaskedEntities({
-          id: selectedDevice,
+          id: devices?.devices[selectedDevice].i,
          entity_ids: masked_entities
        });
        if (response.status === 200) {
@@ -305,13 +297,13 @@ const SettingsCustomization: FC = () => {
          <Typography variant="body2">Select a device and customize each of its entities using the options:</Typography>
          <Typography variant="body2">
            <OptionIcon type="favorite" isSet={true} />
-            =mark as a favorite&nbsp;&nbsp;
+            =mark as favorite&nbsp;&nbsp;
            <OptionIcon type="readonly" isSet={true} />
            =disable write action&nbsp;&nbsp;
            <OptionIcon type="api_mqtt_exclude" isSet={true} />
-            =exclude from MQTT and API outputs&nbsp;&nbsp;
+            =exclude from MQTT and API&nbsp;&nbsp;
            <OptionIcon type="web_exclude" isSet={true} />
-            =hide from Web Dashboard
+            =hide from Dashboard
          </Typography>
        </Box>
        <ValidatedTextField
@@ -324,11 +316,11 @@ const SettingsCustomization: FC = () => {
          margin="normal"
          select
        >
-          <MenuItem disabled key={0} value={0}>
+          <MenuItem disabled key={0} value={-1}>
            Select a device...
          </MenuItem>
-          {devices.devices.sort(compareDevices).map((device: DeviceShort, index) => (
-            <MenuItem key={index} value={device.i}>
+          {devices.devices.map((device: DeviceShort, index) => (
+            <MenuItem key={index} value={index}>
              {device.s}
            </MenuItem>
          ))}
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -104,9 +104,10 @@ export interface CoreData {

 export interface DeviceShort {
  i: number; // id
-  d: number; // deviceid
-  p: number; // productid
+  d?: number; // deviceid
+  p?: number; // productid
  s: string; // shortname
+  t?: string; // device type name
 }

 export interface Devices {
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -347,18 +347,21 @@ const emsesp_devices = {
      d: 23,
      p: 77,
      s: 'Thermostat (RC20/Moduline 300)',
+      t: 'thermostat1',
    },
    {
      i: 2,
      d: 8,
      p: 123,
      s: 'Boiler (Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i)',
+      t: 'boiler',
    },
    {
      i: 4,
      d: 16,
      p: 165,
      s: 'Thermostat (RC100/Moduline 1000/1010)',
+      t: 'thermostat2',
    },
  ],
 }
@@ -1224,8 +1227,8 @@ rest_server.get(GET_CUSTOMIZATIONS_ENDPOINT, (req, res) => {

 // start server
 const expressServer = rest_server.listen(port, () =>
+  console.log(`EMS-ESP REST API server running on http://localhost:${port}/api`),
 )
-console.log(`EMS-ESP Rest API listening to http://localhost:${port}/api`)

 // start websocket server
 const websocketServer = new WebSocket.Server({
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -114,7 +114,7 @@ std::string EMSdevice::device_type_2_device_name(const uint8_t device_type) {
 // returns device_type from a string
 uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
    if (!topic) {
-        return DeviceType::UNKNOWN; // nullptr
+        return DeviceType::UNKNOWN;
    }

    // convert topic to lowercase and compare
--- a/src/locale_DE.h
+++ b/src/locale_DE.h
@@ -269,7 +269,7 @@ MAKE_PSTR(bufferedflow, "Durchlaufspeicher")
 MAKE_PSTR(layeredbuffer, "Schichtspeicher")
 MAKE_PSTR(maintenance, "Wartung")
 MAKE_PSTR(heating, "Heizen")
-MAKE_PSTR(cooling, "K<EFBFBD>hlen")
+MAKE_PSTR(cooling, "K<EFBFBD>hlen")

 // boiler lists
 MAKE_PSTR_LIST(tpl_date, F("Format: < dd.mm.yyyy >")) // template for text input
@@ -312,7 +312,7 @@ MAKE_PSTR(winter, "Winter")
 MAKE_PSTR(outdoor, "Aussentemperatur")
 MAKE_PSTR_WORD(mpc)
 MAKE_PSTR(room, "Raum")
-MAKE_PSTR(room_outdoor, "Raum+Au<41>en")
+MAKE_PSTR(room_outdoor, "Raum+Au<41>en")
 MAKE_PSTR(power, "Leistung")
 MAKE_PSTR(constant, "konstant")
 MAKE_PSTR(simple, "einfach")
--- a/src/web/WebAPIService.cpp
+++ b/src/web/WebAPIService.cpp
@@ -16,8 +16,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-// SUrlParser from https://github.com/Mad-ness/simple-url-parser
-
 #include "emsesp.h"

 using namespace std::placeholders; // for `_1` etc
--- a/src/web/WebCustomizationService.cpp
+++ b/src/web/WebCustomizationService.cpp
@@ -165,22 +165,27 @@ void WebCustomizationService::devices(AsyncWebServerRequest * request) {
    auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_LARGE_DYN);
    JsonObject root     = response->getRoot();

+    // list is already sorted by device type
+    // controller is ignored since it doesn't have any associated entities
    JsonArray devices = root.createNestedArray("devices");
    for (const auto & emsdevice : EMSESP::emsdevices) {
        if (emsdevice->has_entities()) {
            JsonObject obj = devices.createNestedObject();
-            obj["i"]       = emsdevice->unique_id(); // a unique id
+            obj["i"]       = emsdevice->unique_id();                                         // its unique id
+            obj["s"]       = emsdevice->device_type_name() + " (" + emsdevice->name() + ")"; // shortname

+            // device type name. We may have one than one (e.g. multiple thermostats) so postfix name with index
+            // code block not needed - see https://github.com/emsesp/EMS-ESP32/pull/586#issuecomment-1193779668
            /*
            uint8_t device_index = EMSESP::device_index(emsdevice->device_type(), emsdevice->unique_id());
            if (device_index) {
                char s[10];
-                obj["s"] = emsdevice->device_type_name() + Helpers::smallitoa(s, device_index) + " (" + emsdevice->name() + ")";  // shortname - we prefix the count to make it unique
+                obj["t"] = Helpers::toLower(emsdevice->device_type_name()) + Helpers::smallitoa(s, device_index);
            } else {
-                obj["s"] = emsdevice->device_type_name() + " (" + emsdevice->name() + ")";
+                obj["t"] = Helpers::toLower(emsdevice->device_type_name());
            }
            */
-            obj["s"] = emsdevice->device_type_name() + " (" + emsdevice->name() + ")";
+            obj["t"] = Helpers::toLower(emsdevice->device_type_name());
        }
    }

--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -74,10 +74,10 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
    JsonObject root     = response->getRoot();

    // list is already sorted by device type
-    // Ignore Contoller
    JsonArray devices = root.createNestedArray("devices");
    char      buffer[3];
    for (const auto & emsdevice : EMSESP::emsdevices) {
+        // ignore controller
        if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::CONTROLLER || emsdevice->count_entities() > 0)) {
            JsonObject obj = devices.createNestedObject();
            obj["id"]      = Helpers::smallitoa(buffer, emsdevice->unique_id()); // a unique id as a string
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -34,7 +34,7 @@ WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * se
 void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
    switch (event) {
    case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
-        EMSESP::logger().info(F("WiFi disconnected. Reason code=%d"), info.wifi_sta_disconnected.reason); // IDF 4.0
+        EMSESP::logger().warning(F("WiFi disconnected. Reason code=%d"), info.wifi_sta_disconnected.reason); // IDF 4.0
        WiFi.disconnect(true);
        break;

@@ -82,7 +82,7 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
        break;

    case ARDUINO_EVENT_ETH_DISCONNECTED:
-        EMSESP::logger().info(F("Ethernet disconnected"));
+        EMSESP::logger().warning(F("Ethernet disconnected"));
        EMSESP::system_.ethernet_connected(false);
        break;