#441 #431 bugfixes to the bugfixes

reactor-plc/databus.lua

@@ -70,9 +70,9 @@ function databus.tx_link_state(state)
 end
 
 -- transmit reactor enable state across the bus
----@param active boolean reactor active
+---@param active boolean|nil reactor active
 function databus.tx_reactor_state(active)
-    databus.ps.publish("reactor_active", active)
+    databus.ps.publish("reactor_active", active == true)
 end
 
 -- transmit RPS data across the bus

reactor-plc/plc.lua

@@ -469,13 +469,22 @@ function plc.rps_init(reactor, is_formed)
         self.tripped = false
         self.trip_cause = RPS_TRIP_CAUSE.OK
 
-        for i = 1, #self.state do
-            self.state[i] = false
-        end
+        for i = 1, #self.state do self.state[i] = false end
 
         if not quiet then log.info("RPS: reset") end
     end
 
+    -- partial RPS reset that only clears fault and sys_fail
+    function public.reset_formed()
+        self.tripped = false
+        self.trip_cause = RPS_TRIP_CAUSE.OK
+
+        self.state[state_keys.fault] = false
+        self.state[state_keys.sys_fail] = false
+
+        log.info("RPS: partial reset on formed")
+    end
+
     -- reset the automatic and timeout trip flags, then clear trip if that was the trip cause
     function public.auto_reset()
         self.state[state_keys.automatic] = false

reactor-plc/startup.lua

@@ -18,7 +18,7 @@ local plc       = require("reactor-plc.plc")
 local renderer  = require("reactor-plc.renderer")
 local threads   = require("reactor-plc.threads")
 
-local R_PLC_VERSION = "v1.6.12"
+local R_PLC_VERSION = "v1.6.13"
 
 local println = util.println
 local println_ts = util.println_ts

reactor-plc/threads.lua

@@ -125,9 +125,8 @@ function threads.thread__main(smem, init)
                                 plc_comms.reconnect_reactor(plc_dev.reactor)
                             end
 
-                            -- reset RPS for newly connected reactor
-                            -- without this, is_formed will be out of date and cause it to think its no longer formed again
-                            rps.reset()
+                            -- partial reset of RPS, specific to becoming formed
+                            rps.reset_formed()
                         else
                             -- fully lost the reactor now :(
                             println_ts("reactor lost (failed reconnect)!")
@@ -231,9 +230,8 @@ function threads.thread__main(smem, init)
                                 plc_comms.reconnect_reactor(plc_dev.reactor)
                             end
 
-                            -- reset RPS for newly connected reactor
-                            -- without this, is_formed will be out of date and cause it to think its no longer formed again
-                            rps.reset()
+                            -- partial reset of RPS, specific to becoming formed
+                            rps.reset_formed()
                         end
                     elseif networked and type == "modem" then
                         -- note, check init_ok first since nic will be nil if it is false