diff options
| author | Keith Packard <keithp@keithp.com> | 2014-04-03 00:10:19 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-04-03 00:10:19 -0700 |
| commit | bb9fdef607728cc326a82aa632e59724f272e53b (patch) | |
| tree | ed58a199a6c961aee869e38251909c5a748acdc8 | |
| parent | 834cd051af1b80a98678de221d3c45cb30f8bb0d (diff) | |
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>
| -rw-r--r-- | altoslib/AltosEepromMini.java | 2 | ||||
| -rw-r--r-- | altoslib/AltosSensorTMini.java | 6 |
2 files changed, 4 insertions, 4 deletions
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) { } |