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

Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10

Browse Source
This commit is contained in:
MichaelDvP
2020-01-29 08:16:25 +01:00
parent 9ad6bbfadd 03489d43f4
commit 610b9525c7
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ems-esp.cpp
View File

@@ -479,7 +479,7 @@ void showInfo() {
if (ems_getMixingDeviceEnabled()) {
myDebug_P(PSTR("")); // newline
myDebug_P(PSTR("%sMixing module data:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
myDebug_P(PSTR(" Mixing: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_MIXING, buffer_type,false));
// myDebug_P(PSTR(" Mixing: %s"), ems_getDeviceDescription(EMS_DEVICE_TYPE_MIXING, buffer_type,false));
if (EMS_Boiler.switchTemp < EMS_VALUE_USHORT_NOTSET)
_renderUShortValue("Switch temperature", "C", EMS_Boiler.switchTemp);
@@ -951,7 +951,7 @@ void do_regularUpdates() {
// turn back on the hot water for the shower
void _showerColdShotStop() {
if (EMSESP_Shower.doingColdShot) {
myDebugLog("[Shower] finished shot of cold. hot water back on");
myDebugLog("[Shower] finished shot of cold water. Hot water turned back on");
ems_setWarmTapWaterActivated(true);
EMSESP_Shower.doingColdShot = false;
showerColdShotStopTimer.detach(); // disable the timer
@@ -961,7 +961,7 @@ void _showerColdShotStop() {
// turn off hot water to send a shot of cold
void _showerColdShotStart() {
if (EMSESP_Settings.shower_alert) {
myDebugLog("[Shower] doing a shot of cold water");
myDebugLog("[Shower] starting shot of cold water");
ems_setWarmTapWaterActivated(false);
EMSESP_Shower.doingColdShot = true;
// start the timer for n seconds which will reset the water back to hot
@@ -1975,9 +1975,9 @@ void showerCheck() {
// SETUP
//
void setup() {
// GPIO15/D8 has a pull down, so we must set it to HIGH so it doesn't bring the whole EMS bus down
// GPIO15/D8 has an onboard pull down resistor and we use this for Tx, so force it high so it doesn't bring the whole EMS bus down
pinMode(D8, OUTPUT);
digitalWrite(D8, 1);
digitalWrite(D8, HIGH);
// init our own parameters
initEMSESP();