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

Merge branch 'patch' of https://github.com/MichaelDvP/EMS-ESP32 into patch

Browse Source
This commit is contained in:
MichaelDvP
2023-03-07 07:16:36 +01:00
parent 0b0ca1efd1 8de6448b74
commit e7cbd97662
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/project/DashboardData.tsx
View File

@@ -650,7 +650,7 @@ const DashboardData: FC = () => {
<DialogContent dividers> <DialogContent dividers>
<List dense={true}> <List dense={true}>
<ListItem> <ListItem>
<ListItemText primary={LL.TYPE()} secondary={coreData.devices[deviceDialog].t} /> <ListItemText primary={LL.TYPE()} secondary={coreData.devices[deviceDialog].tn} />
</ListItem> </ListItem>
<ListItem> <ListItem>
<ListItemText primary={LL.NAME(0)} secondary={coreData.devices[deviceDialog].n} /> <ListItemText primary={LL.NAME(0)} secondary={coreData.devices[deviceDialog].n} />

3
src/devices/thermostat.cpp
View File

@@ -1193,7 +1193,8 @@ void Thermostat::process_RC30Temp(std::shared_ptr<const Telegram> telegram) {
// type 0x3E (HC1), 0x48 (HC2), 0x52 (HC3), 0x5C (HC4) - data from the RC35 thermostat (0x10) - 16 bytes // type 0x3E (HC1), 0x48 (HC2), 0x52 (HC3), 0x5C (HC4) - data from the RC35 thermostat (0x10) - 16 bytes
void Thermostat::process_RC35Monitor(std::shared_ptr<const Telegram> telegram) { void Thermostat::process_RC35Monitor(std::shared_ptr<const Telegram> telegram) {
// Check if heatingciruit is active, see https://github.com/emsesp/EMS-ESP32/issues/786 // Check if heatingciruit is active, see https://github.com/emsesp/EMS-ESP32/issues/786
if (telegram->offset > 0 || telegram->message_data[0] == 0x00) { uint16_t active = 0;
if (!telegram->read_value(active, 3)) {
return; return;
} }