diff options
| author | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
| commit | 3cf030fffffd223c3717011e03aac82346295d71 (patch) | |
| tree | b6da4fbb1180b75bedb86ce608503a6c0aeb47f3 /altoslib/AltosSensorTMini.java | |
| parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'altoslib/AltosSensorTMini.java')
| -rw-r--r-- | altoslib/AltosSensorTMini.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/altoslib/AltosSensorTMini.java b/altoslib/AltosSensorTMini.java index 35857e35..b9eeca0c 100644 --- a/altoslib/AltosSensorTMini.java +++ b/altoslib/AltosSensorTMini.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_3; +package org.altusmetrum.altoslib_4; import java.util.concurrent.TimeoutException; @@ -31,10 +31,10 @@ 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) { } } |