Updated warning messages to reflect rule #89

stuartpittaway · Jan 25, 2021 · 7abd4d2 · 7abd4d2
1 parent 94630be
commit 7abd4d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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>