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

#324 fixed alarm sounder lag

Browse Source
This commit is contained in:
Mikayla Fischler 2023-08-26 19:01:22 -04:00
parent 17698b7fb4
commit 2ed28cf74d
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coordinator/sounder.lua
View File

@ -51,7 +51,7 @@ function sounder.set(states)
-- re-compute output if needed, then play audio if available -- re-compute output if needed, then play audio if available
if alarm_ctl.stream.is_recompute_needed() then alarm_ctl.stream.compute_buffer() end if alarm_ctl.stream.is_recompute_needed() then alarm_ctl.stream.compute_buffer() end
if alarm_ctl.stream.has_next_block() then play() else sounder.stop() end if alarm_ctl.stream.any_active() then play() else sounder.stop() end
end end
-- stop all audio and clear output buffer -- stop all audio and clear output buffer

2
coordinator/startup.lua
View File

@ -22,7 +22,7 @@ local sounder = require("coordinator.sounder")
local apisessions = require("coordinator.session.apisessions") local apisessions = require("coordinator.session.apisessions")
local COORDINATOR_VERSION = "v1.0.8" local COORDINATOR_VERSION = "v1.0.9"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts

2
rtu/startup.lua
View File

@ -31,7 +31,7 @@ local sna_rtu = require("rtu.dev.sna_rtu")
local sps_rtu = require("rtu.dev.sps_rtu") local sps_rtu = require("rtu.dev.sps_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "v1.6.1" local RTU_VERSION = "v1.6.2"
local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE

2
rtu/threads.lua
View File

@ -73,7 +73,7 @@ function threads.thread__main(smem)
-- re-compute output if needed, then play audio if available -- re-compute output if needed, then play audio if available
if sounder.stream.is_recompute_needed() then if sounder.stream.is_recompute_needed() then
sounder.stream.compute_buffer() sounder.stream.compute_buffer()
if sounder.stream.has_next_block() then sounder.play() else sounder.stop() end if sounder.stream.any_active() then sounder.play() else sounder.stop() end
end end
end end

3
scada-common/audio.lua
View File

@ -296,6 +296,9 @@ function audio.new_stream()
end end
end end
-- check if any alarms are active
function public.any_active() return self.any_active end
-- check if the next audio block has data -- check if the next audio block has data
function public.has_next_block() return #self.quad_buffer[self.next_block] > 0 end function public.has_next_block() return #self.quad_buffer[self.next_block] > 0 end

2
scada-common/util.lua
View File

@ -8,7 +8,7 @@ local cc_strings = require("cc.strings")
local util = {} local util = {}
-- scada-common version -- scada-common version
util.version = "1.0.1" util.version = "1.0.2"
-- ENVIRONMENT CONSTANTS -- -- ENVIRONMENT CONSTANTS --