Merge pull request #319 from MichaelDvP/dev

emsesp · Jan 24, 2022 · ab34f7c · ab34f7c
2 parents a38d8c1 + a27a5eb
commit ab34f7c
Show file tree

Hide file tree

Showing 8 changed files with 218 additions and 112 deletions.
diff --git a/interface/src/framework/mqtt/MqttSettingsForm.tsx b/interface/src/framework/mqtt/MqttSettingsForm.tsx
@@ -187,13 +187,13 @@ const MqttSettingsForm: FC = () => {
           control={<Checkbox name="publish_single" checked={data.publish_single} onChange={updateFormValue} />}
           label="Publish single value topics on change"
         />
-          <Grid item>
-            <BlockFormControlLabel
-              control={<Checkbox name="ha_enabled" checked={data.ha_enabled} onChange={updateFormValue} />}
-              label="Enable MQTT Discovery (for Home Assistant, Domoticz)"
-            />
-          </Grid>
-          {data.ha_enabled && (
+        <Grid item>
+          <BlockFormControlLabel
+            control={<Checkbox name="ha_enabled" checked={data.ha_enabled} onChange={updateFormValue} />}
+            label="Enable MQTT Discovery (for Home Assistant, Domoticz)"
+          />
+        </Grid>
+        {data.ha_enabled && (
           <Grid item xs={6}>
             <ValidatedTextField
               name="discovery_prefix"
@@ -205,7 +205,7 @@ const MqttSettingsForm: FC = () => {
               margin="normal"
             />
           </Grid>
-          )}
+        )}
         <Typography sx={{ pt: 2 }} variant="h6" color="primary">
           Publish Intervals (in seconds, 0=automatic)
         </Typography>

diff --git a/interface/src/framework/network/NetworkStatusForm.tsx b/interface/src/framework/network/NetworkStatusForm.tsx
@@ -46,7 +46,7 @@ const networkStatus = ({ status }: NetworkStatus) => {
     case NetworkConnectionStatus.WIFI_STATUS_CONNECTED:
       return 'Connected (WiFi)';
     case NetworkConnectionStatus.ETHERNET_STATUS_CONNECTED:
-      return 'Connected (Wired)';
+      return 'Connected (Ethernet)';
     case NetworkConnectionStatus.WIFI_STATUS_CONNECT_FAILED:
       return 'Connection Failed';
     case NetworkConnectionStatus.WIFI_STATUS_CONNECTION_LOST:
@@ -65,7 +65,7 @@ const dnsServers = ({ dns_ip_1, dns_ip_2 }: NetworkStatus) => {
   if (!dns_ip_1) {
     return 'none';
   }
-  return dns_ip_1 + (dns_ip_2 ? ',' + dns_ip_2 : '');
+  return dns_ip_1 + (dns_ip_2 === '0.0.0.0' ? '' : ',' + dns_ip_2);
 };
 
 const IPs = (status: NetworkStatus) => {

diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx
@@ -103,7 +103,7 @@ const DashboardData: FC = () => {
     }
     loadData();
 
-    if (selectedDevice === 0) {
+    if (sensorData) {
       fetchSensorData();
     } else if (selectedDevice) {
       fetchDeviceData(selectedDevice);
@@ -116,7 +116,7 @@ const DashboardData: FC = () => {
       clearInterval(timer);
     };
     // eslint-disable-next-line
-  }, [analog, sensor, deviceValue, selectedDevice]);
+  }, [analog, sensor, deviceValue, sensorData, selectedDevice]);
 
   const fetchDeviceData = async (unique_id: number) => {
     try {

diff --git a/mock-api/server.js b/mock-api/server.js
@@ -1103,7 +1103,7 @@ const emsesp_info = {
     'Dallas sensors': 3,
   },
   Network: {
-    connection: 'Wired',
+    connection: 'Ethernet',
     hostname: 'ems-esp',
     MAC: 'A8:03:2A:62:64:CF',
     'IPv4 address': '192.168.1.134/255.255.255.0',

diff --git a/src/console.cpp b/src/console.cpp
@@ -245,7 +245,7 @@ void EMSESPShell::add_console_commands() {
     commands->add_command(ShellContext::MAIN,
                           CommandFlags::USER,
                           flash_string_vector{F_(read)},
-                          flash_string_vector{F_(deviceid_mandatory), F_(typeid_mandatory), F_(offset_optional)},
+                          flash_string_vector{F_(deviceid_mandatory), F_(typeid_mandatory), F_(offset_optional), F_(length_optional)},
                           [=](Shell & shell __attribute__((unused)), const std::vector<std::string> & arguments) {
                               uint8_t device_id = Helpers::hextoint(arguments.front().c_str());