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

minor changes

Browse Source
This commit is contained in:
proddy
2019-01-02 12:40:42 +01:00
parent f15aa9508d
commit e420a53582
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/boiler.ino
View File

@@ -23,6 +23,7 @@
#include <Ticker.h> // https://github.com/esp8266/Arduino/tree/master/libraries/Ticker #include <Ticker.h> // https://github.com/esp8266/Arduino/tree/master/libraries/Ticker
#define myDebug(...) myESP.myDebug(__VA_ARGS__) #define myDebug(...) myESP.myDebug(__VA_ARGS__)
#define myDebug_P(...) myESP.myDebug_P(__VA_ARGS__)
// timers, all values are in seconds // timers, all values are in seconds
#define PUBLISHVALUES_TIME 120 // every 2 minutes post HA values #define PUBLISHVALUES_TIME 120 // every 2 minutes post HA values
@@ -273,13 +274,13 @@ void showInfo() {
myDebug("%sEMS-ESP-Boiler system stats:%s", COLOR_BOLD_ON, COLOR_BOLD_OFF); myDebug("%sEMS-ESP-Boiler system stats:%s", COLOR_BOLD_ON, COLOR_BOLD_OFF);
_EMS_SYS_LOGGING sysLog = ems_getLogging(); _EMS_SYS_LOGGING sysLog = ems_getLogging();
if (sysLog == EMS_SYS_LOGGING_BASIC) { if (sysLog == EMS_SYS_LOGGING_BASIC) {
myDebug(" System logging is set to Basic"); myDebug(" System logging set to Basic");
} else if (sysLog == EMS_SYS_LOGGING_VERBOSE) { } else if (sysLog == EMS_SYS_LOGGING_VERBOSE) {
myDebug(" System logging is set to Verbose"); myDebug(" System logging set to Verbose");
} else if (sysLog == EMS_SYS_LOGGING_THERMOSTAT) { } else if (sysLog == EMS_SYS_LOGGING_THERMOSTAT) {
myDebug(" System logging is set to Thermostat only"); myDebug(" System logging set to Thermostat only");
} else { } else {
myDebug(" System logging is set to None"); myDebug(" System logging set to None");
} }
myDebug(" # EMS type handlers: %d", ems_getEmsTypesCount()); myDebug(" # EMS type handlers: %d", ems_getEmsTypesCount());
@@ -559,7 +560,7 @@ void myDebugCallback() {
ems_printTxQueue(); ems_printTxQueue();
break; break;
case 'D': // Auto detect EMS devices case 'D': // Auto detect EMS devices
ems_getVersions(); ems_getAllVersions();
break; break;
default: default:
myDebug("Unknown command. Use ? for help."); myDebug("Unknown command. Use ? for help.");
@@ -688,12 +689,15 @@ void WIFICallback() {
#ifdef DEBUG_SUPPORT #ifdef DEBUG_SUPPORT
myDebug("Warning, in DEBUG mode. EMS bus is disabled. See -DDEBUG_SUPPORT build option."); myDebug("Warning, in DEBUG mode. EMS bus is disabled. See -DDEBUG_SUPPORT build option.");
#else #else
// Important! This is where we enable the UART service to scan the incoming serial Tx/Rx bus signals
// This is done after we have a WiFi signal to avoid any resource conflicts
emsuart_init(); emsuart_init();
myDebug("[UART] Opened Rx/Tx connection");
#endif #endif
// now that we're connected, send a version request to see what things are on the EMS bus // now that we're connected, send a version request to see what things are on the EMS bus
myDebug("Starting up. Finding what devices are on the EMS bus..."); myDebug("Starting up. Finding what devices are on the EMS bus...");
ems_getVersions(); ems_getAllVersions();
} }
// Initialize the boiler settings // Initialize the boiler settings
@@ -790,7 +794,6 @@ void showerCheck() {
Boiler_Shower.doingColdShot = false; Boiler_Shower.doingColdShot = false;
Boiler_Shower.duration = 0; Boiler_Shower.duration = 0;
Boiler_Shower.showerOn = false; Boiler_Shower.showerOn = false;
myDebugLog("Shower: hot water on...");
} else { } else {
// hot water has been on for a while // hot water has been on for a while
// first check to see if hot water has been on long enough to be recognized as a Shower/Bath // first check to see if hot water has been on long enough to be recognized as a Shower/Bath