From ab20fba4f5ed27d4b313f9e50a9739e0b0bb5cae Mon Sep 17 00:00:00 2001
From: Paul <paul@derbyshire.nl>
Date: Fri, 2 Aug 2019 21:30:40 +0200
Subject: [PATCH] clean up text

---
 src/MyESP.cpp   | 2 +-
 src/ems-esp.cpp | 9 ++++++---
 src/ems.cpp     | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/MyESP.cpp b/src/MyESP.cpp
index 55ae12a73..1a58af112 100644
--- a/src/MyESP.cpp
+++ b/src/MyESP.cpp
@@ -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_CUSTOMCONFIG_FILE); // for debugging
-    _fs_printFile(MYESP_EVENTLOG_FILE); // for debugging
+    //_fs_printFile(MYESP_EVENTLOG_FILE); // for debugging
 }
 
 /*
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 261bdbb1a..71e5e0702 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1040,7 +1040,7 @@ void do_regularUpdates() {
         ems_getBoilerValues();
         ems_getSolarModuleValues();
     } 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";
     } else {
         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["msg"] = "EMS Bus Connected, Rx and Tx active";
             } else {
                 emsbus["ok"]  = false;
-                emsbus["msg"] = "EMS Bus Connected, Tx is failing";
+                emsbus["msg"] = "EMS Bus Connected, Tx is not working";
             }
         } else {
             emsbus["ok"]  = false;
diff --git a/src/ems.cpp b/src/ems.cpp
index 79d94c9c5..6839230df 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -581,7 +581,7 @@ void _ems_sendTelegram() {
     }
 
     // if we're preventing all outbound traffic, quit
-    if (EMS_Sys_Status.emsTxDisabled) {
+    if (ems_getTxDisabled()) {
         EMS_TxQueue.shift(); // remove from queue
         if (ems_getLogging() != EMS_SYS_LOGGING_NONE) {
             myDebug_P(PSTR("in Listen Mode. All Tx is disabled."));
@@ -2320,7 +2320,7 @@ void ems_sendRawTelegram(char * telegram) {
     char *  p;
     char    value[10] = {0};
 
-    if (EMS_Sys_Status.emsTxDisabled) {
+    if (ems_getTxDisabled()) {
         return; // user has disabled all Tx
     }
 
@@ -2684,7 +2684,7 @@ void ems_setWarmTapWaterActivated(bool activated) {
  * Still experimental and not used yet!
  */
 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"));
     }