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

clean up text

Browse Source
This commit is contained in:
Paul
2019-08-02 21:30:40 +02:00
parent 61a4b8dbd8
commit ab20fba4f5
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MyESP.cpp
View File

@@ -2606,7 +2606,7 @@ void MyESP::begin(const char * app_hostname, const char * app_name, const char *
//_fs_printFile(MYESP_CONFIG_FILE); // for debugging //_fs_printFile(MYESP_CONFIG_FILE); // for debugging
//_fs_printFile(MYESP_CUSTOMCONFIG_FILE); // for debugging //_fs_printFile(MYESP_CUSTOMCONFIG_FILE); // for debugging
_fs_printFile(MYESP_EVENTLOG_FILE); // for debugging //_fs_printFile(MYESP_EVENTLOG_FILE); // for debugging
} }
/* /*

9
src/ems-esp.cpp
View File

@@ -1040,7 +1040,7 @@ void do_regularUpdates() {
ems_getBoilerValues(); ems_getBoilerValues();
ems_getSolarModuleValues(); ems_getSolarModuleValues();
} else { } else {
myDebugLog("System is either not connect to the EMS bus or listen_mode is enabled"); myDebug_P(PSTR("System is either not connected to the EMS bus or listen_mode is enabled."));
} }
} }
@@ -1681,12 +1681,15 @@ void WebCallback(JsonObject root) {
emsbus["msg"] = "EMS Bus is disabled when in Serial mode. Check Settings->General Settings"; emsbus["msg"] = "EMS Bus is disabled when in Serial mode. Check Settings->General Settings";
} else { } else {
if (ems_getBusConnected()) { if (ems_getBusConnected()) {
if (ems_getTxCapable()) { if (ems_getTxDisabled()) {
emsbus["ok"] = false;
emsbus["msg"] = "EMS Bus Connected, Rx active but Tx has been disabled (listen mode)";
} else if (ems_getTxCapable()) {
emsbus["ok"] = true; emsbus["ok"] = true;
emsbus["msg"] = "EMS Bus Connected, Rx and Tx active"; emsbus["msg"] = "EMS Bus Connected, Rx and Tx active";
} else { } else {
emsbus["ok"] = false; emsbus["ok"] = false;
emsbus["msg"] = "EMS Bus Connected, Tx is failing"; emsbus["msg"] = "EMS Bus Connected, Tx is not working";
} }
} else { } else {
emsbus["ok"] = false; emsbus["ok"] = false;

6
src/ems.cpp
View File

@@ -581,7 +581,7 @@ void _ems_sendTelegram() {
} }
// if we're preventing all outbound traffic, quit // if we're preventing all outbound traffic, quit
if (EMS_Sys_Status.emsTxDisabled) { if (ems_getTxDisabled()) {
EMS_TxQueue.shift(); // remove from queue EMS_TxQueue.shift(); // remove from queue
if (ems_getLogging() != EMS_SYS_LOGGING_NONE) { if (ems_getLogging() != EMS_SYS_LOGGING_NONE) {
myDebug_P(PSTR("in Listen Mode. All Tx is disabled.")); myDebug_P(PSTR("in Listen Mode. All Tx is disabled."));
@@ -2320,7 +2320,7 @@ void ems_sendRawTelegram(char * telegram) {
char * p; char * p;
char value[10] = {0}; char value[10] = {0};
if (EMS_Sys_Status.emsTxDisabled) { if (ems_getTxDisabled()) {
return; // user has disabled all Tx return; // user has disabled all Tx
} }
@@ -2684,7 +2684,7 @@ void ems_setWarmTapWaterActivated(bool activated) {
* Still experimental and not used yet! * Still experimental and not used yet!
*/ */
void ems_startupTelegrams() { void ems_startupTelegrams() {
if ((EMS_Sys_Status.emsTxDisabled) || (!EMS_Sys_Status.emsBusConnected)) { if ((ems_getTxDisabled()) || (!ems_getBusConnected())) {
myDebug_P(PSTR("Unable to send startup sequence when in listen mode or the bus is disabled")); myDebug_P(PSTR("Unable to send startup sequence when in listen mode or the bus is disabled"));
} }