altoslib: Save eeprom data in new .eeprom format

[fw/altos] / altoslib / AltosEepromMini.java

diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index 1e0ff1b9c8ff0124d93ef9e5d61144282acf88b1..04155071fbd0767f143788cf91a5ef94754e8167 100644 (file)
--- a/altoslib/AltosEepromMini.java
+++ b/altoslib/AltosEepromMini.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
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -24,21 +25,7 @@ import java.text.*;
 public class AltosEepromMini extends AltosEeprom {
        public static final int record_length = 16;
 
-       public int data8(int i) {
-               return data8[i];
-       }
-
-       public int data16(int i) {
-               return ((data8[i] | (data8[i+1] << 8)) << 16) >> 16;
-       }
-
-       public int data24(int i) {
-               return data8[i] | (data8[i+1] << 8) | (data8[i+2] << 16);
-       }
-
-       public int data32(int i) {
-               return data8[i] | (data8[i+1] << 8) | (data8[i+2] << 16) | (data8[i+3] << 24);
-       }
+       public int record_length() { return record_length; }
 
        /* AO_LOG_FLIGHT elements */
        public int flight() { return data16(0); }
@@ -55,17 +42,29 @@ public class AltosEepromMini extends AltosEeprom {
        public int sense_m() { return data16(8); }
        public int v_batt() { return data16(10); }
 
-       double voltage(AltosState state, int sensor) {
-               double  supply;
+       private double battery_voltage(AltosState state, int sensor) {
+               if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
+                       return AltosConvert.easy_mini_voltage(sensor, state.serial);
+               if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
+                       return AltosConvert.tele_mini_2_voltage(sensor);
+               if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
+                       return AltosConvert.tele_mini_3_battery_voltage(sensor);
+               return -1;
+       }
 
+       private double pyro_voltage(AltosState state, int sensor) {
                if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
-                       supply = 3.0;
-               else
-                       supply = 3.3;
-               return sensor / 32767.0 * supply * 127/27;
+                       return AltosConvert.easy_mini_voltage(sensor, state.serial);
+               if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
+                       return AltosConvert.tele_mini_2_voltage(sensor);
+               if (state.log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
+                       return AltosConvert.tele_mini_3_pyro_voltage(sensor);
+               return -1;
        }
 
        public void update_state(AltosState state) {
+               super.update_state(state);
+
                switch (cmd) {
                case AltosLib.AO_LOG_FLIGHT:
                        state.set_flight(flight());
@@ -76,19 +75,19 @@ public class AltosEepromMini extends AltosEeprom {
                        break;
                case AltosLib.AO_LOG_SENSOR:
                        state.set_ms5607(pres(), temp());
-                       state.set_apogee_voltage(voltage(state, sense_a()));
-                       state.set_main_voltage(voltage(state, sense_m()));
-                       state.set_battery_voltage(voltage(state, v_batt()));
+                       state.set_apogee_voltage(pyro_voltage(state, sense_a()));
+                       state.set_main_voltage(pyro_voltage(state, sense_m()));
+                       state.set_battery_voltage(battery_voltage(state, v_batt()));
                        break;
                }
        }
 
        public AltosEepromMini (AltosEepromChunk chunk, int start) throws ParseException {
-               parse_chunk(chunk, start, record_length);
+               parse_chunk(chunk, start);
        }
 
        public AltosEepromMini (String line) {
-               parse_string(line, record_length);
+               parse_string(line);
        }
 
        public AltosEepromMini(int in_cmd, int in_tick) {