summaryrefslogtreecommitdiff
path: root/altoslib/AltosConvert.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2019-01-02 22:23:04 -0700
committerBdale Garbee <bdale@gag.com>2019-01-02 22:23:04 -0700
commitb340cbf1403a5f5b181a215935f713a50da8e5e4 (patch)
tree8c0d2afbe8168c29584e0d568b80353fdf555883 /altoslib/AltosConvert.java
parent1da4b57545233f2f2afd350bd8aed4ef7bb0c844 (diff)
parent95ffec073b0758801df04a77eca0bd2bc6e57e35 (diff)
Merge branch 'branch-1.9' into debian
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 d2460187..ce1b8f7f 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -258,12 +258,18 @@ 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;
+ }
+
static double tele_bt_3_battery(int raw) {
if (raw == AltosLib.MISSING)
return AltosLib.MISSING;