From: Keith Packard Date: Thu, 3 Apr 2014 07:10:19 +0000 (-0700) Subject: altoslib: Missed a couple of easy mini voltage API changes X-Git-Tag: 1.3.2.2~155 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=bb9fdef607728cc326a82aa632e59724f272e53b 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 --- diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java index fb3b4d23..b308fbf4 100644 --- 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 35857e35..cc5718a0 100644 --- 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) { }