From 1242c5a81cc1101a300fb340d158662c206605c7 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 4 Jun 2022 11:17:54 -0400 Subject: [PATCH] use TXN_TAGS for consistency --- supervisor/session/rtu/boiler.lua | 4 ++-- supervisor/session/rtu/emachine.lua | 4 ++-- supervisor/session/rtu/envd.lua | 2 +- supervisor/session/rtu/redstone.lua | 4 ++-- supervisor/session/rtu/turbine.lua | 6 +++--- supervisor/startup.lua | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/supervisor/session/rtu/boiler.lua b/supervisor/session/rtu/boiler.lua index f34dbc3..afb31f8 100644 --- a/supervisor/session/rtu/boiler.lua +++ b/supervisor/session/rtu/boiler.lua @@ -123,7 +123,7 @@ function boiler.new(session_id, unit_id, advert, out_queue) self.db.build.superheaters = m_pkt.data[6] self.db.build.max_boil_rate = m_pkt.data[7] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (boiler.build)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == TXN_TYPES.STATE then -- state response @@ -132,7 +132,7 @@ function boiler.new(session_id, unit_id, advert, out_queue) self.db.state.temperature = m_pkt.data[1] self.db.state.boil_rate = m_pkt.data[2] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (boiler.state)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == TXN_TYPES.TANKS then -- tanks response diff --git a/supervisor/session/rtu/emachine.lua b/supervisor/session/rtu/emachine.lua index fa34d21..b054965 100644 --- a/supervisor/session/rtu/emachine.lua +++ b/supervisor/session/rtu/emachine.lua @@ -87,7 +87,7 @@ function emachine.new(session_id, unit_id, advert, out_queue) if m_pkt.length == 1 then self.db.build.max_energy = m_pkt.data[1] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (emachine.build)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == TXN_TYPES.STORAGE then -- storage response @@ -96,7 +96,7 @@ function emachine.new(session_id, unit_id, advert, out_queue) self.db.storage.energy_need = m_pkt.data[2] self.db.storage.energy_fill = m_pkt.data[3] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (emachine.storage)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == nil then log.error(log_tag .. "unknown transaction reply") diff --git a/supervisor/session/rtu/envd.lua b/supervisor/session/rtu/envd.lua index ce398e4..269d8fa 100644 --- a/supervisor/session/rtu/envd.lua +++ b/supervisor/session/rtu/envd.lua @@ -71,7 +71,7 @@ function envd.new(session_id, unit_id, advert, out_queue) self.db.radiation = m_pkt.data[1] self.db.radiation_raw = m_pkt.data[2] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (envd.radiation)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == nil then log.error(log_tag .. "unknown transaction reply") diff --git a/supervisor/session/rtu/redstone.lua b/supervisor/session/rtu/redstone.lua index 3200eef..81be32f 100644 --- a/supervisor/session/rtu/redstone.lua +++ b/supervisor/session/rtu/redstone.lua @@ -149,7 +149,7 @@ function redstone.new(session_id, unit_id, advert, out_queue) self.db[channel] = value end else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (redstone.di_read)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == TXN_TYPES.INPUT_REG_READ then -- input register read response @@ -160,7 +160,7 @@ function redstone.new(session_id, unit_id, advert, out_queue) self.db[channel] = value end else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (redstone.input_reg_read)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == TXN_TYPES.COIL_WRITE or txn_type == TXN_TYPES.HOLD_REG_WRITE then -- successful acknowledgement diff --git a/supervisor/session/rtu/turbine.lua b/supervisor/session/rtu/turbine.lua index c6578fa..352f57e 100644 --- a/supervisor/session/rtu/turbine.lua +++ b/supervisor/session/rtu/turbine.lua @@ -120,7 +120,7 @@ function turbine.new(session_id, unit_id, advert, out_queue) self.db.build.max_production = m_pkt.data[8] self.db.build.max_water_output = m_pkt.data[9] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (turbine.build)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == TXN_TYPES.STATE then -- state response @@ -130,7 +130,7 @@ function turbine.new(session_id, unit_id, advert, out_queue) self.db.state.steam_input_rate = m_pkt.data[3] self.db.state.dumping_mode = m_pkt.data[4] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (turbine.state)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == TXN_TYPES.TANKS then -- tanks response @@ -139,7 +139,7 @@ function turbine.new(session_id, unit_id, advert, out_queue) self.db.tanks.steam_need = m_pkt.data[2] self.db.tanks.steam_fill = m_pkt.data[3] else - log.debug(log_tag .. "MODBUS transaction reply length mismatch (turbine.tanks)") + log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")") end elseif txn_type == nil then log.error(log_tag .. "unknown transaction reply") diff --git a/supervisor/startup.lua b/supervisor/startup.lua index 32cc86e..bfdd925 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -13,7 +13,7 @@ local svsessions = require("supervisor.session.svsessions") local config = require("supervisor.config") local supervisor = require("supervisor.supervisor") -local SUPERVISOR_VERSION = "beta-v0.4.5" +local SUPERVISOR_VERSION = "beta-v0.4.6" local print = util.print local println = util.println