projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telefireone-v2.0: Remove build of ao_product.h from Makefile
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index 9eb8d16a4dafa6fe47c1c4d0482ba022264ec98a..ce1b8f7f14f7733a29722e6eedd62090733ed63f 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-19,7
+19,7
@@
/*
* Sensor data conversion functions
*/
/*
* Sensor data conversion functions
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
3
;
import java.util.*;
import java.util.*;
@@
-258,12
+258,18
@@
public class AltosConvert {
return sensor / 32767.0 * supply * 127/27;
}
return sensor / 32767.0 * supply * 127/27;
}
- static double tele_gps_voltage(int sensor) {
+ static double tele_gps_
1_
voltage(int sensor) {
double supply = 3.3;
return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
}
double supply = 3.3;
return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
}
+ static double tele_gps_2_voltage(int sensor) {
+ double supply = 3.3;
+
+ return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
+ }
+
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;