X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=6578e90f58a1d5c9ab4349d5511c0d68066474ca;hb=6fc58142d2a108c91d257eb0175098bf082834f9;hp=a65669dabde9d2f3007536318f52737de1a86f7a;hpb=3871b9ac036e3adfa1da089245fc7973b268c921;p=fw%2Faltos diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index a65669da..6578e90f 100644 --- a/altoslib/AltosConvert.java +++ b/altoslib/AltosConvert.java @@ -208,7 +208,7 @@ public class AltosConvert { static public double mega_battery_voltage(int v_batt) { if (v_batt != AltosLib.MISSING) - return 3.3 * mega_adc(v_batt) * (15.0 + 27.0) / 27.0; + return 3.3 * mega_adc(v_batt) * (5.6 + 10.0) / 10.0; return AltosLib.MISSING; } @@ -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;