op25
/
op25
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http server updates

This commit is contained in:
Max 2018-04-03 15:19:57 -04:00
parent e0eabf10f0
commit c9bfc96ed0
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
op25/gr-op25_repeater/apps/trunking.py
View File

@ -548,6 +548,8 @@ class rx_ctl (object):
if conf_file:
if conf_file.endswith('.tsv'):
self.build_config_tsv(conf_file)
elif conf_file.endswith('.json'):
self.build_config_json(conf_file)
else:
self.build_config(conf_file)
self.nacs = self.configs.keys()
@ -572,6 +574,21 @@ class rx_ctl (object):
'wacn': None,
'sysid': None})
def build_config_json(self, conf_file):
d = json.loads(open(conf_file).read())
chans = [x for x in d['channels'] if x['active'] and x['trunked']]
self.configs = { chan['nac']: {'cclist':chan['cclist'],
'offset':0,
'whitelist':chan['whitelist'],
'blacklist':chan['blacklist'],
'sysname': chan['name'],
'center_frequency': chan['frequency'],
'modulation': chan['demod_type'],
'tgid_map': {int(row['tg_id']):row['tg_tag'] for row in chan['tgids']}}
for chan in chans}
for nac in self.configs.keys():
self.add_trunked_system(nac)
def set_frequency(self, params):
frequency = params['freq']
if frequency and self.frequency_set: