fixes fdma/tdma, ext fnct cmd

This commit is contained in:
Max 2022-10-23 19:23:33 -04:00
parent 874b72042c
commit 7bc0fb2c1b
2 changed files with 8 additions and 6 deletions

View File

@ -636,8 +636,9 @@ class trunked_system (object):
self.freq_table[iden]['offset'] = toff * spac * 125
self.freq_table[iden]['step'] = spac * 125
self.freq_table[iden]['frequency'] = f1 * 5
self.freq_table[iden]['tdma'] = slots_per_carrier[channel_type]
d = {'cc_event': 'iden_up_tdma', 'iden': iden, 'offset': self.freq_table[iden]['offset'], 'step': self.freq_table[iden]['step'], 'freq': self.freq_table[iden]['frequency'], 'slots': self.freq_table[iden]['tdma'], 'opcode': opcode }
if slots_per_carrier[channel_type] > 1:
self.freq_table[iden]['tdma'] = slots_per_carrier[channel_type]
d = {'cc_event': 'iden_up_tdma', 'iden': iden, 'offset': self.freq_table[iden]['offset'], 'step': self.freq_table[iden]['step'], 'freq': self.freq_table[iden]['frequency'], 'slots': slots_per_carrier[channel_type], 'opcode': opcode }
self.post_event(d)
if self.debug > 10:
sys.stderr.write('tsbk33 iden up tdma id %d f %d offset %d spacing %d slots/carrier %d\n' % (iden, self.freq_table[iden]['frequency'], self.freq_table[iden]['offset'], self.freq_table[iden]['step'], self.freq_table[iden]['tdma']))
@ -918,8 +919,9 @@ class trunked_system (object):
self.freq_table[iden]['offset'] = toff * spac * 125
self.freq_table[iden]['step'] = spac * 125
self.freq_table[iden]['frequency'] = f1 * 5
self.freq_table[iden]['tdma'] = slots_per_carrier[channel_type]
d = {'cc_event': 'iden_up_tdma', 'iden': iden, 'offset': self.freq_table[iden]['offset'], 'step': self.freq_table[iden]['step'], 'freq': self.freq_table[iden]['frequency'], 'slots': self.freq_table[iden]['tdma'], 'opcode': opcode }
if slots_per_carrier[channel_type] > 1:
self.freq_table[iden]['tdma'] = slots_per_carrier[channel_type]
d = {'cc_event': 'iden_up_tdma', 'iden': iden, 'offset': self.freq_table[iden]['offset'], 'step': self.freq_table[iden]['step'], 'freq': self.freq_table[iden]['frequency'], 'slots': slots_per_carrier[channel_type], 'opcode': opcode }
self.post_event(d)
if self.debug > 10:
sys.stderr.write('tsbk33 iden up tdma id %d f %d offset %d spacing %d slots/carrier %d\n' % (iden, self.freq_table[iden]['frequency'], self.freq_table[iden]['offset'], self.freq_table[iden]['step'], self.freq_table[iden]['tdma']))

View File

@ -1383,7 +1383,7 @@ function dispatch_commands(txt) {
var efargs = d.efargs;
var target = d.target;
n_opcode = "Ext Fnct Cmd: " + efoperand;
source = efargs;
source = efargs['unit_id'];
noLog = 0;
break;
@ -1469,12 +1469,12 @@ function dispatch_commands(txt) {
case "33": // 0x33 - iden up tdma
var sysid = d.sysid;
var type = 'TDMA';
var iden = d.iden;
var freq = d.freq / 1000000;
var offset = d.offset / 1000000;
var step = d.step/100000;
var slots = d.slots;
var type = (slots == 1) ? 'FDMA' : 'TDMA';
channelId (sysid, iden, type, freq, offset, step, slots);
noLog = 1;
break;