From 3b2f46325382c6e18e64fe85b4378c1abf2ce656 Mon Sep 17 00:00:00 2001
From: Filip Znachor <filip@znachor.cz>
Date: Wed, 14 Dec 2022 11:45:47 +0100
Subject: [PATCH] Removed resending and added delay between every 10 messages

---
 server/lora.py | 22 +++++++---------------
 server/main.py |  6 ------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/server/lora.py b/server/lora.py
index ef81241..4642eac 100644
--- a/server/lora.py
+++ b/server/lora.py
@@ -54,23 +54,10 @@ class LoraDevice:
 		self.stop_id = stop_id
 		self.message_pool = []
 		self.thread = None
-		self.sent_departures = {}
+		self.port = 1
 		self.send(lambda: "CLEAR")
 
-	def resend(self):
-		to_send = []
-		for d in self.sent_departures:
-			if self.sent_departures[d] <= 2:
-				to_send.append(d)
-		shuffle(to_send)
-		for d in to_send[:1]:
-			self.send_departure(d)
-
 	def send_departure(self, departure):
-		if departure not in self.sent_departures:
-			self.sent_departures[departure] = 1
-		else:
-			self.sent_departures[departure] += 1
 		self.send(departure.__repr__)
 
 	def send(self, msg):
@@ -91,8 +78,13 @@ class LoraDevice:
 			payload = {
 				"confirmed": True,
 				"data": b64encode(message.encode("utf-8")).decode("ascii"),
-				"fPort": randint(1, 50),
+				"fPort": self.port,
 				"reference": "string"
 			}
 			print(f"{self.id:0>16x} > {message}")
 			requests.post(url, verify=False, headers=headers, data=json.dumps(payload))
+			self.port += 1
+			if self.port == 11:
+				self.port = 1
+				sleep(15)
+
diff --git a/server/main.py b/server/main.py
index bdc56d5..96d6aff 100644
--- a/server/main.py
+++ b/server/main.py
@@ -68,16 +68,11 @@ class Main:
 	def update_loop(self):
 		refetch = 0
 		regenerate = 1
-		resend = 1
 		while True:
 
 			if self.ended:
 				break
 
-			if resend == 0:
-				for d in self.controller.devices:
-					d.resend()
-
 			if regenerate == 0:
 				self.controller.generate_token()
 
@@ -88,7 +83,6 @@ class Main:
 			
 			refetch = (refetch + 1) % 3
 			regenerate = (regenerate + 1) % (6*30)
-			resend = (resend + 1) % 7
 			
 			sleep(.1)