X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=265b5f0f633e26a544203d83b188a52971166468;hb=02f47fa98536eb0ecd58cd8f063600ced60e0a8a;hp=87b9eaf20fbafdd52e72a18d08b4c087c59c713f;hpb=3bfba8f9dbc1627a317804713f83b9d06566d008;p=fw%2Faltos diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java index 87b9eaf2..265b5f0f 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_10; public class AltosConvert { /* @@ -230,6 +230,12 @@ public class AltosConvert { 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; + return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0; + } + static double easy_mini_voltage(int sensor, int serial) { double supply = 3.3; double diode_offset = 0.0; @@ -319,6 +325,14 @@ public class AltosConvert { return miles_to_meters(mps) / 3600; } + public static double mps_to_fps(double mps) { + return meters_to_miles(mps) * 5280; + } + + public static double fps_to_mps(double mps) { + return miles_to_meters(mps) / 5280; + } + public static double meters_to_mach(double meters) { return meters / 343; /* something close to mach at usual rocket sites */ } @@ -351,6 +365,10 @@ public class AltosConvert { 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");