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

#588 close main UI via queue

Browse Source
This commit is contained in:
Mikayla Fischler 2024-12-21 11:54:25 -05:00
parent 57c75be997
commit cb2ebd409d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coordinator/startup.lua
View File

@ -19,7 +19,7 @@ local renderer = require("coordinator.renderer")
local sounder = require("coordinator.sounder") local sounder = require("coordinator.sounder")
local threads = require("coordinator.threads") local threads = require("coordinator.threads")
local COORDINATOR_VERSION = "v1.6.1" local COORDINATOR_VERSION = "v1.6.2"
local CHUNK_LOAD_DELAY_S = 30.0 local CHUNK_LOAD_DELAY_S = 30.0

20
coordinator/threads.lua
View File

@ -24,7 +24,8 @@ local MAIN_CLOCK = 0.5 -- (2Hz, 10 ticks)
local RENDER_SLEEP = 100 -- (100ms, 2 ticks) local RENDER_SLEEP = 100 -- (100ms, 2 ticks)
local MQ__RENDER_CMD = { local MQ__RENDER_CMD = {
START_MAIN_UI = 1 START_MAIN_UI = 1,
CLOSE_MAIN_UI = 2
} }
local MQ__RENDER_DATA = { local MQ__RENDER_DATA = {
@ -81,7 +82,7 @@ function threads.thread__main(smem)
nic.connect(other_modem) nic.connect(other_modem)
else else
-- close out main UI -- close out main UI
renderer.close_ui() smem.q.mq_render.push_command(MQ__RENDER_CMD.CLOSE_MAIN_UI)
-- alert user to status -- alert user to status
log_sys("awaiting comms modem reconnect...") log_sys("awaiting comms modem reconnect...")
@ -167,9 +168,9 @@ function threads.thread__main(smem)
-- supervisor watchdog timeout -- supervisor watchdog timeout
log_comms("supervisor server timeout") log_comms("supervisor server timeout")
-- close connection, main UI, and stop sounder -- close main UI, connection, and stop sounder
smem.q.mq_render.push_command(MQ__RENDER_CMD.CLOSE_MAIN_UI)
coord_comms.close() coord_comms.close()
renderer.close_ui()
sounder.stop() sounder.stop()
else else
-- a non-clock/main watchdog timer event -- a non-clock/main watchdog timer event
@ -188,9 +189,9 @@ function threads.thread__main(smem)
if coord_comms.handle_packet(packet) then if coord_comms.handle_packet(packet) then
log_comms("supervisor closed connection") log_comms("supervisor closed connection")
-- close connection, main UI, and stop sounder -- close main UI, connection, and stop sounder
smem.q.mq_render.push_command(MQ__RENDER_CMD.CLOSE_MAIN_UI)
coord_comms.close() coord_comms.close()
renderer.close_ui()
sounder.stop() sounder.stop()
end end
elseif event == "monitor_touch" or event == "mouse_click" or event == "mouse_up" or elseif event == "monitor_touch" or event == "mouse_click" or event == "mouse_up" or
@ -302,6 +303,13 @@ function threads.thread__render(smem)
else else
log_render("main UI draw took " .. (util.time_ms() - draw_start) .. "ms") log_render("main UI draw took " .. (util.time_ms() - draw_start) .. "ms")
end end
elseif msg.message == MQ__RENDER_CMD.CLOSE_MAIN_UI then
-- close the main UI if it has been drawn
if renderer.ui_ready() then
log_render("closing main UI...")
renderer.close_ui()
log_render("main UI closed")
end
end end
elseif msg.qtype == mqueue.TYPE.DATA then elseif msg.qtype == mqueue.TYPE.DATA then
-- received data -- received data