#412 updates to RSIO for induction matrix low, high, and analog charge level

supervisor/facility.lua

@@ -300,8 +300,8 @@ function facility.new(config, cooling_conf)
 
         -- calculate moving averages for induction matrix
         if self.induction[1] ~= nil then
-            local matrix = self.induction[1]    ---@type unit_session
-            local db = matrix.get_db()          ---@type imatrix_session_db
+            local matrix = self.induction[1] ---@type unit_session
+            local db = matrix.get_db()       ---@type imatrix_session_db
 
             charge_update = db.tanks.last_update
             rate_update = db.state.last_update
@@ -774,6 +774,16 @@ function facility.new(config, cooling_conf)
 
             self.io_ctl.digital_write(IO.F_ALARM, has_prio_alarm)
             self.io_ctl.digital_write(IO.F_ALARM_ANY, has_any_alarm)
+
+            -- update induction matrix related outputs
+            if self.induction[1] ~= nil then
+                local matrix = self.induction[1] ---@type unit_session
+                local db = matrix.get_db()       ---@type imatrix_session_db
+
+                self.io_ctl.digital_write(IO.F_MATRIX_LOW, db.tanks.energy_fill < const.RS_THRESHOLDS.IMATRIX_CHARGE_LOW)
+                self.io_ctl.digital_write(IO.F_MATRIX_HIGH, db.tanks.energy_fill > const.RS_THRESHOLDS.IMATRIX_CHARGE_HIGH)
+                self.io_ctl.analog_write(IO.F_MATRIX_CHG, db.tanks.energy_fill, 0, 1)
+            end
         end
 
         --#endregion

supervisor/session/rsctl.lua

@@ -2,6 +2,8 @@
 -- Redstone RTU Session I/O Controller
 --
 
+local rsio = require("scada-common.rsio")
+
 local rsctl = {}
 
 -- create a new redstone RTU I/O controller
@@ -16,7 +18,7 @@ function rsctl.new(redstone_rtus)
     ---@return boolean
     function public.is_connected(port)
         for i = 1, #redstone_rtus do
-            local db = redstone_rtus[i].get_db()    ---@type redstone_session_db
+            local db = redstone_rtus[i].get_db() ---@type redstone_session_db
             if db.io[port] ~= nil then return true end
         end
 
@@ -28,8 +30,8 @@ function rsctl.new(redstone_rtus)
     ---@param value boolean
     function public.digital_write(port, value)
         for i = 1, #redstone_rtus do
-            local db = redstone_rtus[i].get_db()    ---@type redstone_session_db
-            local io = db.io[port]                  ---@type rs_db_dig_io|nil
+            local db = redstone_rtus[i].get_db() ---@type redstone_session_db
+            local io = db.io[port]               ---@type rs_db_dig_io|nil
             if io ~= nil then io.write(value) end
         end
     end
@@ -40,12 +42,25 @@ function rsctl.new(redstone_rtus)
     ---@return boolean|nil
     function public.digital_read(port)
         for i = 1, #redstone_rtus do
-            local db = redstone_rtus[i].get_db()    ---@type redstone_session_db
-            local io = db.io[port]                  ---@type rs_db_dig_io|nil
+            local db = redstone_rtus[i].get_db() ---@type redstone_session_db
+            local io = db.io[port]               ---@type rs_db_dig_io|nil
             if io ~= nil then return io.read() end
         end
     end
 
+    -- write to an analog redstone port (applies to all RTUs)
+    ---@param port IO_PORT
+    ---@param value number value
+    ---@param min number minimum value for scaling 0 to 15
+    ---@param max number maximum value for scaling 0 to 15
+    function public.analog_write(port, value, min, max)
+        for i = 1, #redstone_rtus do
+            local db = redstone_rtus[i].get_db() ---@type redstone_session_db
+            local io = db.io[port]               ---@type rs_db_ana_io|nil
+            if io ~= nil then io.write(rsio.analog_write(value, min, max)) end
+        end
+    end
+
     return public
 end
 

supervisor/startup.lua

@@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
 
 local svsessions = require("supervisor.session.svsessions")
 
-local SUPERVISOR_VERSION = "v1.3.6"
+local SUPERVISOR_VERSION = "v1.3.7"
 
 local println = util.println
 local println_ts = util.println_ts