Skip to content

Commit 0b1a46d

Browse files
added light intensity field;clear unused functions
1 parent 0343c78 commit 0b1a46d

File tree

2 files changed

+4
-148
lines changed

2 files changed

+4
-148
lines changed

js/mobile.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/tracker.js

Lines changed: 3 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ function habitat_data(jsondata) {
170170
"gas_combustible": "Gas (Combustible)",
171171
"radiation": "Radiation (CPM)",
172172
"temperature_radio": "Temperature, Radio",
173-
"uplink_rssi": "Uplink RSSI"
173+
"uplink_rssi": "Uplink RSSI",
174+
"light_intensity": "Light Intensity",
174175
}
175176

176177
var hide_keys = {
@@ -194,6 +195,7 @@ function habitat_data(jsondata) {
194195
"rssi_floor": "dBm",
195196
"iss_azimuth": "°",
196197
"iss_elevation": "°",
198+
"light_intensity": "lx",
197199
"spam": ""
198200
}
199201

@@ -233,152 +235,6 @@ function habitat_data(jsondata) {
233235
}
234236
}
235237

236-
function atlas_data(caption, value, postfix) {
237-
var fields = ["Crystal Temp (°C)", "PID Controller", "Internal Temp (°C)", "External Temp (°C)", "Light Sensor"];
238-
var result = "";
239-
var extra = 0;
240-
if(value.indexOf(";") != -1) {
241-
values = value.split(";");
242-
for(var i = 0, ii = values.length; i < ii; i++) {
243-
if(i < fields.length) {
244-
caption = fields[i];
245-
} else {
246-
caption = "Extra " + extra;
247-
extra++;
248-
}
249-
var data = values[i];
250-
result += "<b>" + caption + ":</b> " + data + "<br />"
251-
}
252-
} else if(value != '') {
253-
result = "<b>" + caption + ":</b> " + value + postfix + "<br />"
254-
}
255-
return result;
256-
}
257-
258-
function whitestar_data(caption, value, postfix) {
259-
var fields = ["Ice", "External Temp (&deg;C)", "Humidity", "Speed", "Climb", "Ballast Remaining"];
260-
var result = "";
261-
var extra = 0;
262-
if(value.indexOf(";") != -1) {
263-
values = value.split(";");
264-
for(var i = 0, ii = values.length; i < ii; i++) {
265-
if(i < fields.length) {
266-
caption = fields[i];
267-
} else {
268-
caption = "Extra " + extra;
269-
extra++;
270-
}
271-
var data = values[i];
272-
result += "<b>" + caption + ":</b> " + data + "<br />"
273-
}
274-
} else if(value != '') {
275-
result = "<b>" + caption + ":</b> " + value + postfix + "<br />"
276-
}
277-
return result;
278-
}
279-
280-
function horus_data(caption, value, postfix) {
281-
var fields = ["GPS Sats", "Internal Temp (&deg;C)", "External Temp (&deg;C)", "Battery (V)"];
282-
var result = "";
283-
var extra = 0;
284-
if(value.indexOf(";") != -1) {
285-
values = value.split(";");
286-
for(var i = 0, ii = values.length; i < ii; i++) {
287-
if(i < fields.length) {
288-
caption = fields[i];
289-
} else {
290-
caption = "Extra " + extra;
291-
extra++;
292-
}
293-
var data = values[i];
294-
result += "<b>" + caption + ":</b> " + data + "<br />"
295-
}
296-
} else if(value != '') {
297-
result = "<b>" + caption + ":</b> " + value + postfix + "<br />"
298-
}
299-
return result;
300-
}
301-
302-
function darkside_data(caption, value, postfix) {
303-
var fields = ["Internal Temp (&deg;C)", "Air Pressure (hPa)", "Battery (raw ADC val)"];
304-
var result = "";
305-
var extra = 0;
306-
if(value.indexOf(";") != -1) {
307-
values = value.split(";");
308-
for(var i = 0, ii = values.length; i < ii; i++) {
309-
if(i < fields.length) {
310-
caption = fields[i];
311-
} else {
312-
caption = "Extra " + extra;
313-
extra++;
314-
}
315-
var data = values[i];
316-
result += "<b>" + caption + ":</b> " + data + "<br />"
317-
}
318-
} else if(value != '') {
319-
result = "<b>" + caption + ":</b> " + value + postfix + "<br />"
320-
}
321-
return result;
322-
}
323-
324-
function picochu_data(caption, value, postfix) {
325-
var fields = ["External Temp (&deg;C)", "Internal Temp (&deg;C)"];
326-
var result = "";
327-
var extra = 0;
328-
if(value.indexOf(";") != -1) {
329-
values = value.split(";");
330-
for(var i = 0, ii = values.length; i < ii; i++) {
331-
if(i < fields.length) {
332-
caption = fields[i];
333-
} else {
334-
caption = "Extra " + extra;
335-
extra++;
336-
}
337-
var data = values[i];
338-
result += "<b>" + caption + ":</b> " + data + "<br />"
339-
}
340-
} else if(value != '') {
341-
result = "<b>" + caption + ":</b> " + value + postfix + "<br />"
342-
}
343-
return result;
344-
}
345-
346-
function apex_data(caption, value, postfix) {
347-
var fields = ["GPS Sats", "Internal Temperature (&deg;C)",
348-
"External Temperature (&deg;C)", "Pressure (mbar)",
349-
"Battery Voltage (V)", "IRD 1 (Counts/30sec)",
350-
"IRD 2 (Counts/30sec)",
351-
"Light", "RSSI (%)"];
352-
var result = "";
353-
var extra = 0;
354-
if(value.indexOf(";") != -1) {
355-
values = value.split(";");
356-
for(var i = 0, ii = values.length; i < ii; i++) {
357-
if(i < fields.length) {
358-
caption = fields[i];
359-
} else {
360-
caption = "Extra " + extra;
361-
extra++;
362-
}
363-
var data = values[i];
364-
if(i == 3) { // pressure
365-
data = roundNumber(parseInt(data, 16)/3.312, 2);
366-
} else if(i == 4) { // battery voltage
367-
data = roundNumber(10*parseInt(data, 16)/4096, 2);
368-
} else if(i == 5 || i == 6) { // IRD counts
369-
data = parseInt(data, 16);
370-
} else if(i == 8 ) { // RSSI
371-
data = roundNumber(100*parseInt(data, 16)/256, 2);
372-
}
373-
result += "<b>" + caption + ":</b> " + data + "<br />"
374-
}
375-
} else if(value != '') {
376-
result = "<b>" + caption + ":</b> " + value + postfix + "<br />"
377-
}
378-
return result;
379-
}
380-
381-
382238
function updateAltitude(index) {
383239
var pixel_altitude = 0;
384240
var zoom = map.getZoom();

0 commit comments

Comments
 (0)