TheHomecraft/cc-mek-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#629 code cleanup

Browse Source
This commit is contained in:
Mikayla 2025-09-13 00:55:15 +00:00
parent 55685fb6a6
commit afc89ac727
19 changed files with 43 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pocket/iocontrol.lua
View File

@ -17,7 +17,6 @@ local ENERGY_UNITS = types.ENERGY_SCALE_UNITS
local TEMP_SCALE = types.TEMP_SCALE
local TEMP_UNITS = types.TEMP_SCALE_UNITS
---@todo nominal trip time is ping (0ms to 10ms usually)
local WARN_TT = 40
local HIGH_TT = 80

1
pocket/iorx.lua
View File

@ -60,7 +60,6 @@ local function _record_multiblock_status(faulted, data, ps)
ps.publish("formed", data.formed)
ps.publish("faulted", faulted)
---@todo revisit this
if data.build then
for key, val in pairs(data.build) do ps.publish(key, val) end
end

9
pocket/pocket.lua
View File

@ -88,7 +88,7 @@ local APP_ID = {
-- core UI
ROOT = 1,
LOADER = 2,
-- main app pages
-- main apps
UNITS = 3,
FACILITY = 4,
CONTROL = 5,
@ -97,12 +97,11 @@ local APP_ID = {
GUIDE = 8,
ABOUT = 9,
RADMON = 10,
-- diagnostic app pages
-- diagnostic apps
ALARMS = 11,
COMPS = 12,
-- other
DUMMY = 13,
NUM_APPS = 13
-- count
NUM_APPS = 12
}
pocket.APP_ID = APP_ID

1
pocket/ui/apps/comps.lua
View File

@ -32,7 +32,6 @@ local border = core.border
local APP_ID = pocket.APP_ID
local lu_col = style.label_unit_pair
local box_label = cpair(colors.lightGray, colors.gray)
-- new computer list page view

29
pocket/ui/apps/dummy_app.lua
View File

@ -1,29 +0,0 @@
--
-- Placeholder App
--
local iocontrol = require("pocket.iocontrol")
local pocket = require("pocket.pocket")
local core = require("graphics.core")
local Div = require("graphics.elements.Div")
local TextBox = require("graphics.elements.TextBox")
local APP_ID = pocket.APP_ID
-- create placeholder app page
---@param root Container parent
local function create_pages(root)
local db = iocontrol.get_db()
local main = Div{parent=root,x=1,y=1}
db.nav.register_app(APP_ID.DUMMY, main).new_page(nil, function () end)
TextBox{parent=main,text="This app is not implemented yet.",x=1,y=2,alignment=core.ALIGN.CENTER}
TextBox{parent=main,text=" pretend something cool is here \x03",x=1,y=10,alignment=core.ALIGN.CENTER,fg_bg=core.cpair(colors.gray,colors.black)}
end
return create_pages

5
pocket/ui/apps/guide.lua
View File

@ -9,7 +9,6 @@ local iocontrol = require("pocket.iocontrol")
local pocket = require("pocket.pocket")
local docs = require("pocket.ui.docs")
-- local style = require("pocket.ui.style")
local guide_section = require("pocket.ui.pages.guide_section")
@ -31,10 +30,6 @@ local cpair = core.cpair
local APP_ID = pocket.APP_ID
-- local label = style.label
-- local lu_col = style.label_unit_pair
-- local text_fg = style.text_fg
-- new system guide view
---@param root Container parent
local function new_view(root)

3
pocket/ui/apps/unit.lua
View File

@ -312,8 +312,6 @@ local function new_view(root)
c_emg.register(u_ps, "EmergencyCoolant", c_emg.update)
c_mwrf.register(u_ps, "MaxWaterReturnFeed", c_mwrf.update)
-- rcs_div.line_break()
-- TextBox{parent=rcs_div,text="Mismatches",alignment=ALIGN.CENTER,fg_bg=label}
local c_cfm = IconIndicator{parent=rcs_div,label="Coolant Feed",states=yel_ind_s}
local c_brm = IconIndicator{parent=rcs_div,label="Boil Rate",states=yel_ind_s}
local c_sfm = IconIndicator{parent=rcs_div,label="Steam Feed",states=yel_ind_s}
@ -323,7 +321,6 @@ local function new_view(root)
c_sfm.register(u_ps, "SteamFeedMismatch", c_sfm.update)
rcs_div.line_break()
-- TextBox{parent=rcs_div,text="Aggregate Checks",alignment=ALIGN.CENTER,fg_bg=label}
if unit.num_boilers > 0 then
local wll = IconIndicator{parent=rcs_div,label="Boiler Water Lo",states=red_ind_s}

4
pocket/ui/docs.lua
View File

@ -1,3 +1,7 @@
--
-- All the text documentation used in the Guide app is defined in this file.
--
local const = require("scada-common.constants")
local docs = {}

2
pocket/ui/main.lua
View File

@ -10,7 +10,6 @@ local pocket = require("pocket.pocket")
local comps_app = require("pocket.ui.apps.comps")
local control_app = require("pocket.ui.apps.control")
local diag_apps = require("pocket.ui.apps.diag_apps")
local dummy_app = require("pocket.ui.apps.dummy_app")
local facil_app = require("pocket.ui.apps.facility")
local guide_app = require("pocket.ui.apps.guide")
local loader_app = require("pocket.ui.apps.loader")
@ -78,7 +77,6 @@ local function init(main)
sys_apps(page_div)
diag_apps(page_div)
comps_app(page_div)
dummy_app(page_div)
-- verify all apps were created
assert(util.table_len(db.nav.get_containers()) == APP_ID.NUM_APPS, "app IDs were not sequential or some apps weren't registered")

4
pocket/ui/pages/dynamic_tank.lua
View File

@ -1,3 +1,7 @@
--
-- Dynamic Tank View
--
local types = require("scada-common.types")
local util = require("scada-common.util")

4
pocket/ui/pages/facility_matrix.lua
View File

@ -1,3 +1,7 @@
--
-- Induction Matrix View
--
local iocontrol = require("pocket.iocontrol")
local style = require("pocket.ui.style")

4
pocket/ui/pages/facility_sps.lua
View File

@ -1,3 +1,7 @@
--
-- SPS View
--
local iocontrol = require("pocket.iocontrol")
local style = require("pocket.ui.style")

4
pocket/ui/pages/guide_section.lua
View File

@ -1,3 +1,7 @@
--
-- A Guide App Subsection
--
local log = require("scada-common.log")
local util = require("scada-common.util")

2
pocket/ui/pages/home_page.lua
View File

@ -9,11 +9,9 @@ local core = require("graphics.core")
local AppMultiPane = require("graphics.elements.AppMultiPane")
local Div = require("graphics.elements.Div")
local TextBox = require("graphics.elements.TextBox")
local App = require("graphics.elements.controls.App")
local ALIGN = core.ALIGN
local cpair = core.cpair
local APP_ID = pocket.APP_ID

6
pocket/ui/pages/unit_boiler.lua
View File

@ -1,3 +1,7 @@
--
-- Unit Boiler View
--
local types = require("scada-common.types")
local util = require("scada-common.util")
@ -13,8 +17,8 @@ local TextBox = require("graphics.elements.TextBox")
local PushButton = require("graphics.elements.controls.PushButton")
local DataIndicator = require("graphics.elements.indicators.DataIndicator")
local StateIndicator = require("graphics.elements.indicators.StateIndicator")
local IconIndicator = require("graphics.elements.indicators.IconIndicator")
local StateIndicator = require("graphics.elements.indicators.StateIndicator")
local VerticalBar = require("graphics.elements.indicators.VerticalBar")
local ALIGN = core.ALIGN

6
pocket/ui/pages/unit_reactor.lua
View File

@ -1,3 +1,7 @@
--
-- Unit Reactor View
--
local types = require("scada-common.types")
local util = require("scada-common.util")
@ -13,8 +17,8 @@ local TextBox = require("graphics.elements.TextBox")
local PushButton = require("graphics.elements.controls.PushButton")
local DataIndicator = require("graphics.elements.indicators.DataIndicator")
local StateIndicator = require("graphics.elements.indicators.StateIndicator")
local IconIndicator = require("graphics.elements.indicators.IconIndicator")
local StateIndicator = require("graphics.elements.indicators.StateIndicator")
local VerticalBar = require("graphics.elements.indicators.VerticalBar")
local ALIGN = core.ALIGN

4
pocket/ui/pages/unit_turbine.lua
View File

@ -1,3 +1,7 @@
--
-- Unit Turbine View
--
local util = require("scada-common.util")
local iocontrol = require("pocket.iocontrol")