X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=18878c026dd01115501e87f8880a9bcb613feea6;hp=8bcb9c9693618df5ce4dcd382fd37648dfe8d64d;hb=57f0ae384f3c206ea777dc7c93b594ae3901f354;hpb=6950506beacb1bcd5b8e54c3935174cf800e9aed diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index 8bcb9c96..18878c02 100644 --- a/altoslib/AltosConvert.java +++ b/altoslib/AltosConvert.java @@ -18,7 +18,7 @@ /* * Sensor data conversion functions */ -package org.altusmetrum.altoslib_4; +package org.altusmetrum.altoslib_5; public class AltosConvert { /* @@ -224,6 +224,12 @@ public class AltosConvert { return sensor / 32767.0 * supply * 127/27; } + static double tele_gps_voltage(int sensor) { + double supply = 3.3; + + return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0; + } + static double easy_mini_voltage(int sensor, int serial) { double supply = 3.3; double diode_offset = 0.0; @@ -343,6 +349,12 @@ public class AltosConvert { public static AltosOrient orient = new AltosOrient(); + public static AltosVoltage voltage = new AltosVoltage(); + + public static AltosLatitude latitude = new AltosLatitude(); + + public static AltosLongitude longitude = new AltosLongitude(); + public static String show_gs(String format, double a) { a = meters_to_g(a); format = format.concat(" g");