GitHub/cc-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into 225-consolidate-network-channels

Browse Source
This commit is contained in:
Mikayla Fischler
2023-06-05 01:18:13 -04:00
parent 337fca7e7c 38fc7189ba
commit 9a5fc92c86
95 changed files with 2338 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
reactor-plc/startup.lua
View File

@@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc")
local renderer = require("reactor-plc.renderer")
local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "v1.3.0"
local R_PLC_VERSION = "v1.4.0"
local println = util.println
local println_ts = util.println_ts
@@ -38,7 +38,6 @@ cfv.assert_type_num(config.COMMS_TIMEOUT)
cfv.assert_min(config.COMMS_TIMEOUT, 2)
cfv.assert_type_str(config.LOG_PATH)
cfv.assert_type_int(config.LOG_MODE)
cfv.assert_type_bool(config.LOG_DEBUG)
assert(cfv.valid(), "bad config file: missing/invalid fields")
@@ -55,7 +54,7 @@ end
-- log init
----------------------------------------
log.init(config.LOG_PATH, config.LOG_MODE, config.LOG_DEBUG)
log.init(config.LOG_PATH, config.LOG_MODE, config.LOG_DEBUG == true)
log.info("========================================")
log.info("BOOTING reactor-plc.startup " .. R_PLC_VERSION)