mirror of
https://github.com/MikaylaFischler/cc-mek-scada.git
synced 2024-08-30 18:22:34 +00:00
#324 fixed alarm sounder lag
This commit is contained in:
parent
17698b7fb4
commit
2ed28cf74d
@ -51,7 +51,7 @@ function sounder.set(states)
|
||||
|
||||
-- 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.has_next_block() then play() else sounder.stop() end
|
||||
if alarm_ctl.stream.any_active() then play() else sounder.stop() end
|
||||
end
|
||||
|
||||
-- stop all audio and clear output buffer
|
||||
|
@ -22,7 +22,7 @@ local sounder = require("coordinator.sounder")
|
||||
|
||||
local apisessions = require("coordinator.session.apisessions")
|
||||
|
||||
local COORDINATOR_VERSION = "v1.0.8"
|
||||
local COORDINATOR_VERSION = "v1.0.9"
|
||||
|
||||
local println = util.println
|
||||
local println_ts = util.println_ts
|
||||
|
@ -31,7 +31,7 @@ local sna_rtu = require("rtu.dev.sna_rtu")
|
||||
local sps_rtu = require("rtu.dev.sps_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_HW_STATE = databus.RTU_UNIT_HW_STATE
|
||||
|
@ -73,7 +73,7 @@ function threads.thread__main(smem)
|
||||
-- re-compute output if needed, then play audio if available
|
||||
if sounder.stream.is_recompute_needed() then
|
||||
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
|
||||
|
||||
|
@ -296,6 +296,9 @@ function audio.new_stream()
|
||||
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
|
||||
function public.has_next_block() return #self.quad_buffer[self.next_block] > 0 end
|
||||
|
||||
|
@ -8,7 +8,7 @@ local cc_strings = require("cc.strings")
|
||||
local util = {}
|
||||
|
||||
-- scada-common version
|
||||
util.version = "1.0.1"
|
||||
util.version = "1.0.2"
|
||||
|
||||
-- ENVIRONMENT CONSTANTS --
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user