This commit is contained in:
parent
1da0b97314
commit
f3c0d084bd
|
@ -1795,6 +1795,11 @@ class routerHBP(HBSYSTEM):
|
||||||
self.STATUS[_slot]['_bcsq'] = True
|
self.STATUS[_slot]['_bcsq'] = True
|
||||||
return
|
return
|
||||||
|
|
||||||
|
<<<<<<< Updated upstream
|
||||||
|
=======
|
||||||
|
_int_seq = _seq.decode()
|
||||||
|
_int_seq = int(_int_seq)
|
||||||
|
>>>>>>> Stashed changes
|
||||||
#Duplicate handling#
|
#Duplicate handling#
|
||||||
#Duplicate complete packet
|
#Duplicate complete packet
|
||||||
if self.STATUS[_slot]['lastData'] and self.STATUS[_slot]['lastData'] == _data and _seq > 1:
|
if self.STATUS[_slot]['lastData'] and self.STATUS[_slot]['lastData'] == _data and _seq > 1:
|
||||||
|
|
|
@ -636,7 +636,7 @@ class HBSYSTEM(DatagramProtocol):
|
||||||
|
|
||||||
_peer_id = _data[11:15]
|
_peer_id = _data[11:15]
|
||||||
if self._config['LOOSE'] or _peer_id == self._config['RADIO_ID']: # Validate the Radio_ID unless using loose validation
|
if self._config['LOOSE'] or _peer_id == self._config['RADIO_ID']: # Validate the Radio_ID unless using loose validation
|
||||||
_seq = _data[4:5]
|
_seq = int(_data[4:5])
|
||||||
_rf_src = _data[5:8]
|
_rf_src = _data[5:8]
|
||||||
_dst_id = _data[8:11]
|
_dst_id = _data[8:11]
|
||||||
_bits = _data[15]
|
_bits = _data[15]
|
||||||
|
|
Loading…
Reference in New Issue