Merge branch 'main' of github.com:ODZ-UJF-AV-CR/Web-FIK

ODZ-UJF-AV-CR · Dec 1, 2023 · 6c4558d · 6c4558d
2 parents bd08197 + da93d7d
commit 6c4558d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 910 deletions.
diff --git a/CDP.py b/CDP.py
@@ -78,7 +78,7 @@ async def forward_heartbeat(request: Request):
         car_dict[car_id] = Uploader(car_id)
         print(car_dict) 
     car_dict[car_id].upload_station_position(
-        car_id + "Test",
+        "fik-" + car_id + "Test",
         [latitude, longitude, altitude],
         mobile=True
     )
@@ -98,7 +98,7 @@ async def forward_data(request: Request):
         response = send_data_to_express("/post/car/data", data)
         print("Received data is newer than the existing data.")
         uploader_data.add_telemetry(
-            balloon_id,
+            "fik-" + balloon_id + + "Test",
             datetime.datetime.utcnow(),
             latitude,
             longitude,

diff --git a/LDP.py b/LDP.py
@@ -68,11 +68,11 @@ def on_message(client, userdata, message):
                 balloons_dict[balloon_id] = Uploader(balloon_id)
 
             balloons_dict[balloon_id].add_telemetry(
-                    balloon_id + "Test",
+                    "fik-" + balloon_id + "Test",
                     datetime.datetime.utcnow(),
                     latitude,
                     longitude,
-                    altitude + 1000
+                    altitude
                 )
         except json.JSONDecodeError as e:
             print(f"Error decoding JSON: {e}")