tidy up ident

pypy
Simon 5 years ago
parent d8d2a55eab
commit 70f25744c3

@ -458,7 +458,7 @@ def ident():
#print("RX:"+str(_slot['RX_TYPE'])+" TX:"+str(_slot['TX_TYPE'])+" TIME:"+str(time() - _slot['TX_TIME'])) #print("RX:"+str(_slot['RX_TYPE'])+" TX:"+str(_slot['TX_TYPE'])+" TIME:"+str(time() - _slot['TX_TIME']))
if (_slot['RX_TYPE'] == HBPF_SLT_VTERM) and (_slot['TX_TYPE'] == HBPF_SLT_VTERM) and (time() - _slot['TX_TIME'] > CONFIG['SYSTEMS'][system]['GROUP_HANGTIME']): if (_slot['RX_TYPE'] == HBPF_SLT_VTERM) and (_slot['TX_TYPE'] == HBPF_SLT_VTERM) and (time() - _slot['TX_TIME'] > CONFIG['SYSTEMS'][system]['GROUP_HANGTIME']):
#_stream_id = hex_str_4(1234567) #_stream_id = hex_str_4(1234567)
logger.info('(%s) Sending voice ident',system) logger.info('(%s) Repeater idle. Sending voice ident',system)
_say = [words['silence']] _say = [words['silence']]
_systemcs = re.sub(r'\W+', '', system) _systemcs = re.sub(r'\W+', '', system)
_systemcs.upper() _systemcs.upper()
@ -497,8 +497,6 @@ def ident():
#Twisted is not thread safe. We need to call this in the reactor main thread #Twisted is not thread safe. We need to call this in the reactor main thread
reactor.callFromThread(systems[system].send_system,pkt) reactor.callFromThread(systems[system].send_system,pkt)
#systems[system].send_system(pkt) #systems[system].send_system(pkt)
else:
logger.debug("(%s) repeater busy, not sending ident",system)
def mysql_config_check(): def mysql_config_check():
logger.debug('(MYSQL) Periodic config check') logger.debug('(MYSQL) Periodic config check')

Loading…
Cancel
Save

Powered by TurnKey Linux.