From ff02528f9f534d52927df9bc09e35cd0e2c31e85 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Thu, 14 Nov 2013 20:14:16 -0600 Subject: [PATCH] Begin work on Repeater Wake-Up --- bridge.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/bridge.py b/bridge.py index c48d6ec..e9d6306 100644 --- a/bridge.py +++ b/bridge.py @@ -16,12 +16,15 @@ import binascii import dmrlink from dmrlink import IPSC, UnauthIPSC, NETWORK, networks, int_id, send_to_ipsc, dmr_nat, logger +# Notes and pieces of next steps... +# RPT_WAKE_UP = b'\x85' + NETWORK[_network]['LOCAL']['RADIO_ID] + b'\x00\x00\x00\x01' + b'\x01' + b'\x01' +# TS1 = 0, TS2 = 1 + RULES = { 'K0USY': { 'GROUP_VOICE': [ - {'SRC_GROUP': b'\x00\x00\x03', 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x00\x03'}, - {'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x0C\x30'}, - {'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'TEST', 'DST_GROUP': b'\x00\x00\xD2'} + {'SRC_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1, 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1}, + {'SRC_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1, 'DST_NET': 'TEST', 'DST_GROUP': b'\x00\x00\xD2', 'SRC_TS': 1} ], 'PRIVATE_VOICE': [ ], @@ -32,9 +35,8 @@ RULES = { }, 'LAWRENCE': { 'GROUP_VOICE': [ - {'SRC_GROUP': b'\x00\x00\x03', 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x00\x03'}, - {'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x0C\x30'}, - {'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'TEST', 'DST_GROUP': b'\x00\x00\xD2'} + {'SRC_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1, 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1}, + {'SRC_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1, 'DST_NET': 'TEST', 'DST_GROUP': b'\x00\x00\xD2', 'SRC_TS': 1} ], 'PRIVATE_VOICE': [ ], @@ -45,8 +47,8 @@ RULES = { }, 'TEST': { 'GROUP_VOICE': [ - {'SRC_GROUP': b'\x00\x00\xD2', 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x0C\x30'}, - {'SRC_GROUP': b'\x00\x00\xD2', 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x0C\x30'} + {'SRC_GROUP': b'\x00\x00\xD2', 'SRC_TS': 1, 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1}, + {'SRC_GROUP': b'\x00\x00\xD2', 'SRC_TS': 1, 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x0C\x30', 'SRC_TS': 1} ], 'PRIVATE_VOICE': [ ], @@ -63,9 +65,6 @@ class bridgeIPSC(IPSC): IPSC.__init__(self, *args, **kwargs) self.ACTIVE_CALLS = [] - #def datagramReceived(self, data, (host, port)): - # print(h(data)) - #************************************************ # CALLBACK FUNCTIONS FOR USER PACKET TYPES