From f3c0d084bdade4db5e03417d821fbf71df190941 Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Sat, 17 Apr 2021 15:45:40 +0100
Subject: [PATCH] ok

---
 bridge_master.py | 5 +++++
 hblink.py        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bridge_master.py b/bridge_master.py
index c60ff9b..e0b5730 100755
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -1795,6 +1795,11 @@ class routerHBP(HBSYSTEM):
                             self.STATUS[_slot]['_bcsq'] = True
                         return
             
+<<<<<<< Updated upstream
+=======
+            _int_seq = _seq.decode()
+            _int_seq = int(_int_seq)
+>>>>>>> Stashed changes
             #Duplicate handling#
             #Duplicate complete packet
             if self.STATUS[_slot]['lastData'] and self.STATUS[_slot]['lastData'] == _data and _seq > 1:
diff --git a/hblink.py b/hblink.py
index 6e82f0b..7ebd81b 100755
--- a/hblink.py
+++ b/hblink.py
@@ -636,7 +636,7 @@ class HBSYSTEM(DatagramProtocol):
 
                 _peer_id = _data[11:15]
                 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]
                     _dst_id = _data[8:11]
                     _bits = _data[15]