diff --git a/bridge_master.py b/bridge_master.py index 7b8eb9b..9539055 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -408,11 +408,13 @@ def disconnectedVoice(system): _nine = bytes_3(9) logger.info('(%s) Sending disconnected voice',system) _say = [words['silence']] + _say.append(words['silence']) if CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR'] > 0: _say.append(words['silence']) _say.append(words['linked']) _say.append(words['silence']) _say.append(words['2']) + _say.append(words['silence']) _say.append(words['silence']) for number in str(CONFIG['SYSTEMS'][system]['DEFAULT_REFLECTOR']): @@ -421,6 +423,8 @@ def disconnectedVoice(system): else: _say.append(words['notlinked']) + _say.append(words['silence']) + speech = pkt_gen(_nine, _nine, bytes_4(9), 1, _say) sleep(1) @@ -476,11 +480,13 @@ def ident(): #_stream_id = hex_str_4(1234567) logger.info('(%s) Repeater idle. Sending voice ident',system) _say = [words['silence']] + _say.append(words['silence']) _systemcs = re.sub(r'\W+', '', system) _systemcs.upper() for character in _systemcs: _say.append(words[character]) _say.append(words['silence']) + _say.append(words['silence']) #test #_say.append(AMBEobj.readSingleFile('44xx.ambe')) _all_call = bytes_3(16777215) @@ -1126,6 +1132,7 @@ class routerHBP(HBSYSTEM): _say.append(words['linked']) _say.append(words['silence']) _say.append(words['2']) + _say.append(words['silence']) _say.append(words['silence']) for num in str(_dehash_bridge): @@ -1146,6 +1153,7 @@ class routerHBP(HBSYSTEM): _say.append(words['silence']) _say.append(words['2']) _say.append(words['silence']) + _say.append(words['silence']) for num in str(_int_dst_id): _say.append(words[num]) diff --git a/hblink.py b/hblink.py index 83b67ad..e7c3aed 100755 --- a/hblink.py +++ b/hblink.py @@ -729,6 +729,7 @@ class reportFactory(Factory): def send_config(self): serialized = pickle.dumps(self._config['SYSTEMS'], protocol=2) #.decode('utf-8', errors='ignore') #pickle.HIGHEST_PROTOCOL) + print(self._config['SYSTEMS']) self.send_clients(b''.join([REPORT_OPCODES['CONFIG_SND'], serialized]))