Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjusted guide section heights and moved process init to have facility access

Browse Source
This commit is contained in:
Mikayla Fischler 2024-08-27 23:21:49 -04:00
parent 8a0d05c94b
commit 097edc5bf9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pocket/iocontrol.lua
View File

@ -50,12 +50,14 @@ local function __generic_ack(success) end
-- luacheck: unused args -- luacheck: unused args
local config = nil ---@type pkt_config local config = nil ---@type pkt_config
local comms = nil ---@type pocket_comms
-- initialize facility-independent components of pocket iocontrol -- initialize facility-independent components of pocket iocontrol
---@param comms pocket_comms ---@param pkt_comms pocket_comms
---@param nav pocket_nav ---@param nav pocket_nav
---@param cfg pkt_config ---@param cfg pkt_config
function iocontrol.init_core(comms, nav, cfg) function iocontrol.init_core(pkt_comms, nav, cfg)
comms = pkt_comms
config = cfg config = cfg
io.nav = nav io.nav = nav
@ -102,9 +104,6 @@ function iocontrol.init_core(comms, nav, cfg)
io.api = { io.api = {
get_unit = function (unit) comms.api__get_unit(unit) end get_unit = function (unit) comms.api__get_unit(unit) end
} }
-- pass IO control here since it can't be require'd due to a require loop
process.init(io, comms)
end end
-- initialize facility-dependent components of pocket iocontrol -- initialize facility-dependent components of pocket iocontrol
@ -374,6 +373,9 @@ function iocontrol.init_fac(conf)
table.insert(io.units, entry) table.insert(io.units, entry)
end end
-- pass IO control here since it can't be require'd due to a require loop
process.init(io, comms)
end end
-- set network link state -- set network link state

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

@ -209,7 +209,7 @@ local function new_view(root)
PushButton{parent=fps,x=2,y=1,text="<",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=main_page.nav_to} PushButton{parent=fps,x=2,y=1,text="<",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=main_page.nav_to}
local fp_common_page = guide_section(sect_construct_data, fps_page, "Common Items", docs.fp.common, 100) local fp_common_page = guide_section(sect_construct_data, fps_page, "Common Items", docs.fp.common, 100)
local fp_rplc_page = guide_section(sect_construct_data, fps_page, "Reactor PLC", docs.fp.r_plc, 100) local fp_rplc_page = guide_section(sect_construct_data, fps_page, "Reactor PLC", docs.fp.r_plc, 150)
local fp_rtu_page = guide_section(sect_construct_data, fps_page, "RTU Gateway", docs.fp.rtu_gw, 100) local fp_rtu_page = guide_section(sect_construct_data, fps_page, "RTU Gateway", docs.fp.rtu_gw, 100)
PushButton{parent=fps,y=3,text="Common Items >",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=fp_common_page.nav_to} PushButton{parent=fps,y=3,text="Common Items >",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=fp_common_page.nav_to}
@ -221,7 +221,7 @@ local function new_view(root)
TextBox{parent=gls,y=1,text="Glossary",alignment=ALIGN.CENTER} TextBox{parent=gls,y=1,text="Glossary",alignment=ALIGN.CENTER}
PushButton{parent=gls,x=3,y=1,text="<",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=main_page.nav_to} PushButton{parent=gls,x=3,y=1,text="<",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=main_page.nav_to}
local gls_abbv_page = guide_section(sect_construct_data, gls_page, "Abbreviations", docs.glossary.abbvs, 130) local gls_abbv_page = guide_section(sect_construct_data, gls_page, "Abbreviations", docs.glossary.abbvs, 140)
local gls_term_page = guide_section(sect_construct_data, gls_page, "Terminology", docs.glossary.terms, 100) local gls_term_page = guide_section(sect_construct_data, gls_page, "Terminology", docs.glossary.terms, 100)
PushButton{parent=gls,y=3,text="Abbreviations >",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=gls_abbv_page.nav_to} PushButton{parent=gls,y=3,text="Abbreviations >",fg_bg=btn_fg_bg,active_fg_bg=btn_active,callback=gls_abbv_page.nav_to}