#33 lua module/require architecture changeover

rtu/dev/boiler_rtu.lua

@@ -1,8 +1,10 @@
--- #REQUIRES rtu.lua
+local rtu = require("rtu")
 
-function new(boiler)
+local boiler_rtu = {}
+
+boiler_rtu.new = function (boiler)
     local self = {
-        rtu = rtu.rtu_init(),
+        rtu = rtu.init_unit(),
         boiler = boiler
     }
 
@@ -49,3 +51,5 @@ function new(boiler)
         rtu_interface = rtu_interface
     }
 end
+
+return boiler_rtu

rtu/dev/boilerv_rtu.lua

@@ -1,8 +1,10 @@
--- #REQUIRES rtu.lua
+local rtu = require("rtu")
 
-function new(boiler)
+local boilerv_rtu = {}
+
+boilerv_rtu.new = function (boiler)
     local self = {
-        rtu = rtu.rtu_init(),
+        rtu = rtu.init_unit(),
         boiler = boiler
     }
 
@@ -54,3 +56,5 @@ function new(boiler)
         rtu_interface = rtu_interface
     }
 end
+
+return boilerv_rtu

rtu/dev/energymachine_rtu.lua

@@ -1,8 +1,10 @@
--- #REQUIRES rtu.lua
+local rtu = require("rtu")
 
-function new(machine)
+local energymachine_rtu = {}
+
+energymachine_rtu.new = function (machine)
     local self = {
-        rtu = rtu.rtu_init(),
+        rtu = rtu.init_unit(),
         machine = machine
     }
 
@@ -31,3 +33,5 @@ function new(machine)
         rtu_interface = rtu_interface
     }
 end
+
+return energymachine_rtu

rtu/dev/imatrix_rtu.lua

@@ -1,8 +1,10 @@
--- #REQUIRES rtu.lua
+local rtu = require("rtu")
 
-function new(imatrix)
+local imatrix_rtu = {}
+
+imatrix_rtu.new = function (imatrix)
     local self = {
-        rtu = rtu.rtu_init(),
+        rtu = rtu.init_unit(),
         imatrix = imatrix
     }
 
@@ -42,3 +44,5 @@ function new(imatrix)
         rtu_interface = rtu_interface
     }
 end
+
+return imatrix_rtu

rtu/dev/redstone_rtu.lua

@@ -1,13 +1,14 @@
--- #REQUIRES rtu.lua
--- #REQUIRES rsio.lua
--- note: this RTU makes extensive use of the programming concept of closures
+local rtu = require("rtu")
+local rsio = require("scada-common.rsio")
+
+local redstone_rtu = {}
 
 local digital_read = rsio.digital_read
 local digital_is_active = rsio.digital_is_active
 
-function new()
+redstone_rtu.new = function ()
     local self = {
-        rtu = rtu.rtu_init()
+        rtu = rtu.init_unit()
     }
 
     local rtu_interface = function ()
@@ -91,3 +92,5 @@ function new()
         link_ao = link_ao
     }
 end
+
+return redstone_rtu

rtu/dev/turbine_rtu.lua

@@ -1,8 +1,10 @@
--- #REQUIRES rtu.lua
+local rtu = require("rtu")
 
-function new(turbine)
+local turbine_rtu = {}
+
+turbine_rtu.new = function (turbine)
     local self = {
-        rtu = rtu.rtu_init(),
+        rtu = rtu.init_unit(),
         turbine = turbine
     }
 
@@ -44,3 +46,5 @@ function new(turbine)
         rtu_interface = rtu_interface
     }
 end
+
+return turbine_rtu

rtu/dev/turbinev_rtu.lua

@@ -1,8 +1,10 @@
--- #REQUIRES rtu.lua
+local rtu = require("rtu")
 
-function new(turbine)
+local turbinev_rtu = {}
+
+turbinev_rtu.new = function (turbine)
     local self = {
-        rtu = rtu.rtu_init(),
+        rtu = rtu.init_unit(),
         turbine = turbine
     }
 
@@ -14,8 +16,8 @@ function new(turbine)
     -- none
 
     -- coils --
-    self.rtu.connect_coil(function () self.turbine.incrementDumpingMode() end), function () end)
-    self.rtu.connect_coil(function () self.turbine.decrementDumpingMode() end), function () end)
+    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
@@ -54,3 +56,5 @@ function new(turbine)
         rtu_interface = rtu_interface
     }
 end
+
+return turbinev_rtu