Skip to content

Commit 3f0106d

Browse files
committed
Prepare for new telemetry types, initial add of sonde type to list.
1 parent c023b6c commit 3f0106d

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ function checkSize() {
309309

310310
$("#mapscreen,.flatpage").height(h-hh-5);
311311

312-
sw = (wvar.vlist) ? 200 : 0;
312+
sw = (wvar.vlist) ? 260 : 0;
313313

314314
$('.container').width(w-20);
315315

js/tracker.js

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,19 +574,29 @@ function habitat_data(jsondata, alternative) {
574574
"uplink_rssi": "Uplink RSSI",
575575
"light_intensity": "Light Intensity",
576576
"pred_lat": "Onboard Prediction (Lat)",
577-
"pred_lon": "Onboard Prediction (Lon)"
577+
"pred_lon": "Onboard Prediction (Lon)",
578+
"batt": "Battery Voltage",
579+
"sats": "GNSS SVs Used",
580+
"humidity": "Relative Humidity",
581+
"subtype": "Sonde Sub-type",
582+
"frequency": "TX Frequency",
583+
"manufacturer": "Manufacturer",
584+
"type": "Sonde Type",
585+
"burst_timer": "Burst Timer"
578586
};
579587

580588
var hide_keys = {
581589
"spam": true,
582590
"battery_millivolts": true,
583591
"temperature_internal_x10": true,
584-
"uplink_rssi_raw": true
592+
"uplink_rssi_raw": true,
593+
"xdata": true
585594
};
586595

587596
var suffixes = {
588597
"current": " A",
589598
"battery": " V",
599+
"batt": " V",
590600
"solar_panel": " V",
591601
"temperature": "°C",
592602
"temperature_internal": "°C",
@@ -603,6 +613,8 @@ function habitat_data(jsondata, alternative) {
603613
"iss_azimuth": "°",
604614
"iss_elevation": "°",
605615
"light_intensity": " lx",
616+
"humidity": " %",
617+
"frequency": " MHz",
606618
"spam": ""
607619
};
608620

@@ -1015,8 +1027,14 @@ function updateVehicleInfo(vcallsign, newPosition) {
10151027

10161028

10171029
// start
1030+
// TABLE STUFF HERE
1031+
1032+
// TODO: Use type / subtype fields instead of this hack.
1033+
var sonde_type = newPosition.data.comment.split(' ')[0];
1034+
10181035
var a = '<div class="header">' +
1019-
'<span>' + vcallsign + ' <i class="icon-target"></i></span>' +
1036+
'<span>' + sonde_type + " " + vcallsign + ' <i class="icon-target"></i></span>' +
1037+
//'<span>' + vcallsign + ' <i class="icon-target"></i></span>' +
10201038
'<canvas class="graph"></canvas>' +
10211039
'<i class="arrow"></i></div>' +
10221040
'<div class="data">' +

0 commit comments

Comments
 (0)