altosdroid: Fix offline map messages to match new meanings

[fw/altos] / altoslib / AltosEepromRecordMini.java

diff --git a/altoslib/AltosEepromRecordMini.java b/altoslib/AltosEepromRecordMini.java
index 4b3a564e2eeaa17e85872d44910643eb542ac8d6..2d212df09df88074a87a3068a7c312bc340e4aef 100644 (file)
--- a/altoslib/AltosEepromRecordMini.java
+++ b/altoslib/AltosEepromRecordMini.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 public class AltosEepromRecordMini extends AltosEepromRecord {
        public static final int record_length = 16;
@@ -42,8 +42,10 @@ public class AltosEepromRecordMini extends AltosEepromRecord {
 
        private double battery_voltage(int sensor) {
                int log_format = log_format();
-               if (log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
-                       return AltosConvert.easy_mini_voltage(sensor, eeprom.config_data().serial);
+               if (log_format == AltosLib.AO_LOG_FORMAT_EASYMINI1)
+                       return AltosConvert.easy_mini_1_voltage(sensor, eeprom.config_data().serial);
+               if (log_format == AltosLib.AO_LOG_FORMAT_EASYMINI2)
+                       return AltosConvert.easy_mini_2_voltage(sensor);
                if (log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
                        return AltosConvert.tele_mini_2_voltage(sensor);
                if (log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
@@ -53,8 +55,10 @@ public class AltosEepromRecordMini extends AltosEepromRecord {
 
        private double pyro_voltage(int sensor) {
                int log_format = log_format();
-               if (log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
-                       return AltosConvert.easy_mini_voltage(sensor, eeprom.config_data().serial);
+               if (log_format == AltosLib.AO_LOG_FORMAT_EASYMINI1)
+                       return AltosConvert.easy_mini_1_voltage(sensor, eeprom.config_data().serial);
+               if (log_format == AltosLib.AO_LOG_FORMAT_EASYMINI2)
+                       return AltosConvert.easy_mini_2_voltage(sensor);
                if (log_format == AltosLib.AO_LOG_FORMAT_TELEMINI2)
                        return AltosConvert.tele_mini_2_voltage(sensor);
                if (log_format == AltosLib.AO_LOG_FORMAT_TELEMINI3)
@@ -91,11 +95,11 @@ public class AltosEepromRecordMini extends AltosEepromRecord {
                return new AltosEepromRecordMini(eeprom, s);
        }
 
-       public AltosEepromRecordMini(AltosEepromNew eeprom, int start) {
+       public AltosEepromRecordMini(AltosEeprom eeprom, int start) {
                super(eeprom, start, record_length);
        }
 
-       public AltosEepromRecordMini(AltosEepromNew eeprom) {
+       public AltosEepromRecordMini(AltosEeprom eeprom) {
                this(eeprom, 0);
        }
 }