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

Merge branch 'master' of https://github.com/proddy/EMS-ESP-Boiler

Browse Source 
* 'master' of https://github.com/proddy/EMS-ESP-Boiler:
  fix curr temp when higher than 25.5
  added devices
This commit is contained in:
Susis Strolch
2019-07-29 09:55:12 +02:00
parent 98076f35a9 807d1dee0d
commit 41837bf328
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
README.md
View File

@@ -21,3 +21,54 @@ The code is writen for the Espressif **ESP8266** microcontroller and supports a
| ![telnet menu](https://github.com/proddy/EMS-ESP/raw/master/doc/telnet/telnet_menu.jpg) | ![telnet menu](https://github.com/proddy/EMS-ESP/raw/master/doc/telnet/telnet_stats.PNG) | | ![telnet menu](https://github.com/proddy/EMS-ESP/raw/master/doc/telnet/telnet_menu.jpg) | ![telnet menu](https://github.com/proddy/EMS-ESP/raw/master/doc/telnet/telnet_stats.PNG) |
| - | - | | - | - |
---
## The latest list of support EMS devices
### Thermostats:
* Sieger ES73
* RC10/Nefit Moduline 100
* RC20/Nefit Moduline 300
* RC20F
* RC30/Nefit Moduline 400
* RC35 (only a single HC)
* RC300/RC310
* Nefit Moduline 1010
* Junkers FR10
* TC100/Nefit Easy (read-only)
* Bosch Easy (read-only)
* Bosch CW100 (read-only)
### Boilers:
* Buderus GB172/Nefit Trendline
* Nefit Topline Compact/Buderus GB162
* Buderus Logamax U122
* Buderus Logamax plus/GB192
* Sieger BK15 Boiler/Nefit Smartline
* Bosch Condens 2500/Junkers Cerapur Comfort
* Nefit Proline
### Solar Modules:
* SM10 Solar Module
* SM100 Solar Module
* Junkers ISM1 Solar Module
### Other devices:
* MM10 Mixer Module
* MC10 Module
* WM10 Switch Module
* MM100 Mixing Module
* MM100 Mixing Module
* BC10/RFM20 Receiver
* BC10 Base Controller
* BC25 Base Controller
* Nefit Moduline Easy Connect
* Bosch Easy Connect
* EMS-OT OpenTherm converter
* Web Gateway KM200
* HeatPump Module

6
src/ems-esp.cpp
View File

@@ -481,7 +481,7 @@ void showInfo() {
// Temperatures are *100 // Temperatures are *100
_renderShortValue("Set room temperature", "C", EMS_Thermostat.setpoint_roomTemp, 10); // *100 _renderShortValue("Set room temperature", "C", EMS_Thermostat.setpoint_roomTemp, 10); // *100
_renderShortValue("Current room temperature", "C", EMS_Thermostat.curr_roomTemp, 10); // *100 _renderShortValue("Current room temperature", "C", EMS_Thermostat.curr_roomTemp, 10); // *100
} }
else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FW100)) { else if ((ems_getThermostatModel() == EMS_MODEL_FR10) || (ems_getThermostatModel() == EMS_MODEL_FW100)) {
// Temperatures are *10 // Temperatures are *10
_renderShortValue("Set room temperature", "C", EMS_Thermostat.setpoint_roomTemp, 1); // *10 _renderShortValue("Set room temperature", "C", EMS_Thermostat.setpoint_roomTemp, 1); // *10
@@ -495,8 +495,8 @@ void showInfo() {
if (EMS_Thermostat.curr_roomTemp <= 0) { if (EMS_Thermostat.curr_roomTemp <= 0) {
EMS_Thermostat.curr_roomTemp = EMS_VALUE_INT_NOTSET; EMS_Thermostat.curr_roomTemp = EMS_VALUE_INT_NOTSET;
} }
_renderIntValue("Setpoint room temperature", "C", EMS_Thermostat.setpoint_roomTemp, 2); // convert to a single byte * 2 _renderShortValue("Setpoint room temperature", "C", (EMS_Thermostat.setpoint_roomTemp * 5), 1); // convert to a single byte * 2 (1 decimal but the value is original)
_renderIntValue("Current room temperature", "C", EMS_Thermostat.curr_roomTemp, 10); // is *10 _renderShortValue("Current room temperature", "C", EMS_Thermostat.curr_roomTemp, 1); // is *10
} }
// Render Day/Night/Holiday Temperature // Render Day/Night/Holiday Temperature