From 62a93a2cdcff6231c9ede37fa87830a22bb992a6 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Sun, 15 Mar 2026 16:58:50 +0100
Subject: [PATCH] refactored

---
 network_backend.py | 44 ++++++++++++++++++++++++--------------------
 nmea/GGA.py        |  2 +-
 nmea/GLL.py        |  2 +-
 nmea/GSA.py        |  2 +-
 nmea/GSV.py        |  2 +-
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/network_backend.py b/network_backend.py
index 34886b4..d7aae71 100644
--- a/network_backend.py
+++ b/network_backend.py
@@ -89,27 +89,31 @@ if __name__ == "__main__":
 
 	# TCPIP multi source receiver
 	mc = NetworkBackend(server_list)
-	xcvr_1 = mc.create_xcvr("neo-f9p")
-	xcvr_2 = mc.create_xcvr("zed-x20p")
-
-	# Packetizer for "zed-x20p"
-	packetizer_0 = Packetizer()
-
-	# Packetizer for "neo-f9p"
-	packetizer_1 = Packetizer()
-
-	xcvr_1.register_recv(packetizer_0)
-	xcvr_2.register_recv(packetizer_1)
-
-	rx_list = [
-			Gll('Rx', '--'),
-			Gsa('Rx', '--'),
-			Gsv('Rx', '--')
+	for grm in ["neo-f9p", "zed-x20p"]:
+		rx_list = [
+			Gll(grm, '--'),
+			Gsa(grm, '--'),
+			Gsv(grm, '--')
 		]
-	# Register all Rx to all sources
-	for rx in rx_list:
-		packetizer_0.register_recv(rx)
-		packetizer_1.register_recv(rx)
+		# Topology
+		# Receiver-0.0 \
+		# Receiver-0.1  + Packetizer-0 - Transceiver-0 \
+		#                                               + Backend
+		# Receiver-1.0  + Packetizer-1 - Transceiver-1 /
+		# Receiver-1.1 /
+
+		# Create transceiver
+		transceiver = mc.create_xcvr(grm)
+
+		# Create Packetizer
+		packetizer = Packetizer()
+
+		# Register packetizer to transceiver
+		transceiver.register_recv(packetizer)
+
+		# Register Receiver to packetizer
+		for rx in rx_list:
+			packetizer.register_recv(rx)
 
 	# Connect all sources
 	mc.connect()
diff --git a/nmea/GGA.py b/nmea/GGA.py
index 76976d4..8e68454 100644
--- a/nmea/GGA.py
+++ b/nmea/GGA.py
@@ -8,4 +8,4 @@ class Gga(Nmea):
 
 	def on_recv(self, msg: MsgContainer):
 		data = msg.data.decode(encoding="utf-8")
-		print(data)
+		print(f"{self.name}: {data}")
diff --git a/nmea/GLL.py b/nmea/GLL.py
index 9bfc022..67c61c3 100644
--- a/nmea/GLL.py
+++ b/nmea/GLL.py
@@ -33,4 +33,4 @@ class Gll(Nmea):
 		self.data.status = data_list[6]
 		self.data.checksum = data_list[7]
 
-		print(self.data)
+		print(f"{self.name}: {data}")
diff --git a/nmea/GSA.py b/nmea/GSA.py
index c1f51fa..b8dd049 100644
--- a/nmea/GSA.py
+++ b/nmea/GSA.py
@@ -33,4 +33,4 @@ class Gsa(Nmea):
 		self.data.v_dop = float(data_list[17])
 		self.data.checksum = data_list[18]
 
-		print(self.data)
+		print(f"{self.name}: {data}")
diff --git a/nmea/GSV.py b/nmea/GSV.py
index 30f5dc3..5aa06e5 100644
--- a/nmea/GSV.py
+++ b/nmea/GSV.py
@@ -43,6 +43,6 @@ class Gsv(Nmea):
 		data.checksum = data_list[data_set_size*(num_sats_in_msg-1)+8]
 
 		if self.data.number_of_msg == self.data.seq_number:
-			print(data)
 			self.data = Gsv.Msg()
+			print(f"{self.name}: {data}")