random updates

This commit is contained in:
Cort Buffington 2016-09-18 08:40:32 -05:00
parent 8713a62bce
commit fbf28e8692
2 changed files with 17 additions and 4 deletions

View File

@ -22,6 +22,19 @@ __email__ = 'n0mjs@me.com'
# BPTC(196,96) Decoding routings
#------------------------------------------------------------------------------
mod_181_index = (
0, 181, 166, 151, 136, 121, 106, 91, 76, 61, 46, 31, 16, 1, 182, 167, 152, 137,
122, 107, 92, 77, 62, 47, 32, 17, 2, 183, 168, 153, 138, 123, 108, 93, 78, 63,
48, 33, 18, 3, 184, 169, 154, 139, 124, 109, 94, 79, 64, 49, 34, 19, 4, 185, 170,
155, 140, 125, 110, 95, 80, 65, 50, 35, 20, 5, 186, 171, 156, 141, 126, 111, 96,
81, 66, 51, 36, 21, 6, 187, 172, 157, 142, 127, 112, 97, 82, 67, 52, 37, 22, 7,
188, 173, 158, 143, 128, 113, 98, 83, 68, 53, 38, 23, 8, 189, 174, 159, 144, 129,
114, 99, 84, 69, 54, 39, 24, 9, 190, 175, 160, 145, 130, 115, 100, 85, 70, 55, 40,
25, 10, 191, 176, 161, 146, 131, 116, 101, 86, 71, 56, 41, 26, 11, 192, 177, 162,
147, 132, 117, 102, 87, 72, 57, 42, 27, 12, 193, 178, 163, 148, 133, 118, 103, 88,
73, 58, 43, 28, 13, 194, 179, 164, 149, 134, 119, 104, 89, 74, 59, 44, 29, 14,
195, 180, 165, 150, 135, 120, 105, 90, 75, 60, 45, 30, 15)
# Converts a DMR frame using 98-68-98 (info-sync/EMB-info) into 196 bit array
def dec_get_binary_19696(_data):
_data = bytearray(_data)

View File

@ -80,8 +80,8 @@ class routerMASTER(HBMASTER):
else:
_tmp_bits = _bits
_tmp_data = _data[:8] + rule['DST_GROUP'] + _data[11:15] + chr(_tmp_bits) + _data[16:]
print(h(_data))
print(h(_tmp_data))
#print(h(_data))
#print(h(_tmp_data))
systems[_target].send_system(_tmp_data)
_routed = True
@ -103,8 +103,8 @@ class routerCLIENT(HBCLIENT):
else:
_tmp_bits = _bits
_tmp_data = _data[:8] + rule['DST_GROUP'] + _data[11:15] + chr(_bits) + _data[16:]
print(h(_data))
print(h(_tmp_data))
#print(h(_data))
#print(h(_tmp_data))
systems[_target].send_system(_tmp_data)
_routed = True