andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-10 17:59:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

ISM-values, typo in web

Browse Source
This commit is contained in:
MichaelDvP
2020-07-07 06:16:42 +02:00
parent 43b519f5ba
commit 37b35d395b
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
interface/src/project/EMSESPSettingsController.tsx
View File

@@ -108,18 +108,6 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps)
onChange={handleValueChange('publish_time')} onChange={handleValueChange('publish_time')}
margin="normal" 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 <BlockFormControlLabel
control={ control={
<Checkbox <Checkbox
@@ -140,6 +128,18 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps)
} }
label="Shower Alert" 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 && {data.syslog_level !== -1 &&
<Fragment> <Fragment>
<TextValidator <TextValidator
@@ -154,13 +154,13 @@ function EMSESPSettingsControllerForm(props: EMSESPSettingsControllerFormProps)
margin="normal" margin="normal"
/> />
<TextValidator <TextValidator
validators={['required', 'isNumber', 'minNumber:1', 'maxNumber:65535']} validators={['required', 'isNumber', 'minNumber:0', 'maxNumber:65535']}
errorMessages={['Keep alive is required', "Must be a number", "Must be greater than 0", "Max value is 65535"]} errorMessages={['Mark intervall is required', "Must be a number", "0 means off", "Max value is 65535"]}
name="syslog_mark_interval" name="syslog_mark_interval"
label="Syslog mark interval (seconds)" label="Syslog mark interval (seconds)"
fullWidth fullWidth
variant="outlined" variant="outlined"
value={data.publish_time} value={data.syslog_mark_interval}
type="number" type="number"
onChange={handleValueChange('syslog_mark_interval')} onChange={handleValueChange('syslog_mark_interval')}
margin="normal" margin="normal"

3
src/devices/solar.cpp
View File

@@ -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_bitvalue(pump_, 8, 0); // Solar pump on (1) or off (0)
telegram->read_value(pumpWorkMin_, 10, 3); // force to 3 bytes telegram->read_value(pumpWorkMin_, 10, 3); // force to 3 bytes
telegram->read_bitvalue(tankHeated_, 9, 2); // issue #422
telegram->read_bitvalue(collectorOnOff_, 9, 0);
} }
/* /*