Added departure type & port rotation

server/departures.py

@@ -58,6 +58,7 @@ class Departure:
 			if did not in Departure.storage:
 				Departure(
 					did,
+					c["Line"]["TractionType"],
 					c["Line"]["Name"],
 					c["LastStopName"],
 					c["DepartureTime"],
@@ -68,7 +69,7 @@ class Departure:
 					0 if not c["DelayMin"] else c["DelayMin"]
 				)
 
-	def __init__(self, did, line, last_stop, departure, delay):
+	def __init__(self, did, type, line, last_stop, departure, delay):
 		departure = (parser.parse(departure)).timestamp()
 		if -(datetime.now().timestamp() - (departure + delay*60))/60 <= -1:
 			return
@@ -76,8 +77,11 @@ class Departure:
 		self.did = did
 		self.id = Departure.get_id()
 		self.line = line
+		if len(last_stop) >= 21:
+			last_stop = last_stop[:20].strip() + "..."
 		self.last_stop = last_stop
 		self.departure = departure
+		self.type = type
 		self.update(delay)
 		DeviceController.data(self)
 
@@ -90,4 +94,4 @@ class Departure:
 		return departure
 
 	def __repr__(self):
-		return f"{self.id}|{self.line}|{self.last_stop}|{floor(self.get_departure()/10)}"
+		return f"{self.id}|{self.type}|{self.line}|{self.last_stop}|{floor(self.get_departure()/10)}"

server/lora.py

@@ -29,6 +29,7 @@ class LoraDevice:
 	
 	def __init__(self, deveui: int):
 		self.id = deveui
+		self.port = 1
 
 	def send(self, msg: str):
 
@@ -43,12 +44,12 @@ class LoraDevice:
 		data = {
 			"confirmed": True,
 			"data": b64encode(msg.encode("utf-8")).decode("ascii"),
-			"fPort": 1,
+			"fPort": self.port,
 			"reference": "string"
 		}
+		self.port = (self.port + 1) % 15 + 1;
 
 		data = requests.post(url, verify=False, headers=headers, data=json.dumps(data))
-		sleep(3)
 
 dev = LoraDevice(0xbdea85badeedf1)
 
@@ -78,5 +79,5 @@ class DeviceController:
 		if not send:
 			return
 		
-		string = f"{data.id}|{data.line}|{data.last_stop}|{data.get_departure()}"
+		string = f"{data.id}|{data.type}|{data.line}|{data.last_stop}|{data.get_departure()}"
 		dev.send(f"{string}")