Merge branch 'master' into branch-1.9

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 3e1796b2c194bfbeb212a9adbe675a0917642201..88ee1ad159772d9e613d4ed484375fa0a50c2d2c 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -270,6 +270,12 @@ public class AltosConvert {
                return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
        }
 
+       static double tele_gps_3_voltage(int sensor) {
+               double  supply = 3.3;
+
+               return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
+       }
+
        static double tele_bt_3_battery(int raw) {
                if (raw == AltosLib.MISSING)
                        return AltosLib.MISSING;