From 9f8732830c7fc0afea5393608f584158c0767084 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Wed, 26 Jul 2023 22:37:25 -0400 Subject: [PATCH] #264, #280 fixed sounder issues --- scada-common/audio.lua | 4 ++-- supervisor/facility.lua | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scada-common/audio.lua b/scada-common/audio.lua index 5b73090..29c8ab5 100644 --- a/scada-common/audio.lua +++ b/scada-common/audio.lua @@ -254,7 +254,7 @@ function audio.new_stream() ---@param index tone_id tone ID ---@param active boolean active state function public.set_active(index, active) - if self.tone_active[index] then + if self.tone_active[index] ~= nil then if self.tone_active[index] ~= active then self.need_recompute = true end self.tone_active[index] = active end @@ -289,7 +289,7 @@ function audio.new_stream() self.any_active = true for i = 1, 4 do local buffer = self.quad_buffer[i] - local values = tone_data[id] + local values = tone_data[id][i] for s = 1, _05s_SAMPLES do self.quad_buffer[i][s] = limit(buffer[s] + values[s]) end end end diff --git a/supervisor/facility.lua b/supervisor/facility.lua index c72f5a2..eb8d1af 100644 --- a/supervisor/facility.lua +++ b/supervisor/facility.lua @@ -762,7 +762,8 @@ function facility.new(num_reactors, cooling_conf) -- Update Alarm Tones -- ------------------------ - local alarms = { false, false, false, false, false, false, false, false, false, false, false, false } + local alarms = { false, false, false, false, false, false, false, false, false, false, false, false } + self.tone_states = { false, false, false, false, false, false, false, false} -- check all alarms for all units for i = 1, #self.units do