Merge branch 'pocket-alpha-dev' of github.com:MikaylaFischler/cc-mek-…

…scada into pocket-alpha-dev
MikaylaFischler · Oct 5, 2024 · 9521acd · 9521acd
2 parents 6a04354 + 749c844
commit 9521acd
Show file tree

Hide file tree

Showing 8 changed files with 474 additions and 411 deletions.
diff --git a/coordinator/configure.lua b/coordinator/configure.lua
@@ -118,25 +118,25 @@ local tmp_cfg = {
     UnitCount = 1,
     SpeakerVolume = 1.0,
     Time24Hour = true,
-    TempScale = 1,
-    EnergyScale = 1,
+    TempScale = 1,          ---@type TEMP_SCALE
+    EnergyScale = 1,        ---@type ENERGY_SCALE
     DisableFlowView = false,
-    MainDisplay = nil,  ---@type string
-    FlowDisplay = nil,  ---@type string
-    UnitDisplays = {},
-    SVR_Channel = nil,  ---@type integer
-    CRD_Channel = nil,  ---@type integer
-    PKT_Channel = nil,  ---@type integer
-    SVR_Timeout = nil,  ---@type number
-    API_Timeout = nil,  ---@type number
-    TrustedRange = nil, ---@type number
-    AuthKey = nil,      ---@type string|nil
-    LogMode = 0,
+    MainDisplay = nil,      ---@type string
+    FlowDisplay = nil,      ---@type string
+    UnitDisplays = {},      ---@type string[]
+    SVR_Channel = nil,      ---@type integer
+    CRD_Channel = nil,      ---@type integer
+    PKT_Channel = nil,      ---@type integer
+    SVR_Timeout = nil,      ---@type number
+    API_Timeout = nil,      ---@type number
+    TrustedRange = nil,     ---@type number
+    AuthKey = nil,          ---@type string|nil
+    LogMode = 0,            ---@type LOG_MODE
     LogPath = "",
     LogDebug = false,
-    MainTheme = 1,
-    FrontPanelTheme = 1,
-    ColorMode = 1
+    MainTheme = 1,          ---@type UI_THEME
+    FrontPanelTheme = 1,    ---@type FP_THEME
+    ColorMode = 1           ---@type COLOR_MODE
 }
 
 ---@class crd_config

diff --git a/pocket/config/system.lua b/pocket/config/system.lua
diff --git a/pocket/configure.lua b/pocket/configure.lua
diff --git a/pocket/startup.lua b/pocket/startup.lua
@@ -20,7 +20,7 @@ local pocket    = require("pocket.pocket")
 local renderer  = require("pocket.renderer")
 local threads   = require("pocket.threads")
 
-local POCKET_VERSION = "v0.12.3-alpha"
+local POCKET_VERSION = "v0.12.4-alpha"
 
 local println = util.println
 local println_ts = util.println_ts

diff --git a/reactor-plc/configure.lua b/reactor-plc/configure.lua
@@ -80,11 +80,11 @@ local tmp_cfg = {
     ConnTimeout = nil,      ---@type number
     TrustedRange = nil,     ---@type number
     AuthKey = nil,          ---@type string|nil
-    LogMode = 0,
+    LogMode = 0,            ---@type LOG_MODE
     LogPath = "",
     LogDebug = false,
-    FrontPanelTheme = 1,
-    ColorMode = 1
+    FrontPanelTheme = 1,    ---@type FP_THEME
+    ColorMode = 1           ---@type COLOR_MODE
 }
 
 ---@class plc_config

diff --git a/rtu/configure.lua b/rtu/configure.lua
@@ -80,18 +80,18 @@ local tool_ctl = {
 ---@class rtu_config
 local tmp_cfg = {
     SpeakerVolume = 1.0,
-    Peripherals = {},   ---@type rtu_peri_definition[]
-    Redstone = {},      ---@type rtu_rs_definition[]
-    SVR_Channel = nil,  ---@type integer
-    RTU_Channel = nil,  ---@type integer
-    ConnTimeout = nil,  ---@type number
-    TrustedRange = nil, ---@type number
-    AuthKey = nil,      ---@type string|nil
-    LogMode = 0,
+    Peripherals = {},    ---@type rtu_peri_definition[]
+    Redstone = {},       ---@type rtu_rs_definition[]
+    SVR_Channel = nil,   ---@type integer
+    RTU_Channel = nil,   ---@type integer
+    ConnTimeout = nil,   ---@type number
+    TrustedRange = nil,  ---@type number
+    AuthKey = nil,       ---@type string|nil
+    LogMode = 0,         ---@type LOG_MODE
     LogPath = "",
     LogDebug = false,
-    FrontPanelTheme = 1,
-    ColorMode = 1
+    FrontPanelTheme = 1, ---@type FP_THEME
+    ColorMode = 1        ---@type COLOR_MODE
 }
 
 ---@class rtu_config

diff --git a/scada-common/log.lua b/scada-common/log.lua
@@ -11,7 +11,7 @@ local COLON, FUNC, ARROW = ":", "():", " > "
 ---@class logger
 local log = {}
 
----@enum MODE
+---@enum LOG_MODE
 local MODE = { APPEND = 0, NEW = 1 }
 
 log.MODE = MODE
@@ -82,7 +82,7 @@ end
 
 -- initialize logger
 ---@param path string file path
----@param write_mode MODE file write mode
+---@param write_mode LOG_MODE file write mode
 ---@param include_debug boolean whether or not to include debug logs
 ---@param dmesg_redirect? Redirect terminal/window to direct dmesg to
 function log.init(path, write_mode, include_debug, dmesg_redirect)

diff --git a/supervisor/configure.lua b/supervisor/configure.lua
@@ -102,11 +102,11 @@ local tmp_cfg = {
     PKT_Timeout = nil,      ---@type number
     TrustedRange = nil,     ---@type number
     AuthKey = nil,          ---@type string|nil
-    LogMode = 0,
+    LogMode = 0,            ---@type LOG_MODE
     LogPath = "",
     LogDebug = false,
-    FrontPanelTheme = 1,
-    ColorMode = 1
+    FrontPanelTheme = 1,    ---@type FP_THEME
+    ColorMode = 1           ---@type COLOR_MODE
 }
 
 ---@class svr_config