diff --git a/coordinator/coordinator.lua b/coordinator/coordinator.lua index d5f930d..7999679 100644 --- a/coordinator/coordinator.lua +++ b/coordinator/coordinator.lua @@ -47,6 +47,10 @@ function coordinator.load_config() config.FlowDisplay = settings.get("FlowDisplay") config.UnitDisplays = settings.get("UnitDisplays") + config.WirelessModem = settings.get("WirelessModem") + config.WiredModem = settings.get("WiredModem") + config.PreferWireless = settings.get("PreferWireless") + config.API_Enabled = settings.get("API_Enabled") config.SVR_Channel = settings.get("SVR_Channel") config.CRD_Channel = settings.get("CRD_Channel") config.PKT_Channel = settings.get("PKT_Channel") @@ -80,6 +84,13 @@ function coordinator.load_config() cfv.assert_type_num(config.SpeakerVolume) cfv.assert_range(config.SpeakerVolume, 0, 3) + cfv.assert_type_bool(config.WirelessModem) + cfv.assert((config.WiredModem == false) or (type(config.WiredModem) == "string")) + cfv.assert(config.WirelessModem or (type(config.WiredModem) == "string")) + cfv.assert_type_bool(config.PreferWireless) + + cfv.assert_type_bool(config.API_Enabled) + cfv.assert_channel(config.SVR_Channel) cfv.assert_channel(config.CRD_Channel) cfv.assert_channel(config.PKT_Channel) diff --git a/reactor-plc/plc.lua b/reactor-plc/plc.lua index 3aa5b01..e388575 100644 --- a/reactor-plc/plc.lua +++ b/reactor-plc/plc.lua @@ -45,12 +45,12 @@ function plc.load_config() config.EmerCoolColor = settings.get("EmerCoolColor") config.EmerCoolInvert = settings.get("EmerCoolInvert") - config.SVR_Channel = settings.get("SVR_Channel") - config.PLC_Channel = settings.get("PLC_Channel") - config.ConnTimeout = settings.get("ConnTimeout") config.WirelessModem = settings.get("WirelessModem") config.WiredModem = settings.get("WiredModem") config.PreferWireless = settings.get("PreferWireless") + config.SVR_Channel = settings.get("SVR_Channel") + config.PLC_Channel = settings.get("PLC_Channel") + config.ConnTimeout = settings.get("ConnTimeout") config.TrustedRange = settings.get("TrustedRange") config.AuthKey = settings.get("AuthKey") @@ -74,14 +74,14 @@ function plc.validate_config(cfg) cfv.assert_type_bool(cfg.EmerCoolEnable) if cfg.Networked then - cfv.assert_channel(cfg.SVR_Channel) - cfv.assert_channel(cfg.PLC_Channel) - cfv.assert_type_num(cfg.ConnTimeout) - cfv.assert_min(cfg.ConnTimeout, 2) cfv.assert_type_bool(cfg.WirelessModem) cfv.assert((cfg.WiredModem == false) or (type(cfg.WiredModem) == "string")) cfv.assert(cfg.WirelessModem or (type(cfg.WiredModem) == "string")) cfv.assert_type_bool(cfg.PreferWireless) + cfv.assert_channel(cfg.SVR_Channel) + cfv.assert_channel(cfg.PLC_Channel) + cfv.assert_type_num(cfg.ConnTimeout) + cfv.assert_min(cfg.ConnTimeout, 2) cfv.assert_type_num(cfg.TrustedRange) cfv.assert_min(cfg.TrustedRange, 0) cfv.assert_type_str(cfg.AuthKey) diff --git a/rtu/rtu.lua b/rtu/rtu.lua index a4c9657..3efbcf7 100644 --- a/rtu/rtu.lua +++ b/rtu/rtu.lua @@ -33,12 +33,12 @@ function rtu.load_config() config.SpeakerVolume = settings.get("SpeakerVolume") - config.SVR_Channel = settings.get("SVR_Channel") - config.RTU_Channel = settings.get("RTU_Channel") - config.ConnTimeout = settings.get("ConnTimeout") config.WirelessModem = settings.get("WirelessModem") config.WiredModem = settings.get("WiredModem") config.PreferWireless = settings.get("PreferWireless") + config.SVR_Channel = settings.get("SVR_Channel") + config.RTU_Channel = settings.get("RTU_Channel") + config.ConnTimeout = settings.get("ConnTimeout") config.TrustedRange = settings.get("TrustedRange") config.AuthKey = settings.get("AuthKey") @@ -60,14 +60,14 @@ function rtu.validate_config(cfg) cfv.assert_type_num(cfg.SpeakerVolume) cfv.assert_range(cfg.SpeakerVolume, 0, 3) - cfv.assert_channel(cfg.SVR_Channel) - cfv.assert_channel(cfg.RTU_Channel) - cfv.assert_type_num(cfg.ConnTimeout) - cfv.assert_min(cfg.ConnTimeout, 2) cfv.assert_type_bool(cfg.WirelessModem) cfv.assert((cfg.WiredModem == false) or (type(cfg.WiredModem) == "string")) cfv.assert(cfg.WirelessModem or (type(cfg.WiredModem) == "string")) cfv.assert_type_bool(cfg.PreferWireless) + cfv.assert_channel(cfg.SVR_Channel) + cfv.assert_channel(cfg.RTU_Channel) + cfv.assert_type_num(cfg.ConnTimeout) + cfv.assert_min(cfg.ConnTimeout, 2) cfv.assert_type_num(cfg.TrustedRange) cfv.assert_min(cfg.TrustedRange, 0) cfv.assert_type_str(cfg.AuthKey) diff --git a/supervisor/supervisor.lua b/supervisor/supervisor.lua index 3778f3a..88d7d25 100644 --- a/supervisor/supervisor.lua +++ b/supervisor/supervisor.lua @@ -53,6 +53,16 @@ function supervisor.load_config() config.AuxiliaryCoolant = settings.get("AuxiliaryCoolant") config.ExtChargeIdling = settings.get("ExtChargeIdling") + config.WirelessModem = settings.get("WirelessModem") + config.WiredModem = settings.get("WiredModem") + + config.PLC_Listen = settings.get("PLC_Listen") + config.RTU_Listen = settings.get("RTU_Listen") + config.CRD_Listen = settings.get("CRD_Listen") + + config.PocketEnabled = settings.get("PocketEnabled") + config.PocketTest = settings.get("PocketTest") + config.SVR_Channel = settings.get("SVR_Channel") config.PLC_Channel = settings.get("PLC_Channel") config.RTU_Channel = settings.get("RTU_Channel") @@ -64,16 +74,6 @@ function supervisor.load_config() config.CRD_Timeout = settings.get("CRD_Timeout") config.PKT_Timeout = settings.get("PKT_Timeout") - config.WirelessModem = settings.get("WirelessModem") - config.WiredModem = settings.get("WiredModem") - - config.PLC_Listen = settings.get("PLC_Listen") - config.RTU_Listen = settings.get("RTU_Listen") - config.CRD_Listen = settings.get("CRD_Listen") - - config.PocketEnabled = settings.get("PocketEnabled") - config.PocketTest = settings.get("PocketTest") - config.TrustedRange = settings.get("TrustedRange") config.AuthKey = settings.get("AuthKey") @@ -100,6 +100,20 @@ function supervisor.load_config() cfv.assert_type_bool(config.ExtChargeIdling) + cfv.assert_type_bool(config.WirelessModem) + cfv.assert((config.WiredModem == false) or (type(config.WiredModem) == "string")) + cfv.assert((config.WirelessModem == true) or (type(config.WiredModem) == "string")) + + cfv.assert_type_num(config.PLC_Listen) + cfv.assert_range(config.PLC_Listen, 0, 2) + cfv.assert_type_num(config.RTU_Listen) + cfv.assert_range(config.RTU_Listen, 0, 2) + cfv.assert_type_num(config.CRD_Listen) + cfv.assert_range(config.CRD_Listen, 0, 2) + + cfv.assert_type_bool(config.PocketEnabled) + cfv.assert_type_bool(config.PocketTest) + cfv.assert_channel(config.SVR_Channel) cfv.assert_channel(config.PLC_Channel) cfv.assert_channel(config.RTU_Channel) @@ -115,20 +129,6 @@ function supervisor.load_config() cfv.assert_type_num(config.PKT_Timeout) cfv.assert_min(config.PKT_Timeout, 2) - cfv.assert_type_bool(config.WirelessModem) - cfv.assert((config.WiredModem == false) or (type(config.WiredModem) == "string")) - cfv.assert((config.WirelessModem == true) or (type(config.WiredModem) == "string")) - - cfv.assert_type_num(config.PLC_Listen) - cfv.assert_range(config.PLC_Listen, 0, 2) - cfv.assert_type_num(config.RTU_Listen) - cfv.assert_range(config.RTU_Listen, 0, 2) - cfv.assert_type_num(config.CRD_Listen) - cfv.assert_range(config.CRD_Listen, 0, 2) - - cfv.assert_type_bool(config.PocketEnabled) - cfv.assert_type_bool(config.PocketTest) - cfv.assert_type_num(config.TrustedRange) cfv.assert_min(config.TrustedRange, 0)