From ecc71eec60b1007e50f96d52cfc024e29b4bb613 Mon Sep 17 00:00:00 2001
From: amarofarinha <151563493+amarofarinha@users.noreply.github.com>
Date: Sun, 3 Nov 2024 18:30:56 +0000
Subject: [PATCH] Bug Fix for Precharge Contactor Handling in
 SHUTDOWN_REQUESTED State and Web Interface Enhancement for Contactor Status
 Display

---
 Software/Software.ino                         |  1 +
 Software/src/devboard/webserver/webserver.cpp | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Software/Software.ino b/Software/Software.ino
index c627f90f..588aa5e0 100644
--- a/Software/Software.ino
+++ b/Software/Software.ino
@@ -744,6 +744,7 @@ void handle_contactors() {
   if (timeSpentInFaultedMode > MAX_ALLOWED_FAULT_TICKS ||
       (datalayer.system.settings.equipment_stop_active && contactorStatus != SHUTDOWN_REQUESTED)) {
     contactorStatus = SHUTDOWN_REQUESTED;
+    datalayer.system.settings.equipment_stop_active = true;
   }
   if (contactorStatus == SHUTDOWN_REQUESTED && !datalayer.system.settings.equipment_stop_active) {
     contactorStatus = DISCONNECTED;
diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp
index 52568271..beae4c47 100644
--- a/Software/src/devboard/webserver/webserver.cpp
+++ b/Software/src/devboard/webserver/webserver.cpp
@@ -719,6 +719,27 @@ String processor(const String& var) {
       content += "<span style='color: red;'>OFF</span>";
     }
     content += "</h4>";
+
+    content += "<h4>Pre Charge: ";
+    if (digitalRead(PRECHARGE_PIN) == HIGH) {
+      content += "<span style='color: green;'>&#10003;</span>";
+    } else {
+      content += "<span style='color: red;'>&#10005;</span>";
+    }
+    content += " Cont. Neg.: ";
+    if (digitalRead(NEGATIVE_CONTACTOR_PIN) == HIGH) {
+      content += "<span style='color: green;'>&#10003;</span>";
+    } else {
+      content += "<span style='color: red;'>&#10005;</span>";
+    }
+
+    content += " Cont. Pos.: ";
+    if (digitalRead(POSITIVE_CONTACTOR_PIN) == HIGH) {
+      content += "<span style='color: green;'>&#10003;</span>";
+    } else {
+      content += "<span style='color: red;'>&#10005;</span>";
+    }
+    content += "</h4>";
 #endif
 
     // Close the block