lukasplevac/YAGS
1
0
Fork 0
mirror of https://github.com/Lukas0025/YAGS.git synced 2025-04-03 14:31:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support for telemetry

Browse Source
This commit is contained in:
Lukáš Plevač 2024-04-12 12:53:35 +02:00
parent 5053aaa2c8
commit f26bd3e091
11 changed files with 128 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose-dev.yml
View File

@ -4,6 +4,6 @@ services:
image: yags-web
build: ./web
ports:
- 8080:80
- 3939:80
volumes:
- ./web:/var/www/html/
- ./web:/var/www/html/

43
web/API/observations.php
View File

@ -72,60 +72,101 @@
}
function fail($params) {
if (is_null($params["id"])) {
return ["status" => "observation ID is not set"];
}
$obs = new \DAL\observation();
$obs->id->set($params["id"]);
$obs->fetch();
$obs->status->set("fail");
$obs->commit();
return ["status" => true];
}
function assigned($params) {
if (is_null($params["id"])) {
return ["status" => "observation ID is not set"];
}
$obs = new \DAL\observation();
$obs->id->set($params["id"]);
$obs->fetch();
$obs->status->set("assigned");
$obs->commit();
return ["status" => true];
}
function recording($params) {
if (is_null($params["id"])) {
return ["status" => "observation ID is not set"];
}
$obs = new \DAL\observation();
$obs->id->set($params["id"]);
$obs->fetch();
$obs->status->set("recording");
$obs->commit();
return ["status" => true];
}
function recorded($params) {
if (is_null($params["id"])) {
return ["status" => "observation ID is not set"];
}
$obs = new \DAL\observation();
$obs->id->set($params["id"]);
$obs->fetch();
$obs->status->set("recorded");
$obs->commit();
return ["status" => true];
}
function decoding($params) {
if (is_null($params["id"])) {
return ["status" => "observation ID is not set"];
}
$obs = new \DAL\observation();
$obs->id->set($params["id"]);
$obs->fetch();
$obs->status->set("decoding");
$obs->commit();
return ["status" => true];
}
function success($params) {
if (is_null($params["id"])) {
return ["status" => "observation ID is not set"];
}
$obs = new \DAL\observation();
$obs->id->set($params["id"]);
$obs->fetch();
$obs->status->set("success");
$obs->commit();
return ["status" => true];
}
function addArtefacts($params) {
if (is_null($params["fname"]) || is_null($params["id"])) {
return ["status" => "file name or observation ID is not set"];
}
$adir = __DIR__ . "/../ARTEFACTS/" . $params["id"];
@ -156,4 +197,6 @@
//done artefact save
$obs->artefacts->set($artefacts);
$obs->commit();
return ["status" => true];
}

2
web/CONTROLLERS/target.php
View File

@ -50,4 +50,4 @@
$templates->load("target.html");
$templates->render($context);
$templates->show();
$templates->show();

2
web/VIEWS/blocks/observation-item_short.html
View File

@ -1,4 +1,4 @@
<tr onclick="location.href = '/observation/{% BIND item.id %}'">
<tr onclick="location.href = '/observation/{% BIND item.id %}'" style="{% IF item.id==observation.id USE background-color:antiquewhite %}">
<td>{% BIND item.transmitter.modulation.name %}</td>
<td>
<span class="badge

20
web/VIEWS/observation.html
View File

@ -185,7 +185,7 @@
<div class="col-12 col-md-9 d-flex flex-column">
<div class="card-body">
<h2 class="mb-4" id="artefact-title"></h2>
<div id="artefact-body" class="row align-items-center scrollable" style="height: 35rem">
<div id="artefact-body" class="row align-items-center scrollable" style="height: 35rem; display: block;">
<div class="empty">
<div class="empty-img"><img src="/static/icons/undraw_printing_invoices_5r4r.svg" height="128" alt="">
</div>
@ -208,6 +208,7 @@
<!-- Tabler Core -->
<script src="/dist/js/tabler.min.js?1668287865" defer=""></script>
<script src="/dist/js/simple-json-viewer.min.js"></script>
<script>
function extension(val) {
var parts = val.split(".");
@ -243,7 +244,22 @@
request.send();
request.onreadystatechange = function () {
if (request.readyState === 4 && request.status === 200) {
document.getElementById("artefact-body") .innerHTML = "<pre>" + request.responseText + "</pre>";
if (extension(name) == "txt") {
document.getElementById("artefact-body").innerHTML = "<pre>" + request.responseText + "</pre>";
} else {// it is json
var container = document.getElementById("artefact-body");
container.innerHTML = "";
var json = request.responseText;
var options = {
fontFamily: '"Fira Mono", monospace',
colors: ['gray', '#090', '#c00', 'purple', '#00c', '#ccc', '#333', 'yellow', 'rgb(240,240,240)']
};
var viewer = createJSONViewer(container, json, options);
}
}
}
} else {

2
web/VIEWS/target.html
View File

@ -279,4 +279,4 @@
</div>
</body>
</html>
</html>

1
web/dist/js/simple-json-viewer.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
web/index.php
View File

@ -16,6 +16,7 @@
"sites" => [
"observations" => ["controller" => __DIR__ . "/CONTROLLERS/observations.php", "name" => "Observations", "icon" => "/static/icons/telescope.svg", "menu" => true],
"targets" => ["controller" => __DIR__ . "/CONTROLLERS/targets.php", "name" => "Targets", "icon" => "/static/icons/focus-2.svg", "menu" => true],
//"modulations" => ["controller" => __DIR__ . "/CONTROLLERS/telemetry.php", "name" => "Telemetry", "icon" => "/static/icons/wave-sine.svg", "menu" => true],
/*
"stations" => ["controller" => __DIR__ . "/CONTROLLERS/stations.php", "name" => "Stations", "icon" => "/static/icons/radio.svg", "menu" => true],
"modulations" => ["controller" => __DIR__ . "/CONTROLLERS/modulations.php", "name" => "Modulations", "icon" => "/static/icons/wave-sine.svg", "menu" => true],

64
web/seeds.php
View File

@ -28,6 +28,10 @@
$beaconType->name->set("Beacon");
$beaconType->commit();
$telemetryType = new \DAL\dataType();
$telemetryType->name->set("Telemetry");
$telemetryType->commit();
/**
* Antennas seeds
*/
@ -44,6 +48,10 @@
$qfh->name->set("QFH");
$qfh->commit();
$dipole = new \DAL\Antenna();
$dipole->name->set("Dipole");
$dipole->commit();
/**
* Test station
@ -65,18 +73,21 @@
"radio" => "rtlsdr",
"gain" => 45,
"agc" => false,
"bias" => false,
"fs" => [250000, 1024000, 1536000, 1792000, 1920000, 2048000, 2160000, 2400000, 2560000, 2880000, 3200000]
]);
$myStation137->antenna->set($yagi);
$myStation137->centerFrequency->set(137500000);
$myStation137->centerFrequency->set(433500000);
$myStation137->gain->set(45);
$myStation137->commit();
/*
$myStation2G = new \DAL\receiver();
$myStation2G->station->set($myStation);
$myStation2G->params->set([
"radio" => "hackrf",
"amp" => true,
"bias" => false,
"lna_gain" => 45,
"vga_gain" => 10,
"bias" => true
@ -85,6 +96,7 @@
$myStation2G->centerFrequency->set(1700000000);
$myStation2G->gain->set(45);
$myStation2G->commit();
*/
/**
* Modulations
@ -122,7 +134,7 @@
$aptPipe->pipe->set([
"satdump noaa_apt baseband {baseband} {artefactDir} --samplerate {fs} --satellite_number {targetNum} --start_timestamp {start} --autocrop_wedges --baseband_format s8",
"baseband_spectogram.py {baseband} {artefactDir}/spectogram.png -fs {fs} -fc {freq}",
"cp {baseband} {artefactDir}/{freq}_{fs}.s8"
"cp {baseband} {artefactDir}/{dtstart}_{fs}SPS_{freq}Hz.s8"
]);
$aptPipe->commit();
@ -132,7 +144,7 @@
$lrptPipe->pipe->set([
"satdump meteor_m2-x_lrpt baseband {baseband} {artefactDir} --samplerate {fs} --baseband_format s8",
"baseband_spectogram.py {baseband} {artefactDir}/spectogram.png -fs {fs} -fc {freq}",
"cp {baseband} {artefactDir}/{freq}_{fs}.s8"
"cp {baseband} {artefactDir}/{dtstart}_{fs}SPS_{freq}Hz.s8"
]);
$lrptPipe->commit();
@ -141,7 +153,7 @@
$spectogramPipe->name->set("Spectogram");
$spectogramPipe->pipe->set([
"baseband_spectogram.py {baseband} {artefactDir}/spectogram.png -fs {fs} -fc {freq}",
"cp {baseband} {artefactDir}/{freq}_{fs}.s8"
"cp {baseband} {artefactDir}/{dtstart}_{fs}SPS_{freq}Hz.s8",
]);
$spectogramPipe->commit();
@ -151,11 +163,24 @@
$cwPipe->pipe->set([
"baseband_spectogram.py {baseband} {artefactDir}/spectogram.png -fs {fs} -fc {freq}",
"cw_morse.py {baseband} {artefactDir}/morse.txt -fs {fs} -fc \"[?]\"",
"cp {baseband} {artefactDir}/{freq}_{fs}.s8"
"cp {baseband} {artefactDir}/{dtstart}_{fs}SPS_{freq}Hz.s8"
]);
$cwPipe->commit();
$luckyPipe = new \DAL\processPipe();
$luckyPipe->name->set("Lucky7-UHF");
$luckyPipe->pipe->set([
"satdump lucky7_link baseband {baseband} {artefactDir} --samplerate {fs} --dc_block --start_timestamp {start} --enable_doppler --baseband_format s8",
"baseband_spectogram.py {baseband} {artefactDir}/spectogram.png -fs {fs} -fc {freq}",
"/decoders/lucky7 {artefactDir}/lucky7_link.frm {start} > {artefactDir}/telemetry.json",
"cp {baseband} {artefactDir}/{dtstart}_{fs}SPS_{freq}Hz.s8",
"test -f {artefactDir}/lucky7_link.frm"
]);
$luckyPipe->commit();
/**
* NOAA 19
@ -359,13 +384,26 @@
$maxvalierCW->processPipe->set($cwPipe);
$maxvalierCW->commit();
// add autoplas
$myStation137->autoPlan->set([
$noaa15APT->id->get(),
$noaa18APT->id->get(),
$noaa19APT->id->get(),
$meteor23LRPT1->id->get(),
$maxvalierCW->id->get()
$lucky7 = new \DAL\target();
$lucky7->name->set("Lucky 7");
$lucky7->type->set($nanosatelliteType);
$lucky7->orbit->set("sso");
$lucky7->description->set("It is a single unit CubeSat with a size of 112×112×113.5 mm, to be easily traceable in space, available by launch cost and compatible with a variety of launch opportunities. Its aim is to test everyday electronics tweaked for deep space or long-lasting missions such as to the Moon, Mars, and beyond. As their lucky number is seven and it is supposed to be the seventh Czech made satellite in a row, they called it simply Lucky-7.");
$lucky7->locator->set([
"tle" => [
"line1" => "1 44406U 19038W 24094.95219425 .00026482 00000-0 71098-3 0 9995",
"line2" => "2 44406 97.7044 89.1200 0014055 7.8960 352.2502 15.37821998262930"
]
]);
$lucky7->commit();
$myStation137->commit();
$lucky7Telem = new \DAL\transmitter();
$lucky7Telem->target->set($lucky7);
$lucky7Telem->dataType->set($telemetryType);
$lucky7Telem->bandwidth->set(120000);
$lucky7Telem->centerFrequency->set(437525000);
$lucky7Telem->modulation->set($bpsk);
$lucky7Telem->antenna->set($dipole);
$lucky7Telem->priority->set(0);
$lucky7Telem->processPipe->set($luckyPipe);
$lucky7Telem->commit();

11
web/static/js/station.js
View File

@ -27,6 +27,11 @@ function updateStation(id) {
xhttp.send(station);
}
function rmAutoPlan(id) {
var ele = document.getElementsByName(id);
ele[0].remove();
}
function addAutoPlan() {
var sel = document.getElementById("select-transmitter");
@ -36,7 +41,7 @@ function addAutoPlan() {
var text = sel.options[sel.selectedIndex].text;
document.getElementById("receiver-auto-plan").innerHTML +=
'<span name="' + sel.value + '" class="status ms-2 mt-2" style="font-size: 10px;">' + text + '</span>';
'<span name="' + sel.value + '" class="status ms-2 mt-2" style="font-size: 10px;">' + text + ' <button type="button" class="btn btn-danger btn-sm" aria-label="del" onclick=\'rmAutoPlan("' + sel.value + '")\'>X</button></span>';
}
function getAutoPlaned() {
@ -75,7 +80,7 @@ function loadReceiver(id) {
data.autoPlan.values[i].target + " - " +
data.autoPlan.values[i].modulation + " - " +
data.autoPlan.values[i].dataType + " @ " +
data.autoPlan.values[i].freq + 'Hz</span>';
data.autoPlan.values[i].freq + 'Hz <button type="button" class="btn btn-danger btn-sm" aria-label="del" onclick=\'rmAutoPlan("' + data.autoPlan.values[i].id + '")\'>X</button></span>';
}
document.getElementById("receiver-auto-plan").innerHTML = block;
@ -150,4 +155,4 @@ function apiRegenerate(id) {
xhttp.open("POST", "/api/station/apiRegenerate", true);
xhttp.send(station);
}
}

2
web/wsos

@ -1 +1 @@
Subproject commit f925d44258c4f476dc3b2a37cc96e631ea7649f4
Subproject commit 3cd7b2d2475e20996c9c160b3d9c0c2544d035e1