Skip to content

Commit 8c8e47a

Browse files
LukePriorLukePrior
authored
Merge pull request projecthorus#175 from LukePrior/testing
show frequency
2 parents f70a4b4 + 41f34cb commit 8c8e47a

File tree

1 file changed

+69
-18
lines changed

1 file changed

+69
-18
lines changed

‎js/tracker.js‎

Lines changed: 69 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,8 @@ function habitat_data(jsondata, alternative) {
10511051
"sats": "GNSS SVs Used",
10521052
"humidity": "Relative Humidity",
10531053
"subtype": "Sonde Sub-type",
1054-
"frequency": "TX Frequency",
1054+
"frequency": "Frequency",
1055+
"frequency_tx": "TX Frequency",
10551056
"manufacturer": "Manufacturer",
10561057
"type": "Sonde Type",
10571058
"burst_timer": "Burst Timer",
@@ -1092,6 +1093,7 @@ function habitat_data(jsondata, alternative) {
10921093
"light_intensity": " lx",
10931094
"humidity": " %",
10941095
"frequency": " MHz",
1096+
"frequency_tx": " MHz",
10951097
"spam": ""
10961098
};
10971099

@@ -1102,11 +1104,18 @@ function habitat_data(jsondata, alternative) {
11021104
var data = (typeof jsondata === "string") ? $.parseJSON(jsondata) : jsondata;
11031105
var array = [];
11041106
var output = "";
1107+
var txFreq = false
11051108

11061109
if(Object.keys(data).length === 0) return "";
11071110

1111+
if ("frequency_tx" in data) {
1112+
txFreq = true
1113+
}
1114+
11081115
for(var key in data) {
1109-
array.push([key, data[key]]);
1116+
if (key === "frequency" && txFreq) {} else {
1117+
array.push([key, data[key]]);
1118+
}
11101119
}
11111120

11121121
array.sort(function(a, b) {
@@ -1580,21 +1589,26 @@ function updateVehicleInfo(vcallsign, newPosition) {
15801589
for(var rxcall in newPosition.callsign){
15811590
if(newPosition.callsign.hasOwnProperty(rxcall)) {
15821591
_new_call = rxcall;
1592+
tempFields = [];
15831593
if(newPosition.callsign[rxcall].hasOwnProperty('snr')){
15841594
if(newPosition.callsign[rxcall].snr){
1585-
_new_call += " (" + newPosition.callsign[rxcall].snr.toFixed(0) + " dB)";
1586-
callsign_list.push(_new_call)
1587-
continue;
1595+
tempFields.push(newPosition.callsign[rxcall].snr.toFixed(0) + " dB");
15881596
}
15891597
}
15901598
if(newPosition.callsign[rxcall].hasOwnProperty('rssi')){
15911599
if(newPosition.callsign[rxcall].rssi){
1592-
_new_call += " (" + newPosition.callsign[rxcall].rssi.toFixed(0) + " dBm)";
1593-
callsign_list.push(_new_call)
1594-
continue;
1600+
tempFields.push(newPosition.callsign[rxcall].rssi.toFixed(0) + " dBm");
15951601
}
15961602
}
1597-
callsign_list.push(_new_call); // catch cases where there is no SNR or RSSI
1603+
if(newPosition.callsign[rxcall].hasOwnProperty('frequency')){
1604+
if(newPosition.callsign[rxcall].frequency){
1605+
tempFields.push(newPosition.callsign[rxcall].frequency + " MHz");
1606+
}
1607+
}
1608+
if(tempFields.length > 0) {
1609+
_new_call += " (" + tempFields.join(", ") + ")";
1610+
}
1611+
callsign_list.push(_new_call); // catch cases where there are no fields
15981612
}
15991613
}
16001614
callsign_list = callsign_list.join(", ");
@@ -2087,8 +2101,10 @@ function mapInfoBox_handle_path_fetch(id,vehicle) {
20872101
if (data.hasOwnProperty("batt")) {
20882102
html += "<div><b>Battery Voltage:&nbsp;</b>" + data.batt + " V</div>";
20892103
};
2090-
if (data.hasOwnProperty("frequency")) {
2091-
html += "<div><b>TX Frequency:&nbsp;</b>" + data.frequency + " MHz</div>";
2104+
if (data.hasOwnProperty("tx_frequency")) {
2105+
html += "<div><b>TX Frequency:&nbsp;</b>" + data.tx_frequency + " MHz</div>";
2106+
} else if (data.hasOwnProperty("frequency")) {
2107+
html += "<div><b>Frequency:&nbsp;</b>" + data.frequency + " MHz</div>";
20922108
};
20932109
if (data.hasOwnProperty("humidity")) {
20942110
html += "<div><b>Relative Humidity:&nbsp;</b>" + data.humidity + " %</div>";
@@ -2121,15 +2137,20 @@ function mapInfoBox_handle_path_fetch(id,vehicle) {
21212137

21222138
for (var i = 0; i < data.uploaders.length; i++) {
21232139
_new_call = data.uploaders[i].uploader_callsign;
2140+
tempFields = [];
21242141
if(data.uploaders[i].hasOwnProperty('snr')) {
2125-
_new_call += " (" + data.uploaders[i].snr.toFixed(0) + " dB)";
2126-
callsign_list.push(_new_call)
2127-
} else if(data.uploaders[i].hasOwnProperty('rssi')) {
2128-
_new_call += " (" + data.uploaders[i].rssi.toFixed(0) + " dBm)";
2129-
callsign_list.push(_new_call)
2130-
} else {
2131-
callsign_list.push(_new_call)
2142+
tempFields.push(data.uploaders[i].snr.toFixed(0) + " dB");
2143+
}
2144+
if(data.uploaders[i].hasOwnProperty('rssi')) {
2145+
tempFields.push(data.uploaders[i].rssi.toFixed(0) + " dBm");
2146+
}
2147+
if(data.uploaders[i].hasOwnProperty('frequency')) {
2148+
tempFields.push(data.uploaders[i].frequency + " MHz");
2149+
}
2150+
if(tempFields.length > 0) {
2151+
_new_call += " (" + tempFields.join(", ") + ")";
21322152
}
2153+
callsign_list.push(_new_call); // catch cases where there are no fields
21332154
}
21342155

21352156
callsign_list = callsign_list.join("<br /> ");
@@ -3093,6 +3114,9 @@ function formatData(data, live) {
30933114
if (vehicles[data[entry].serial].curr_position.callsign[key].hasOwnProperty("rssi")) {
30943115
dataTempEntry.callsign[key].rssi = vehicles[data[entry].serial].curr_position.callsign[key].rssi;
30953116
}
3117+
if (vehicles[data[entry].serial].curr_position.callsign[key].hasOwnProperty("frequency")) {
3118+
dataTempEntry.callsign[key].frequency = vehicles[data[entry].serial].curr_position.callsign[key].frequency;
3119+
}
30963120
}
30973121
}
30983122
}
@@ -3105,6 +3129,9 @@ function formatData(data, live) {
31053129
if (data[entry].rssi) {
31063130
dataTempEntry.callsign[station].rssi = data[entry].rssi;
31073131
}
3132+
if (data[entry].frequency) {
3133+
dataTempEntry.callsign[station].frequency = data[entry].frequency;
3134+
}
31083135
dataTempEntry.gps_alt = data[entry].alt;
31093136
dataTempEntry.gps_lat = data[entry].lat;
31103137
dataTempEntry.gps_lon = data[entry].lon;
@@ -3125,6 +3152,9 @@ function formatData(data, live) {
31253152
if (data[entry].frequency) {
31263153
dataTempEntry.data.frequency = data[entry].frequency;
31273154
}
3155+
if (data[entry].tx_frequency) {
3156+
dataTempEntry.data.frequency_tx = data[entry].tx_frequency;
3157+
}
31283158
if (data[entry].humidity) {
31293159
dataTempEntry.data.humidity = data[entry].humidity;
31303160
}
@@ -3172,6 +3202,9 @@ function formatData(data, live) {
31723202
if (vehicles[data.serial].curr_position.callsign[key].hasOwnProperty("rssi")) {
31733203
dataTempEntry.callsign[key].rssi = vehicles[data.serial].curr_position.callsign[key].rssi;
31743204
}
3205+
if (vehicles[data.serial].curr_position.callsign[key].hasOwnProperty("frequency")) {
3206+
dataTempEntry.callsign[key].frequency = vehicles[data.serial].curr_position.callsign[key].frequency;
3207+
}
31753208
}
31763209
}
31773210
}
@@ -3184,6 +3217,9 @@ function formatData(data, live) {
31843217
if (data.rssi) {
31853218
dataTempEntry.callsign[station].rssi = data.rssi;
31863219
}
3220+
if (data.frequency) {
3221+
dataTempEntry.callsign[station].frequency = data.frequency;
3222+
}
31873223
dataTempEntry.gps_alt = data.alt;
31883224
dataTempEntry.gps_lat = data.lat;
31893225
dataTempEntry.gps_lon = data.lon;
@@ -3204,6 +3240,9 @@ function formatData(data, live) {
32043240
if (data.frequency) {
32053241
dataTempEntry.data.frequency = data.frequency;
32063242
}
3243+
if (data.tx_frequency) {
3244+
dataTempEntry.data.frequency_tx = data.tx_frequency;
3245+
}
32073246
if (data.humidity) {
32083247
dataTempEntry.data.humidity = data.humidity;
32093248
}
@@ -3249,6 +3288,9 @@ function formatData(data, live) {
32493288
if (data[key][i].rssi) {
32503289
dataTempEntry.callsign[station].rssi = data[key][i].rssi;
32513290
}
3291+
if (data[key][i].frequency) {
3292+
dataTempEntry.callsign[station].frequency = data[key][i].frequency;
3293+
}
32523294
dataTempEntry.gps_alt = data[key][i].alt;
32533295
dataTempEntry.gps_lat = data[key][i].lat;
32543296
dataTempEntry.gps_lon = data[key][i].lon;
@@ -3269,6 +3311,9 @@ function formatData(data, live) {
32693311
if (data[key][i].frequency) {
32703312
dataTempEntry.data.frequency = data[key][i].frequency;
32713313
}
3314+
if (data[key][i].tx_frequency) {
3315+
dataTempEntry.data.frequency_tx = data[key][i].tx_frequency;
3316+
}
32723317
if (data[key][i].humidity) {
32733318
dataTempEntry.data.humidity = data[key][i].humidity;
32743319
}
@@ -3335,6 +3380,9 @@ function formatData(data, live) {
33353380
if (data[i].rssi) {
33363381
dataTempEntry.callsign[station].rssi = data[i].rssi;
33373382
}
3383+
if (data[i].frequency) {
3384+
dataTempEntry.callsign[station].frequency = data[i].frequency;
3385+
}
33383386
dataTempEntry.gps_alt = data[i].alt;
33393387
dataTempEntry.gps_lat = data[i].lat;
33403388
dataTempEntry.gps_lon = data[i].lon;
@@ -3355,6 +3403,9 @@ function formatData(data, live) {
33553403
if (data[i].frequency) {
33563404
dataTempEntry.data.frequency = data[i].frequency;
33573405
}
3406+
if (data[i].tx_frequency) {
3407+
dataTempEntry.data.frequency_tx = data[i].tx_frequency;
3408+
}
33583409
if (data[i].humidity) {
33593410
dataTempEntry.data.humidity = data[i].humidity;
33603411
}

0 commit comments

Comments
 (0)