From 08e670091abdecc660aed72bab9f9f4987214e3f Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 30 Dec 2023 20:25:57 -0500 Subject: [PATCH] #396 fixed fractional connection timeouts being treated as invalid --- reactor-plc/plc.lua | 2 +- reactor-plc/startup.lua | 2 +- rtu/rtu.lua | 2 +- rtu/startup.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactor-plc/plc.lua b/reactor-plc/plc.lua index 9ad9c69..7287d3d 100644 --- a/reactor-plc/plc.lua +++ b/reactor-plc/plc.lua @@ -58,7 +58,7 @@ function plc.load_config() if config.Networked == true then cfv.assert_channel(config.SVR_Channel) cfv.assert_channel(config.PLC_Channel) - cfv.assert_type_int(config.ConnTimeout) + cfv.assert_type_num(config.ConnTimeout) cfv.assert_min(config.ConnTimeout, 2) cfv.assert_type_num(config.TrustedRange) cfv.assert_min(config.TrustedRange, 0) diff --git a/reactor-plc/startup.lua b/reactor-plc/startup.lua index 803fe99..1e066d0 100644 --- a/reactor-plc/startup.lua +++ b/reactor-plc/startup.lua @@ -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.6.8" +local R_PLC_VERSION = "v1.6.9" local println = util.println local println_ts = util.println_ts diff --git a/rtu/rtu.lua b/rtu/rtu.lua index 20bdbe1..b76ce30 100644 --- a/rtu/rtu.lua +++ b/rtu/rtu.lua @@ -43,7 +43,7 @@ function rtu.load_config() cfv.assert_type_num(config.SpeakerVolume) cfv.assert_channel(config.SVR_Channel) cfv.assert_channel(config.RTU_Channel) - cfv.assert_type_int(config.ConnTimeout) + cfv.assert_type_num(config.ConnTimeout) cfv.assert_min(config.ConnTimeout, 2) cfv.assert_type_num(config.TrustedRange) cfv.assert_min(config.TrustedRange, 0) diff --git a/rtu/startup.lua b/rtu/startup.lua index 1b25859..d05ffe8 100644 --- a/rtu/startup.lua +++ b/rtu/startup.lua @@ -31,7 +31,7 @@ local sna_rtu = require("rtu.dev.sna_rtu") local sps_rtu = require("rtu.dev.sps_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu") -local RTU_VERSION = "v1.7.9" +local RTU_VERSION = "v1.7.10" local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE