Merge branch 'devel' into rtu-redstone-enhancements

2025-05-03 09:54:29 -04:00
parent e6f5ab8ef4 f1014ce941
commit 07bb0f13e3
7 changed files with 222 additions and 156 deletions
--- a/scada-common/types.lua
+++ b/scada-common/types.lua
@@ -465,7 +465,8 @@ types.ALARM = {
    ReactorHighWaste = 9,
    RPSTransient = 10,
    RCSTransient = 11,
-    TurbineTrip = 12
+    TurbineTrip = 12,
+    FacilityRadiation = 13
 }

 types.ALARM_NAMES = {
@@ -480,7 +481,8 @@ types.ALARM_NAMES = {
    "ReactorHighWaste",
    "RPSTransient",
    "RCSTransient",
-    "TurbineTrip"
+    "TurbineTrip",
+    "FacilityRadiation"
 }

 ---@enum ALARM_PRIORITY
--- a/scada-common/util.lua
+++ b/scada-common/util.lua
@@ -24,7 +24,7 @@ local t_pack   = table.pack
 local util = {}

 -- scada-common version
-util.version = "1.5.1"
+util.version = "1.5.2"

 util.TICK_TIME_S = 0.05
 util.TICK_TIME_MS = 50