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

Merge branch 'devel' into color-update

Browse Source
This commit is contained in:
Mikayla Fischler 2024-02-26 14:44:47 -05:00
commit a677e994d6
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coordinator/coordinator.lua
View File

@ -302,7 +302,7 @@ function coordinator.comms(version, nic, sv_watchdog)
if not self.sv_linked then if not self.sv_linked then
if self.est_tick_waiting == nil then if self.est_tick_waiting == nil then
self.est_start = util.time_s() self.est_start = os.clock()
self.est_last = self.est_start self.est_last = self.est_start
self.est_tick_waiting, self.est_task_done = self.est_tick_waiting, self.est_task_done =
@ -310,10 +310,10 @@ function coordinator.comms(version, nic, sv_watchdog)
_send_establish() _send_establish()
else else
self.est_tick_waiting(math.max(0, LINK_TIMEOUT - (util.time_s() - self.est_start))) self.est_tick_waiting(math.max(0, LINK_TIMEOUT - (os.clock() - self.est_start)))
end end
if abort or (util.time_s() - self.est_start) >= LINK_TIMEOUT then if abort or (os.clock() - self.est_start) >= LINK_TIMEOUT then
self.est_task_done(false) self.est_task_done(false)
if abort then if abort then
@ -336,9 +336,9 @@ function coordinator.comms(version, nic, sv_watchdog)
elseif self.sv_config_err then elseif self.sv_config_err then
coordinator.log_comms("supervisor unit count does not match coordinator unit count, check configs") coordinator.log_comms("supervisor unit count does not match coordinator unit count, check configs")
ok = false ok = false
elseif (util.time_s() - self.est_last) > 1.0 then elseif (os.clock() - self.est_last) > 1.0 then
_send_establish() _send_establish()
self.est_last = util.time_s() self.est_last = os.clock()
end end
elseif self.est_tick_waiting ~= nil then elseif self.est_tick_waiting ~= nil then
self.est_task_done(true) self.est_task_done(true)

23
coordinator/startup.lua
View File

@ -22,7 +22,9 @@ local sounder = require("coordinator.sounder")
local apisessions = require("coordinator.session.apisessions") local apisessions = require("coordinator.session.apisessions")
local COORDINATOR_VERSION = "v1.2.5" local COORDINATOR_VERSION = "v1.2.7"
local CHUNK_LOAD_DELAY_S = 20.0
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts
@ -41,6 +43,25 @@ local log_crypto = coordinator.log_crypto
ppm.mount_all() ppm.mount_all()
local loaded, monitors = coordinator.load_config() local loaded, monitors = coordinator.load_config()
-- if the computer just started, its chunk may have just loaded (...or the user rebooted)
-- if monitor config failed, maybe an adjacent chunk containing all or part of a monitor has not loaded yet, so keep trying
while loaded == 2 and os.clock() < CHUNK_LOAD_DELAY_S do
term.clear()
term.setCursorPos(1, 1)
println("There was a monitor configuration problem at boot.\n")
println("Startup will keep trying every 2s in case of chunk load delays.\n")
println(util.sprintf("The configurator will be started in %ds if all attempts fail.\n", math.max(0, CHUNK_LOAD_DELAY_S - os.clock())))
println("(exit early with ctrl-t)")
---@diagnostic disable-next-line: undefined-field
os.sleep(2)
-- remount and re-attempt
ppm.mount_all()
loaded, monitors = coordinator.load_config()
end
if loaded ~= 0 then if loaded ~= 0 then
-- try to reconfigure (user action) -- try to reconfigure (user action)
local success, error = configure.configure(loaded, monitors) local success, error = configure.configure(loaded, monitors)