#27 mekanism 10.1+ RTU support

rtu/dev/boilerv_rtu.lua

@@ -0,0 +1,56 @@
+-- #REQUIRES rtu.lua
+
+function new(boiler)
+    local self = {
+        rtu = rtu.rtu_init(),
+        boiler = boiler
+    }
+
+    local rtu_interface = function ()
+        return self.rtu
+    end
+
+    -- discrete inputs --
+    -- none
+
+    -- coils --
+    -- none
+
+    -- input registers --
+    -- multiblock properties
+    self.rtu.connect_input_reg(self.boiler.isFormed)
+    self.rtu.connect_input_reg(self.boiler.getLength)
+    self.rtu.connect_input_reg(self.boiler.getWidth)
+    self.rtu.connect_input_reg(self.boiler.getHeight)
+    -- build properties
+    self.rtu.connect_input_reg(self.boiler.getBoilCapacity)
+    self.rtu.connect_input_reg(self.boiler.getSteamCapacity)
+    self.rtu.connect_input_reg(self.boiler.getWaterCapacity)
+    self.rtu.connect_input_reg(self.boiler.getHeatedCoolantCapacity)
+    self.rtu.connect_input_reg(self.boiler.getCooledCoolantCapacity)
+    self.rtu.connect_input_reg(self.boiler.getSuperheaters)
+    self.rtu.connect_input_reg(self.boiler.getMaxBoilRate)
+    -- current state
+    self.rtu.connect_input_reg(self.boiler.getTemperature)
+    self.rtu.connect_input_reg(self.boiler.getBoilRate)
+    -- tanks
+    self.rtu.connect_input_reg(self.boiler.getSteam)
+    self.rtu.connect_input_reg(self.boiler.getSteamNeeded)
+    self.rtu.connect_input_reg(self.boiler.getSteamFilledPercentage)
+    self.rtu.connect_input_reg(self.boiler.getWater)
+    self.rtu.connect_input_reg(self.boiler.getWaterNeeded)
+    self.rtu.connect_input_reg(self.boiler.getWaterFilledPercentage)
+    self.rtu.connect_input_reg(self.boiler.getHeatedCoolant)
+    self.rtu.connect_input_reg(self.boiler.getHeatedCoolantNeeded)
+    self.rtu.connect_input_reg(self.boiler.getHeatedCoolantFilledPercentage)
+    self.rtu.connect_input_reg(self.boiler.getCooledCoolant)
+    self.rtu.connect_input_reg(self.boiler.getCooledCoolantNeeded)
+    self.rtu.connect_input_reg(self.boiler.getCooledCoolantFilledPercentage)
+
+    -- holding registers --
+    -- none
+
+    return {
+        rtu_interface = rtu_interface
+    }
+end

rtu/dev/imatrix_rtu.lua

@@ -17,19 +17,21 @@ function new(imatrix)
     -- none
 
     -- input registers --
-    -- @todo check these on Mekanism 10.1+
+    -- multiblock properties
+    self.rtu.connect_input_reg(self.boiler.isFormed)
+    self.rtu.connect_input_reg(self.boiler.getLength)
+    self.rtu.connect_input_reg(self.boiler.getWidth)
+    self.rtu.connect_input_reg(self.boiler.getHeight)
     -- build properties
+    self.rtu.connect_input_reg(self.imatrix.getMaxEnergy)
     self.rtu.connect_input_reg(self.imatrix.getTransferCap)
     self.rtu.connect_input_reg(self.imatrix.getInstalledCells)
     self.rtu.connect_input_reg(self.imatrix.getInstalledProviders)
-    self.rtu.connect_input_reg(self.imatrix.getTotalMaxEnergy)
     -- containers
-    self.rtu.connect_input_reg(self.imatrix.getTotalEnergy)
-    self.rtu.connect_input_reg(self.imatrix.getTotalEnergyNeeded)
-    self.rtu.connect_input_reg(self.imatrix.getTotalEnergyFilledPercentage)
-    -- additional fields? check these on 10.1
-    self.rtu.connect_input_reg(self.imatrix.getInputItem)
-    self.rtu.connect_input_reg(self.imatrix.getOutputItem)
+    self.rtu.connect_input_reg(self.imatrix.getEnergy)
+    self.rtu.connect_input_reg(self.imatrix.getEnergyNeeded)
+    self.rtu.connect_input_reg(self.imatrix.getEnergyFilledPercentage)
+    -- I/O rates
     self.rtu.connect_input_reg(self.imatrix.getLastInput)
     self.rtu.connect_input_reg(self.imatrix.getLastOutput)
 

rtu/dev/turbinev_rtu.lua

@@ -0,0 +1,55 @@
+-- #REQUIRES rtu.lua
+
+function new(turbine)
+    local self = {
+        rtu = rtu.rtu_init(),
+        turbine = turbine
+    }
+
+    local rtu_interface = function ()
+        return self.rtu
+    end
+
+    -- discrete inputs --
+    -- none
+
+    -- coils --
+    self.rtu.connect_coil(function () self.turbine.incrementDumpingMode() end), function () end)
+    self.rtu.connect_coil(function () self.turbine.decrementDumpingMode() end), function () end)
+
+    -- input registers --
+    -- multiblock properties
+    self.rtu.connect_input_reg(self.boiler.isFormed)
+    self.rtu.connect_input_reg(self.boiler.getLength)
+    self.rtu.connect_input_reg(self.boiler.getWidth)
+    self.rtu.connect_input_reg(self.boiler.getHeight)
+    -- build properties
+    self.rtu.connect_input_reg(self.turbine.getBlades)
+    self.rtu.connect_input_reg(self.turbine.getCoils)
+    self.rtu.connect_input_reg(self.turbine.getVents)
+    self.rtu.connect_input_reg(self.turbine.getDispersers)
+    self.rtu.connect_input_reg(self.turbine.getCondensers)
+    self.rtu.connect_input_reg(self.turbine.getDumpingMode)
+    self.rtu.connect_input_reg(self.turbine.getSteamCapacity)
+    self.rtu.connect_input_reg(self.turbine.getMaxFlowRate)
+    self.rtu.connect_input_reg(self.turbine.getMaxWaterOutput)
+    self.rtu.connect_input_reg(self.turbine.getMaxProduction)
+    -- current state
+    self.rtu.connect_input_reg(self.turbine.getFlowRate)
+    self.rtu.connect_input_reg(self.turbine.getProductionRate)
+    self.rtu.connect_input_reg(self.turbine.getLastSteamInputRate)
+    -- tanks/containers
+    self.rtu.connect_input_reg(self.turbine.getSteam)
+    self.rtu.connect_input_reg(self.turbine.getSteamNeeded)
+    self.rtu.connect_input_reg(self.turbine.getSteamFilledPercentage)
+    self.rtu.connect_input_reg(self.turbine.getEnergy)
+    self.rtu.connect_input_reg(self.turbine.getEnergyNeeded)
+    self.rtu.connect_input_reg(self.turbine.getEnergyFilledPercentage)
+
+    -- holding registers --
+    self.rtu.conenct_holding_reg(self.turbine.setDumpingMode, self.turbine.getDumpingMode)
+
+    return {
+        rtu_interface = rtu_interface
+    }
+end