From 661bef063c4c427aae0d4e64a197595d153c623f Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Thu, 7 Nov 2024 21:44:34 -0500 Subject: [PATCH 1/2] safemin update for @as --- build/safemin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/safemin.py b/build/safemin.py index 1567b5f..1e89307 100644 --- a/build/safemin.py +++ b/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 From e27d5eeb85a3cea7612332897678d4fb2b9f339e Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Thu, 7 Nov 2024 21:45:15 -0500 Subject: [PATCH 2/2] #571 fix matrix dc --- supervisor/facility_update.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/facility_update.lua b/supervisor/facility_update.lua index f60fe06..6a34d60 100644 --- a/supervisor/facility_update.lua +++ b/supervisor/facility_update.lua @@ -549,7 +549,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