From 2e978db85932baefb45ed92b80b47a69efef91fc Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sun, 8 Sep 2024 13:23:37 -0400 Subject: [PATCH] cleanup and version increments --- coordinator/session/pocket.lua | 8 ++++---- coordinator/startup.lua | 2 +- graphics/core.lua | 2 +- graphics/elements/controls/hazard_button.lua | 2 +- supervisor/session/coordinator.lua | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coordinator/session/pocket.lua b/coordinator/session/pocket.lua index ae8f767..0205397 100644 --- a/coordinator/session/pocket.lua +++ b/coordinator/session/pocket.lua @@ -168,12 +168,12 @@ function pocket.new_session(id, s_addr, i_seq_num, in_queue, out_queue, timeout) -- continue if valid unit id if util.is_int(uid) and uid > 0 and uid <= #db.units then - if cmd == UNIT_COMMAND.START then - log.info(util.c(log_tag, "UNIT[", uid, "] START")) - self.proc_handle.start(uid) - elseif cmd == UNIT_COMMAND.SCRAM then + if cmd == UNIT_COMMAND.SCRAM then log.info(util.c(log_tag, "UNIT[", uid, "] SCRAM")) self.proc_handle.scram(uid) + elseif cmd == UNIT_COMMAND.START then + log.info(util.c(log_tag, "UNIT[", uid, "] START")) + self.proc_handle.start(uid) elseif cmd == UNIT_COMMAND.RESET_RPS then log.info(util.c(log_tag, "UNIT[", uid, "] RESET RPS")) self.proc_handle.reset_rps(uid) diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 4be0949..52ed4a6 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -19,7 +19,7 @@ local renderer = require("coordinator.renderer") local sounder = require("coordinator.sounder") local threads = require("coordinator.threads") -local COORDINATOR_VERSION = "v1.5.7" +local COORDINATOR_VERSION = "v1.5.8" local CHUNK_LOAD_DELAY_S = 30.0 diff --git a/graphics/core.lua b/graphics/core.lua index c07b281..fe3b291 100644 --- a/graphics/core.lua +++ b/graphics/core.lua @@ -7,7 +7,7 @@ local flasher = require("graphics.flasher") local core = {} -core.version = "2.3.3" +core.version = "2.3.4" core.flasher = flasher core.events = events diff --git a/graphics/elements/controls/hazard_button.lua b/graphics/elements/controls/hazard_button.lua index e43f438..5a3d37f 100644 --- a/graphics/elements/controls/hazard_button.lua +++ b/graphics/elements/controls/hazard_button.lua @@ -152,7 +152,7 @@ local function hazard_button(args) tcd.abort(on_success) tcd.abort(on_failure) - -- operation timeout handling + -- operation timeout animation tcd.dispatch(timeout, on_timeout) args.callback() diff --git a/supervisor/session/coordinator.lua b/supervisor/session/coordinator.lua index bd93c1c..a2044fc 100644 --- a/supervisor/session/coordinator.lua +++ b/supervisor/session/coordinator.lua @@ -307,15 +307,15 @@ function coordinator.new_session(id, s_addr, i_seq_num, in_queue, out_queue, tim local unit = self.units[uid] ---@type reactor_unit local manual = facility.get_group(uid) == 0 - if cmd == UNIT_COMMAND.START then + if cmd == UNIT_COMMAND.SCRAM then + out_queue.push_data(SV_Q_DATA.SCRAM, data) + elseif cmd == UNIT_COMMAND.START then if manual then out_queue.push_data(SV_Q_DATA.START, data) else -- denied _send(CRDN_TYPE.UNIT_CMD, { cmd, uid, false }) end - elseif cmd == UNIT_COMMAND.SCRAM then - out_queue.push_data(SV_Q_DATA.SCRAM, data) elseif cmd == UNIT_COMMAND.RESET_RPS then out_queue.push_data(SV_Q_DATA.RESET_RPS, data) elseif cmd == UNIT_COMMAND.SET_BURN then