ShaYmez/RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more fixes and tuning to voice

Browse Source
This commit is contained in:
Simon 2020-10-12 16:30:32 +01:00
parent efb341ac76
commit bce34ccb2c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bridge_master.py
View File

@ -347,6 +347,7 @@ def stream_trimmer_loop():
def sendSpeech(self,speech): def sendSpeech(self,speech):
sleep(1) sleep(1)
_nine = bytes_3(9) _nine = bytes_3(9)
_slot = systems[system].STATUS[2]
while True: while True:
try: try:
pkt = next(speech) pkt = next(speech)
@ -356,7 +357,6 @@ def sendSpeech(self,speech):
sleep(0.058) sleep(0.058)
_stream_id = pkt[16:20] _stream_id = pkt[16:20]
_pkt_time = time() _pkt_time = time()
_slot = systems[system].STATUS[2]
if _stream_id not in systems[system].STATUS: if _stream_id not in systems[system].STATUS:
systems[system].STATUS[_stream_id] = { systems[system].STATUS[_stream_id] = {
'START': _pkt_time, 'START': _pkt_time,
@ -375,6 +375,7 @@ def sendSpeech(self,speech):
#print(len(pkt), pkt[4], pkt) #print(len(pkt), pkt[4], pkt)
def disconnectedVoice(system): def disconnectedVoice(system):
_nine = bytes_3(9)
logger.info('(%s) Sending disconnected voice',system) logger.info('(%s) Sending disconnected voice',system)
_say = [words['silence']] _say = [words['silence']]
if CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR'] > 0: if CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR'] > 0:
@ -390,9 +391,10 @@ def disconnectedVoice(system):
else: else:
_say.append(words['notlinked']) _say.append(words['notlinked'])
speech = pkt_gen(bytes_3(9), bytes_3(9), bytes_4(9), 1, _say) speech = pkt_gen(_nine, _nine, bytes_4(9), 1, _say)
sleep(1) sleep(1)
_slot = systems[system].STATUS[2]
while True: while True:
try: try:
pkt = next(speech) pkt = next(speech)
@ -402,7 +404,6 @@ def disconnectedVoice(system):
sleep(0.058) sleep(0.058)
_stream_id = pkt[16:20] _stream_id = pkt[16:20]
_pkt_time = time() _pkt_time = time()
_slot = systems[system].STATUS[2]
if _stream_id not in systems[system].STATUS: if _stream_id not in systems[system].STATUS:
systems[system].STATUS[_stream_id] = { systems[system].STATUS[_stream_id] = {
'START': _pkt_time, 'START': _pkt_time,
@ -455,6 +456,7 @@ def ident():
speech = pkt_gen(_all_call, _all_call, bytes_4(16777215), 1, _say) speech = pkt_gen(_all_call, _all_call, bytes_4(16777215), 1, _say)
sleep(1) sleep(1)
_slot = systems[system].STATUS[2]
while True: while True:
try: try:
pkt = next(speech) pkt = next(speech)
@ -465,7 +467,6 @@ def ident():
_stream_id = pkt[16:20] _stream_id = pkt[16:20]
_pkt_time = time() _pkt_time = time()
_slot = systems[system].STATUS[2]
if _stream_id not in systems[system].STATUS: if _stream_id not in systems[system].STATUS:
systems[system].STATUS[_stream_id] = { systems[system].STATUS[_stream_id] = {
'START': _pkt_time, 'START': _pkt_time,
@ -910,6 +911,8 @@ class routerHBP(HBSYSTEM):
dmrpkt = _data[20:53] dmrpkt = _data[20:53]
_bits = _data[15] _bits = _data[15]
_nine = bytes_3(9)
#Handle private calls (for reflectors) #Handle private calls (for reflectors)
if _call_type == 'unit' and _slot == 2: if _call_type == 'unit' and _slot == 2:
_int_dst_id = int_id(_dst_id) _int_dst_id = int_id(_dst_id)
@ -1031,7 +1034,7 @@ class routerHBP(HBSYSTEM):
for num in str(_int_dst_id): for num in str(_int_dst_id):
_say.append(words[num]) _say.append(words[num])
speech = pkt_gen(bytes_3(9), bytes_3(9), bytes_4(9), 1, _say) speech = pkt_gen(_nine, _nine, bytes_4(9), 1, _say)
#call speech in a thread as it contains sleep() and hence could block the reactor #call speech in a thread as it contains sleep() and hence could block the reactor
reactor.callInThread(sendSpeech,self,speech) reactor.callInThread(sendSpeech,self,speech)