Merge branch 'devel' of https://github.com/MikaylaFischler/cc-mek-scada into devel

build/safemin.py

@@ -28,7 +28,10 @@ def minify(path: str):
     contents = f.read()
     f.close()
 
-    if re.search(r'--+\[(?!\[@as)+', contents) != None:
+    # remove --[[@as type]] hints before anything, since it would detect as multiline comments
+    contents = re.sub(r' --+\[.+]]', '', contents)
+
+    if re.search(r'--+\[+', contents) != None:
         # absolutely not dealing with lua multiline comments
         # - there are more important things to do
         # - this minification is intended to be 100% safe, so working with multiline comments is asking for trouble

supervisor/facility_update.lua

@@ -555,7 +555,7 @@ function update.auto_safety()
         -- clears when we enter the fault waiting state
         astatus.gen_fault = self.mode == PROCESS.GEN_RATE and not self.units_ready
     else
-        astatus.matrix_fault = true
+        astatus.matrix_dc = true
     end
 
     -- check for critical unit alarms