Merge branch 'devel' into 145-graphical-configure-utilities

supervisor/facility.lua

@@ -399,10 +399,9 @@ function facility.new(num_reactors, cooling_conf)
                 end
             elseif self.mode == PROCESS.INACTIVE then
                 for i = 1, #self.prio_defs do
-                    -- SCRAM reactors and disengage auto control
-                    -- use manual SCRAM since inactive was requested, and automatic SCRAM trips an alarm
+                    -- disable reactors and disengage auto control
                     for _, u in pairs(self.prio_defs[i]) do
-                        u.scram()
+                        u.disable()
                         u.auto_disengage()
                     end
                 end

supervisor/session/plc.lua

@@ -25,8 +25,9 @@ local PLC_S_CMDS = {
     SCRAM = 1,
     ASCRAM = 2,
     ENABLE = 3,
-    RPS_RESET = 4,
-    RPS_AUTO_RESET = 5
+    DISABLE = 4,
+    RPS_RESET = 5,
+    RPS_AUTO_RESET = 6
 }
 
 local PLC_S_DATA = {
@@ -80,6 +81,7 @@ function plc.new_session(id, s_addr, reactor_id, in_queue, out_queue, timeout, f
         retry_times = {
             struct_req = (util.time() + 500),
             status_req = (util.time() + 500),
+            disable_req = 0,
             scram_req = 0,
             ascram_req = 0,
             burn_rate_req = 0,
@@ -87,6 +89,7 @@ function plc.new_session(id, s_addr, reactor_id, in_queue, out_queue, timeout, f
         },
         -- command acknowledgements
         acks = {
+            disable = true,
             scram = true,
             ascram = true,
             burn_rate = true,
@@ -627,6 +630,11 @@ function plc.new_session(id, s_addr, reactor_id, in_queue, out_queue, timeout, f
                             if not self.auto_lock then
                                 _send(RPLC_TYPE.RPS_ENABLE, {})
                             end
+                        elseif cmd == PLC_S_CMDS.DISABLE then
+                            -- disable the reactor
+                            self.acks.disable = false
+                            self.retry_times.disable_req = util.time() + INITIAL_WAIT
+                            _send(RPLC_TYPE.RPS_DISABLE, {})
                         elseif cmd == PLC_S_CMDS.SCRAM then
                             -- SCRAM reactor
                             self.acks.scram = false
@@ -780,6 +788,15 @@ function plc.new_session(id, s_addr, reactor_id, in_queue, out_queue, timeout, f
                 end
             end
 
+            -- reactor disable request retry
+
+            if not self.acks.disable then
+            if rtimes.disable_req - util.time() <= 0 then
+                    _send(RPLC_TYPE.RPS_DISABLE, {})
+                    rtimes.disable_req = util.time() + RETRY_PERIOD
+                end
+            end
+
             -- SCRAM request retry
 
             if not self.acks.scram then

supervisor/unit.lua

@@ -645,6 +645,13 @@ function unit.new(reactor_id, num_boilers, num_turbines)
     -- OPERATIONS --
     --#region
 
+    -- queue a command to disable the reactor
+    function public.disable()
+        if self.plc_s ~= nil then
+            self.plc_s.in_queue.push_command(PLC_S_CMDS.DISABLE)
+        end
+    end
+
     -- queue a command to SCRAM the reactor
     function public.scram()
         if self.plc_s ~= nil then