update GPIO assignments to match v2p3

diff --git a/ui/app.py b/ui/app.py
index 03aff7b0b80ed010df958d09288f1d051a46b98f..66108f3d37a2f73e86a03acf7d68a10d1813be78 100755 (executable)
--- a/ui/app.py
+++ b/ui/app.py
@@ -132,12 +132,12 @@ def set_line_values(chip_path, line_values):
 def handler(signum, frame):
   set_line_values(
     "/dev/gpiochip0", 
-    { 4: Value.INACTIVE,    # indicate 'not ready' to LPC
-     16: Value.INACTIVE,    # pyro off
-     17: Value.INACTIVE,    # alarm b off
-     20: Value.INACTIVE,    # turn continuity LED off
-     21: Value.INACTIVE,    # turn armed LED off
-     27: Value.INACTIVE     # alarm a off
+    {16: Value.INACTIVE,    # pyro off
+     17: Value.INACTIVE,    # continuity LED off
+     18: Value.INACTIVE,    # armed LED off
+     20: Value.INACTIVE,    # alarm off
+     22: Value.ACTIVE,      # health LED to red
+     27: Value.INACTIVE
     }
   )
   sys.exit(0)
@@ -169,29 +169,23 @@ def manageLEDs():
   # cherrypy.log("manageLEDs")
   armed = sense_armed()
 
-  # set siren (alarm_a) output
+  # set siren (alarm) output
   if armed == "armed":
-    set_line_values("/dev/gpiochip0", {27: Value.ACTIVE})
-  else:
-    set_line_values("/dev/gpiochip0", {27: Value.INACTIVE})
-
-  # set strobe (alarm_b) output
-  if armed == "armed":
-    set_line_values("/dev/gpiochip0", {17: Value.ACTIVE})
+    set_line_values("/dev/gpiochip0", {20: Value.ACTIVE})
   else:
-    set_line_values("/dev/gpiochip0", {17: Value.INACTIVE})
+    set_line_values("/dev/gpiochip0", {20: Value.INACTIVE})
 
   # set continuity LED based on pyro voltage
   if pyro == "good":
-    set_line_values("/dev/gpiochip0", {20: Value.ACTIVE})
+    set_line_values("/dev/gpiochip0", {17: Value.ACTIVE})
   else:
-    set_line_values("/dev/gpiochip0", {20: Value.INACTIVE})
+    set_line_values("/dev/gpiochip0", {17: Value.INACTIVE})
 
   # set armed LED based on safe/arm switch setting
   if armed == "safe":
-    set_line_values("/dev/gpiochip0", {21: Value.INACTIVE})
+    set_line_values("/dev/gpiochip0", {18: Value.INACTIVE})
   else:
-    set_line_values("/dev/gpiochip0", {21: Value.ACTIVE})
+    set_line_values("/dev/gpiochip0", {18: Value.ACTIVE})
 
 path = os.path.abspath(os.path.dirname(__file__))
 javascript_path = os.path.abspath("/usr/share/javascript")
@@ -419,13 +413,13 @@ if __name__ == '__main__':
   # initialize hardware
   set_line_values(
       "/dev/gpiochip0", 
-      {25: Value.ACTIVE,               # take ADS8688 out of reset
-        4: Value.ACTIVE,               # indicate 'ready' to LPC
-       16: Value.INACTIVE,             # pyro off
-       17: Value.INACTIVE,             # alarm b off
-       20: Value.INACTIVE,             # continuity LED off
-       21: Value.INACTIVE,             # armed LED off
-       27: Value.INACTIVE              # alarm a off
+      {25: Value.ACTIVE,      # take ADS8688 out of reset
+       16: Value.INACTIVE,    # pyro off
+       17: Value.INACTIVE,    # continuity LED off
+       18: Value.INACTIVE,    # armed LED off
+       20: Value.INACTIVE,    # alarm off
+       22: Value.INACTIVE,    # health LED to green
+       27: Value.ACTIVE
       }
   )