altoslib: Create new abstraction underneath AltosState for recording values

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 18878c026dd01115501e87f8880a9bcb613feea6..a3343a4f200aad0171696a31aaa88545c282b026 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +19,9 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_5;
+package org.altusmetrum.altoslib_11;
+
+import java.util.*;
 
 public class AltosConvert {
        /*
@@ -218,7 +221,23 @@ public class AltosConvert {
                return AltosLib.MISSING;
        }
 
-       static double tele_mini_voltage(int sensor) {
+       static double tele_mini_3_adc(int raw) {
+               return raw / 4095.0;
+       }
+
+       static public double tele_mini_3_battery_voltage(int v_batt) {
+               if (v_batt != AltosLib.MISSING)
+                       return 3.3 * tele_mini_3_adc(v_batt) * (5.6 + 10.0) / 10.0;
+               return AltosLib.MISSING;
+       }
+
+       static double tele_mini_3_pyro_voltage(int raw) {
+               if (raw != AltosLib.MISSING)
+                       return 3.3 * tele_mini_3_adc(raw) * (100.0 + 27.0) / 27.0;
+               return AltosLib.MISSING;
+       }
+
+       static double tele_mini_2_voltage(int sensor) {
                double  supply = 3.3;
 
                return sensor / 32767.0 * supply * 127/27;
@@ -230,6 +249,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 +344,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 */
        }
@@ -335,12 +368,32 @@ public class AltosConvert {
                return (c - 32) * 5/9;
        }
 
+       public static double psi_to_pa(double psi) {
+               return psi * 6894.76;
+       }
+
+       public static double pa_to_psi(double pa) {
+               return pa / 6894.76;
+       }
+
+       public static double n_to_lb(double n) {
+               return n * 0.22480894;
+       }
+
+       public static double lb_to_n(double lb) {
+               return lb / 0.22480894;
+       }
+
        public static boolean imperial_units = false;
 
        public static AltosDistance distance = new AltosDistance();
 
        public static AltosHeight height = new AltosHeight();
 
+       public static AltosPressure pressure = new AltosPressure();
+
+       public static AltosForce force = new AltosForce();
+
        public static AltosSpeed speed = new AltosSpeed();
 
        public static AltosAccel accel = new AltosAccel();
@@ -355,6 +408,8 @@ public class AltosConvert {
 
        public static AltosLongitude longitude = new AltosLongitude();
 
+       public static AltosRotationRate rotation_rate = new AltosRotationRate();
+
        public static String show_gs(String format, double a) {
                a = meters_to_g(a);
                format = format.concat(" g");
@@ -372,6 +427,13 @@ public class AltosConvert {
                return csum & 0xff;
        }
 
+       public static int checksum(List<Byte> data, int start, int length) {
+               int     csum = 0x5a;
+               for (int i = 0; i < length; i++)
+                       csum += data.get(i+start);
+               return csum & 0xff;
+       }
+
        public static double beep_value_to_freq(int value) {
                if (value == 0)
                        return 4000;