X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=89f36a6c4a373f66a90dc2612ae6e39e66d92506;hb=76c5e6bf7ecc30ae77a9744a4af26dca3dc46254;hp=d246018700bfd1d0746330f6724e27ab86f208c9;hpb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;p=fw%2Faltos diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index d2460187..89f36a6c 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; @@ -467,7 +473,7 @@ public class AltosConvert { public static AltosPyroName pyro_name = new AltosPyroName(); - public static AltosUnits magnetic_field = null; + public static AltosUnits magnetic_field = new AltosGauss(); public static String show_gs(String format, double a) { a = meters_to_g(a);