From 37b35d395ba2d39953b854e73ab2a1072e02c8d1 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Tue, 7 Jul 2020 06:16:42 +0200
Subject: [PATCH] ISM-values, typo in web

---
 .../src/project/EMSESPSettingsController.tsx  | 30 +++++++++----------
 src/devices/solar.cpp                         |  3 ++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/interface/src/project/EMSESPSettingsController.tsx b/interface/src/project/EMSESPSettingsController.tsx
index 7bb2923ca..3b743ad30 100644
--- a/interface/src/project/EMSESPSettingsController.tsx
+++ b/interface/src/project/EMSESPSettingsController.tsx
@@ -108,18 +108,6 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps)
                 onChange={handleValueChange('publish_time')}
                 margin="normal"
             />
-            <SelectValidator name="syslog_level"
-                label="Syslog log level"
-                value={data.syslog_level}
-                fullWidth
-                variant="outlined"
-                onChange={handleValueChange('syslog_level')}
-                margin="normal">
-                <MenuItem value={-1}>OFF</MenuItem>
-                <MenuItem value={3}>ERR</MenuItem>
-                <MenuItem value={6}>INFO</MenuItem>
-                <MenuItem value={7}>DEBUG</MenuItem>
-            </SelectValidator>
             <BlockFormControlLabel
                 control={
                     <Checkbox
@@ -140,6 +128,18 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps)
                 }
                 label="Shower Alert"
             />
+            <SelectValidator name="syslog_level"
+                label="Syslog log level"
+                value={data.syslog_level}
+                fullWidth
+                variant="outlined"
+                onChange={handleValueChange('syslog_level')}
+                margin="normal">
+                <MenuItem value={-1}>OFF</MenuItem>
+                <MenuItem value={3}>ERR</MenuItem>
+                <MenuItem value={6}>INFO</MenuItem>
+                <MenuItem value={7}>DEBUG</MenuItem>
+            </SelectValidator>
             {data.syslog_level !== -1 &&
                 <Fragment>
                     <TextValidator
@@ -154,13 +154,13 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps)
                         margin="normal"
                     />
                     <TextValidator
-                        validators={['required', 'isNumber', 'minNumber:1', 'maxNumber:65535']}
-                        errorMessages={['Keep alive is required', "Must be a number", "Must be greater than 0", "Max value is 65535"]}
+                        validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
+                        errorMessages={['Mark intervall is required', "Must be a number", "0 means off", "Max value is 65535"]}
                         name="syslog_mark_interval"
                         label="Syslog mark interval (seconds)"
                         fullWidth
                         variant="outlined"
-                        value={data.publish_time}
+                        value={data.syslog_mark_interval}
                         type="number"
                         onChange={handleValueChange('syslog_mark_interval')}
                         margin="normal"
diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp
index 63a770e98..62adb9d63 100644
--- a/src/devices/solar.cpp
+++ b/src/devices/solar.cpp
@@ -246,6 +246,9 @@ void Solar::process_ISM1StatusMessage(std::shared_ptr<const Telegram> telegram)
     }
     telegram->read_bitvalue(pump_, 8, 0);      // Solar pump on (1) or off (0)
     telegram->read_value(pumpWorkMin_, 10, 3); // force to 3 bytes
+
+    telegram->read_bitvalue(tankHeated_, 9, 2); // issue #422
+    telegram->read_bitvalue(collectorOnOff_, 9, 0);
 }
 
 /*