summaryrefslogtreecommitdiff
path: root/altoslib/AltosConvert.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2018-10-20 17:22:59 -0700
committerKeith Packard <keithp@keithp.com>2018-10-20 17:31:57 -0700
commitf13e294d4644096b0529383c1d60d5e4b7916d76 (patch)
tree171ae787d71d92cf01e4d7d2a7559b37a3d01ce3 /altoslib/AltosConvert.java
parentc01514fa1e0a2cea3955c71a833b4a21b3d33f24 (diff)
altoslib: Add support for TeleGPS v2
The battery voltage ADC values are different from TeleGPS v1 (max 4095 instead of 32767). Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosConvert.java')
-rw-r--r--altoslib/AltosConvert.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index e1930430..ce1b8f7f 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -258,7 +258,13 @@ public class AltosConvert {
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;
+ }
+
+ static double tele_gps_2_voltage(int sensor) {
double supply = 3.3;
return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;