#33 lua module/require architecture changeover

supervisor/startup.lua

@@ -2,23 +2,19 @@
 -- Nuclear Generation Facility SCADA Supervisor
 --
 
-os.loadAPI("scada-common/log.lua")
-os.loadAPI("scada-common/types.lua")
-os.loadAPI("scada-common/util.lua")
-os.loadAPI("scada-common/ppm.lua")
-os.loadAPI("scada-common/comms.lua")
-os.loadAPI("scada-common/mqueue.lua")
+local log = require("scada-common.log")
+local ppm = require("scada-common.ppm")
+local util = require("scada-common.util")
 
-os.loadAPI("config.lua")
+local coordinator = require("session.coordinator")
+local plc = require("session.plc")
+local rtu = require("session.rtu")
+local svsessions = require("session.svsessions")
 
-os.loadAPI("session/rtu.lua")
-os.loadAPI("session/plc.lua")
-os.loadAPI("session/coordinator.lua")
-os.loadAPI("session/svsessions.lua")
+local config = require("config")
+local supervisor = require("supervisor")
 
-os.loadAPI("supervisor.lua")
-
-local SUPERVISOR_VERSION = "alpha-v0.2.0"
+local SUPERVISOR_VERSION = "alpha-v0.3.0"
 
 local print = util.print
 local println = util.println
@@ -27,9 +23,9 @@ local println_ts = util.println_ts
 
 log.init(config.LOG_PATH, config.LOG_MODE)
 
-log._info("========================================")
-log._info("BOOTING supervisor.startup " .. SUPERVISOR_VERSION)
-log._info("========================================")
+log.info("========================================")
+log.info("BOOTING supervisor.startup " .. SUPERVISOR_VERSION)
+log.info("========================================")
 println(">> SCADA Supervisor " .. SUPERVISOR_VERSION .. " <<")
 
 -- mount connected devices
@@ -38,12 +34,12 @@ ppm.mount_all()
 local modem = ppm.get_wireless_modem()
 if modem == nil then
     println("boot> wireless modem not found")
-    log._warning("no wireless modem on startup")
+    log.warning("no wireless modem on startup")
     return
 end
 
 -- start comms, open all channels
-local superv_comms = supervisor.superv_comms(config.NUM_REACTORS, modem, config.SCADA_DEV_LISTEN, config.SCADA_SV_LISTEN)
+local superv_comms = supervisor.comms(config.NUM_REACTORS, modem, config.SCADA_DEV_LISTEN, config.SCADA_SV_LISTEN)
 
 -- base loop clock (6.67Hz, 3 ticks)
 local MAIN_CLOCK = 0.15
@@ -61,9 +57,9 @@ while true do
             -- we only care if this is our wireless modem
             if device.dev == modem then
                 println_ts("wireless modem disconnected!")
-                log._error("comms modem disconnected!")
+                log.error("comms modem disconnected!")
             else
-                log._warning("non-comms modem disconnected")
+                log.warning("non-comms modem disconnected")
             end
         end
     elseif event == "peripheral" then
@@ -76,9 +72,9 @@ while true do
                 superv_comms.reconnect_modem(modem)
 
                 println_ts("wireless modem reconnected.")
-                log._info("comms modem reconnected.")
+                log.info("comms modem reconnected.")
             else
-                log._info("wired modem reconnected.")
+                log.info("wired modem reconnected.")
             end
         end
     elseif event == "timer" and param1 == loop_clock then
@@ -103,12 +99,12 @@ while true do
     -- check for termination request
     if event == "terminate" or ppm.should_terminate() then
         println_ts("closing sessions...")
-        log._info("terminate requested, closing sessions...")
+        log.info("terminate requested, closing sessions...")
         svsessions.close_all()
-        log._info("sessions closed")
+        log.info("sessions closed")
         break
     end
 end
 
 println_ts("exited")
-log._info("exited")
+log.info("exited")