From 7abd4d259381f981bc5a0f8cb148c391253a01db Mon Sep 17 00:00:00 2001
From: Stuart Pittaway <1201909+stuartpittaway@users.noreply.github.com>
Date: Mon, 25 Jan 2021 14:40:11 +0000
Subject: [PATCH] Updated warning messages to reflect rule #89

---
 ESPController/src/main.cpp        | 4 ++--
 ESPController/web_src/default.htm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ESPController/src/main.cpp b/ESPController/src/main.cpp
index 3099a25..b600508 100644
--- a/ESPController/src/main.cpp
+++ b/ESPController/src/main.cpp
@@ -560,13 +560,13 @@ void ProcessRules()
           rules.SetWarning(InternalWarningCode::ModuleInconsistantBypassTemperature);
         }
 
-        if (cmi[cellid].CodeVersionNumber != cmi[0].CodeVersionNumber)
+        if (cmi[0].settingsCached && cmi[cellid].CodeVersionNumber != cmi[0].CodeVersionNumber)
         {
           //Do all the modules have the same version of code as module zero?
           rules.SetWarning(InternalWarningCode::ModuleInconsistantCodeVersion);
         }
 
-        if (cmi[cellid].BoardVersionNumber != cmi[0].BoardVersionNumber)
+        if (cmi[0].settingsCached && cmi[cellid].BoardVersionNumber != cmi[0].BoardVersionNumber)
         {
           //Do all the modules have the same hardware revision?
           rules.SetWarning(InternalWarningCode::ModuleInconsistantBoardRevision);
diff --git a/ESPController/web_src/default.htm b/ESPController/web_src/default.htm
index 4d4cf19..142f0b7 100644
--- a/ESPController/web_src/default.htm
+++ b/ESPController/web_src/default.htm
@@ -48,8 +48,8 @@
 
         <div id='genericwarning' class='warning'>Controller warning <span id="genericwarningcode"></span></div>
 
-        <div id='warning1' class='warning'>Warning: Modules are configured with different bypass voltages</div>
-        <div id='warning2' class='warning'>Warning: Modules are configured with different bypass temperatures</div>
+        <div id='warning1' class='warning'>Warning: Module bypass voltage is different to global setting</div>
+        <div id='warning2' class='warning'>Warning: Module bypass temperature is different to global setting</div>
         <div id='warning3' class='warning'>Warning: Modules have mixed versions of code, may cause instability</div>
         <div id='warning4' class='warning'>Warning: Modules have mixed versions of hardware/boards</div>