From 42e624a3d4f7d87d35e4f8a88b47154a93c6ab89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Pleva=C4=8D?= <lukas@plevac.eu>
Date: Sun, 1 Oct 2023 17:43:57 +0200
Subject: [PATCH] Added support for auto plan

---
 station/__pycache__/config.cpython-311.pyc | Bin 245 -> 341 bytes
 station/__pycache__/puller.cpython-311.pyc | Bin 2730 -> 5254 bytes
 station/artefacts/.gitkeep                 |   0
 station/config.py                          |  14 ++----
 station/main.py                            |  32 +++++++++----
 station/planner.py                         |  50 +++++++++++++++++++++
 station/puller.py                          |  24 +++++++---
 station/records/.gitkeep                   |   0
 web/API/{cron.php => crons.php}            |   8 ++--
 web/API/main.php                           |   2 +-
 10 files changed, 101 insertions(+), 29 deletions(-)
 create mode 100644 station/artefacts/.gitkeep
 create mode 100644 station/planner.py
 create mode 100644 station/records/.gitkeep
 rename web/API/{cron.php => crons.php} (77%)

diff --git a/station/__pycache__/config.cpython-311.pyc b/station/__pycache__/config.cpython-311.pyc
index b9c79a79e92b41d4a91fecc7605a518d1887f6d5..0ecb19dc6b3fb25a9b7871d520848bc17cad9e63 100644
GIT binary patch
delta 293
zcmey$c$KMsIWI340}!-3N~RtG(vLwL7+`@iKFa|a(-~42q8L&bqZm_|qL@;c!H{JR
za};w5YcPW*TNQssNlAf~zP_P>9tc{z1Q}eVl9Fa=X<(XSq-$tymZ)ozn3$?-k(6ek
zYno=1W};x6WMOP#mh=*2lP2>m=A6V5Ad#PUi#ai;#7~oDVzQ$7E%xG)#FEVXyp;@}
zLF#^)>lYViq!sHI=jE5@q~;eS7NzLslx8Ou>${|u>8EFw=tnxb2Txol>&ORG&IrWC
z`at3XGb1D84FSal&Km+k4Lmml%o^A}a4_)j-r(i|q7UpWf=nM6fJ6g32o~`G^#A~?
CG)dzC

delta 196
zcmcc0^p!DrIWI340}xzpU`&ky(vLwL7+{1lJ_`XE(-~42q8L&bqZm_|qL@;cgBdhg
zszftNN(!v>^>gx*6LT{1i%YC53=9ljf{eVy0%RHZX);fouc)<>;WNmrU&i_w`MIh3
zIi=Z&#RWO3Wr@l9>6s<^MTsey`M!z8C8<RdzsqWYw1ey}mH-kTm>C%vZwRP2aNZCQ
RYT&scAlASJf<+uaNdPu1FZlof

diff --git a/station/__pycache__/puller.cpython-311.pyc b/station/__pycache__/puller.cpython-311.pyc
index 0d36b1504b289c57c85690f3e1736d8d88b51296..b4091ea79bdf8cb7c1cea825f82cd0405706be47 100644
GIT binary patch
literal 5254
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

delta 995
zcmZ`%&1(}u6yMoyHk)jc#-yz=ZPQR~!)j}aR#6FRq4ZE~4hB3_53ZRZO-+;dW>Y=*
z5kv%`h;@*jysFhgh2FfW;KfS|J(OU<KOx{n#Dj0vrWA^g<hSp0-f!NUC)T^p(3@b;
zub?bFB5Y1u48_RoV(Qenf-<dB?XfcLr5;3s>WDt-Mf6hx(WE}a0QDmVsfie(B&S$`
z#jk&eCBBeR#9t)Qe=<E&nPcfv?Uv1}B{py8(}kjw2AdWuQ#N-Ph>Y6jX-5t|aYLQ#
zRwbPs(eT@b|DRV8mK5<R&?N@6#KRTx8q?nIrruZYsk1WK6{MkNEw#~BgHl7IwqskK
zh5_t$jd6!Jv}%Prpkpd{5gMAq?mAW*M5HGwJp{PynoK4kByF!<E#_F6LJTeR3@dy9
zwYsuxgcpLZ1~=nJ-{v;rBOjb~BeP*-HjPYuY|9KRoUTtn_=RU?SQajmhFQ7E8O+;G
zu~Oy)eXRzZITLoV1PSy-#7j?#VA&<{z#BPhb6zZz8HG5;pj$!@!rpQd%g0)2Nep(%
z1d-DZ|2yWh-ZT9F>Ht<>VfhNsVz~hQSQ-<iH+4OXT3(WDiPYU~$k{C^RLS9;vdjDV
z_**9;>p{$wq`91RUD?u%`na6Qp|!ODCnPRXp<Z2H8<Ju&G!%0O9;n*DS(e?I#DT#G
zMib&$Xtmp=gx0P|IxeM)V&%Yvyrcw2&}XS2UzA&F5jc+e-hpY=TB!sl(0fcq`VerL
zX6Mt)LZ&{xt%aX=Y-nAZTGx8(2eP%*4!T&4B(8O!0X_*s65LjD#qRzfDK$Aq_wp_W
zw-?Aq;~wNbtKUXuu0m@ib{<ACAg9Z}DdKW;!uuoGUiUXO@iE#fzDGyS_?ikKJD{7S
Ruc_=pTqOsa%6@SB`~@bz*Rucs

diff --git a/station/artefacts/.gitkeep b/station/artefacts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/station/config.py b/station/config.py
index dacd5f2..cae5a3f 100644
--- a/station/config.py
+++ b/station/config.py
@@ -1,10 +1,4 @@
-masterUrl     = "http://10.0.3.41:8000"
-pullInterval  = 10 # in sec
-apiKey        = "7b105947-65d6-40ba-bb4c-50b95a3ec1c8"
-
-# do not edit
-station       = {
-    "lat": 0,
-    "lon": 0,
-    "alt": 0 #KM
-}
\ No newline at end of file
+masterUrl     = "http://10.0.0.8"
+pullInterval  = 120 # in sec
+apiKey        = "672bccda-6eb3-4cae-bcbf-ed398e9d3dd9"
+planInterval  = 1200 # in sec
\ No newline at end of file
diff --git a/station/main.py b/station/main.py
index cf20c69..831b21f 100644
--- a/station/main.py
+++ b/station/main.py
@@ -4,16 +4,24 @@ import time
 from datetime import datetime, timedelta
 from recorder import recorder
 
+import sys
+import traceback
+import planner
+
 def onRecorded(info):
     pass
 
+i = 0
 while True:
     try:
-        puller.pull()
+        if (i % config.pullInterval) == 0:
+            puller.pull()
 
+        jobsDeltas = []
         for job in puller.watingJobs:
-            print(f"Job {job['target']['name']} starts at {job['start']}")
 
+            jobsDeltas.append((job["start"] - datetime.utcnow()).total_seconds())
+            
             if job["start"] <= datetime.utcnow() + timedelta(seconds=60):
                 if job["end"] <= datetime.utcnow():
                     puller.setFail(job["id"])
@@ -22,15 +30,21 @@ while True:
                 # start record
                 puller.setRecording(job["id"])
 
-                curRecorder = recorder(job)
+                curRecorder = recorder(job, puller.location)
                 curRecorder.start()
                 
                 puller.watingJobs.remove(job)
+
+        if (i % 10) == 0 and len(jobsDeltas):
+            print(f"Next job in {min(jobsDeltas)}s")
+
+        # ask for planeble satellites
+        if (i % config.planInterval) == 0:
+            planner.planAll(puller.location)
+
+        i += 1
     
-    except:
-        print("[ERROR] main script fail restarting")
+    except Exception as inst:
+        print(f"[ERROR] main script fail restarting - error {inst}")
 
-
-
-
-    time.sleep(config.pullInterval)
\ No newline at end of file
+    time.sleep(1)
\ No newline at end of file
diff --git a/station/planner.py b/station/planner.py
new file mode 100644
index 0000000..9a9caef
--- /dev/null
+++ b/station/planner.py
@@ -0,0 +1,50 @@
+from pyorbital.orbital import Orbital
+from datetime import datetime, timedelta
+import time
+
+import puller
+
+def plan(lat, lon, alt, tle, transmitter, receiver, name, delta = timedelta(seconds=1800), predictH = 24, horizon = 0):
+    #prevent plan same obsevation
+    last = datetime.utcnow()
+
+    for ob in puller.watingJobs:
+        last = max(ob["start"], last)
+
+    orb = Orbital(name, line1=tle["line1"], line2=tle["line2"])
+
+    passes = orb.get_next_passes(
+        datetime.utcnow() + delta,
+        predictH,
+        lon,
+        lat,
+        alt,
+        tol = 0.001,
+        horizon = horizon
+    )
+
+    for ob in passes:
+        start = ob[0]
+        end   = ob[1]
+
+        if start < last:
+            print(f"[INFO] alredy planed {name} at {start}")
+            continue
+
+        print(f"[INFO] planed {name} at {start}")
+
+        puller.plan(transmitter, receiver, start, end)
+
+def planAll(location):
+    planeble = puller.getPlaneble()
+
+    for transmitter in planeble:
+        plan(
+            location["lat"],
+            location["lon"],
+            location["alt"],
+            transmitter["locator"]["tle"],
+            transmitter["transmitter"],
+            transmitter["receiver"],
+            transmitter["name"]
+        )
\ No newline at end of file
diff --git a/station/puller.py b/station/puller.py
index 846d6da..85d4b0f 100644
--- a/station/puller.py
+++ b/station/puller.py
@@ -8,6 +8,7 @@ import os
 import pathlib
 
 watingJobs = []
+location   = {}
 
 def getNewJobs():
     response = urlopen(config.masterUrl + "/api/observation/record?key=" + config.apiKey)
@@ -19,10 +20,23 @@ def getInfo():
     data_json = json.loads(response.read())
     return data_json
 
+def getPlaneble():
+    response = urlopen(config.masterUrl + "/api/station/autoPlanable?key=" + config.apiKey)
+    data_json = json.loads(response.read())
+    return data_json
+
 def apiSend(url, data, files=None):
     r = requests.post(url=config.masterUrl + url, data=data, files=files)
     return r.text
 
+def plan(transmitter, receiver, start, end):
+    apiSend("/api/observation/plan", {
+        "transmitter": transmitter,
+        "receiver":    receiver,
+        "start":       start.strftime("%Y-%m-%dT%H:%M:%S"),
+        "end":         end  .strftime("%Y-%m-%dT%H:%M:%S")
+    })
+
 def setFail(observation):
     apiSend("/api/observation/fail", {"id": observation})
 
@@ -71,12 +85,12 @@ def parseNewJobs(jobs):
         watingJobs.append(job)
 
 def parseInfo(info):
-    if "gps" in info:
-        config.lat = info["gps"]["lat"]
-        config.lon = info["gps"]["lon"]
-        config.alt = info["gps"]["alt"] / 1000
+    if "gps" in info["locator"]:
+        location["lat"] = info["locator"]["gps"]["lat"]
+        location["lon"] = info["locator"]["gps"]["lon"]
+        location["alt"] = info["locator"]["gps"]["alt"] / 1000
 
-        print(f"[INFO] loaded locator from YAGS server LAT: {config.lat}, LON: {config.lon}, ALT: {config.alt}")
+        #print(f"[INFO] loaded locator from YAGS server LAT: {position["lat"]}, LON: {position["lon"]}, ALT: {position["alt"]}")
 
 def pull():
     #get station info
diff --git a/station/records/.gitkeep b/station/records/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/web/API/cron.php b/web/API/crons.php
similarity index 77%
rename from web/API/cron.php
rename to web/API/crons.php
index f3ec5e0..a2b1dfa 100644
--- a/web/API/cron.php
+++ b/web/API/crons.php
@@ -7,7 +7,7 @@
 
     function tle($params) {
         // get all targets
-        $targets = new \wsos\database\core\table(\DAL\targets::class);
+        $targets = new \wsos\database\core\table(\DAL\target::class);
 
         $updated = [];
         foreach ($targets->getAll()->values as $target) {
@@ -23,9 +23,9 @@
                 $newTle = file_get_contents("https://celestrak.org/NORAD/elements/gp.php?CATNR={$norad}&FORMAT=tle");
                 $newTle = explode("\n", $newTle);
 
-                if (count($newTle) == 3) { //tle loaded
-                    $locator["tle"]["line1"] = $newTle[1];
-                    $locator["tle"]["line2"] = $newTle[2];
+                if (count($newTle) >= 3) { //tle loaded
+                    $locator["tle"]["line1"] = str_replace("\r", "", $newTle[1]);
+                    $locator["tle"]["line2"] = str_replace("\r", "", $newTle[2]);
 
                     $updated[] = ["name" => $target->name->get(), "norad" => $norad];
 
diff --git a/web/API/main.php b/web/API/main.php
index 8d4ce5c..b463cf0 100644
--- a/web/API/main.php
+++ b/web/API/main.php
@@ -13,7 +13,7 @@
     //register API functions
     include_once(__DIR__ . "/observations.php");
     include_once(__DIR__ . "/stations.php");
-    include_once(__DIR__ . "/cron.php");
+    include_once(__DIR__ . "/crons.php");
 
     //init API
     $api->serve($router->getArgs());
\ No newline at end of file