altoslib: Missed a couple of easy mini voltage API changes

Oh, and Tm was using Em conversions (which is almost right, except Tm
doesn't have the history)

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java
index fb3b4d23b6d7fbafe5868c948d49563322f123da..b308fbf4fb392510feb6e5f9d433c0b081962fc8 100644 (file)
--- a/altoslib/AltosEepromMini.java
+++ b/altoslib/AltosEepromMini.java
@@ -43,7 +43,7 @@ public class AltosEepromMini extends AltosEeprom {
 
        double voltage(AltosState state, int sensor) {
                if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI)
-                       return AltosConvert.easy_mini_voltage(sensor);
+                       return AltosConvert.easy_mini_voltage(sensor, state.serial);
                else
                        return AltosConvert.tele_mini_voltage(sensor);
        }

diff --git a/altoslib/AltosSensorTMini.java b/altoslib/AltosSensorTMini.java
index 35857e350113e4ef24c06e1dbf223252278619f1..cc5718a0eac57eace906ab6bc87a647325ddb7a8 100644 (file)
--- a/altoslib/AltosSensorTMini.java
+++ b/altoslib/AltosSensorTMini.java
@@ -31,9 +31,9 @@ public class AltosSensorTMini {
 
                        if (sensor_tmini == null)
                                return;
-                       state.set_battery_voltage(AltosConvert.easy_mini_voltage(sensor_tmini.batt));
-                       state.set_apogee_voltage(AltosConvert.easy_mini_voltage(sensor_tmini.apogee));
-                       state.set_main_voltage(AltosConvert.easy_mini_voltage(sensor_tmini.main));
+                       state.set_battery_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.batt));
+                       state.set_apogee_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.apogee));
+                       state.set_main_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.main));
                        
                } catch (TimeoutException te) {
                }