#64 rtu code cleanup and device bugfixes

rtu/dev/boilerv_rtu.lua

@@ -4,55 +4,52 @@ local boilerv_rtu = {}
 
 -- create new boiler (mek 10.1+) device
 ---@param boiler table
-boilerv_rtu.new = function (boiler)
-    local self = {
-        rtu = rtu.init_unit(),
-        boiler = boiler
-    }
+function boilerv_rtu.new(boiler)
+    local unit = rtu.init_unit()
 
     -- discrete inputs --
-    self.rtu.connect_di(self.boiler.isFormed)
+    unit.connect_di(boiler.isFormed)
 
     -- coils --
     -- none
 
     -- input registers --
     -- multiblock properties
-    self.rtu.connect_input_reg(self.boiler.getLength)
-    self.rtu.connect_input_reg(self.boiler.getWidth)
-    self.rtu.connect_input_reg(self.boiler.getHeight)
-    self.rtu.connect_input_reg(self.boiler.getMinPos)
-    self.rtu.connect_input_reg(self.boiler.getMaxPos)
+    unit.connect_input_reg(boiler.getLength)
+    unit.connect_input_reg(boiler.getWidth)
+    unit.connect_input_reg(boiler.getHeight)
+    unit.connect_input_reg(boiler.getMinPos)
+    unit.connect_input_reg(boiler.getMaxPos)
     -- 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)
-    self.rtu.connect_input_reg(self.boiler.getEnvironmentalLoss)
+    unit.connect_input_reg(boiler.getBoilCapacity)
+    unit.connect_input_reg(boiler.getSteamCapacity)
+    unit.connect_input_reg(boiler.getWaterCapacity)
+    unit.connect_input_reg(boiler.getHeatedCoolantCapacity)
+    unit.connect_input_reg(boiler.getCooledCoolantCapacity)
+    unit.connect_input_reg(boiler.getSuperheaters)
+    unit.connect_input_reg(boiler.getMaxBoilRate)
+    unit.connect_input_reg(boiler.getEnvironmentalLoss)
     -- current state
-    self.rtu.connect_input_reg(self.boiler.getTemperature)
-    self.rtu.connect_input_reg(self.boiler.getBoilRate)
+    unit.connect_input_reg(boiler.getTemperature)
+    unit.connect_input_reg(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)
+    unit.connect_input_reg(boiler.getSteam)
+    unit.connect_input_reg(boiler.getSteamNeeded)
+    unit.connect_input_reg(boiler.getSteamFilledPercentage)
+    unit.connect_input_reg(boiler.getWater)
+    unit.connect_input_reg(boiler.getWaterNeeded)
+    unit.connect_input_reg(boiler.getWaterFilledPercentage)
+    unit.connect_input_reg(boiler.getHeatedCoolant)
+    unit.connect_input_reg(boiler.getHeatedCoolantNeeded)
+    unit.connect_input_reg(boiler.getHeatedCoolantFilledPercentage)
+    unit.connect_input_reg(boiler.getCooledCoolant)
+    unit.connect_input_reg(boiler.getCooledCoolantNeeded)
+    unit.connect_input_reg(boiler.getCooledCoolantFilledPercentage)
 
     -- holding registers --
     -- none
 
-    return self.rtu.interface()
+    return unit.interface()
 end
 
 return boilerv_rtu