diff options
| author | Keith Packard <keithp@keithp.com> | 2013-09-05 11:33:48 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-09-05 11:35:14 -0700 |
| commit | 5b976a6651f4eb05d30afc08b9e1f27c7e52ae00 (patch) | |
| tree | 3a8f38d92fdc3b3e9e62d7744ff93a0f9ca8f7dc /altoslib/AltosEepromMini.java | |
| parent | b984ff81d6b8979574e0248ffe8876634b8e1942 (diff) | |
altoslib: Finish AltosState changes. Update version number.
Removes all of the AltosRecord bits, changes the monitor idle bits to
have per-object state updaters.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosEepromMini.java')
| -rw-r--r-- | altoslib/AltosEepromMini.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/altoslib/AltosEepromMini.java b/altoslib/AltosEepromMini.java index e0eedb73..a09a62ce 100644 --- a/altoslib/AltosEepromMini.java +++ b/altoslib/AltosEepromMini.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_1; +package org.altusmetrum.altoslib_2; import java.io.*; import java.util.*; @@ -42,13 +42,10 @@ public class AltosEepromMini extends AltosEeprom { public int v_batt() { return data16(10); } double voltage(AltosState state, int sensor) { - double supply; - if (state.log_format == AltosLib.AO_LOG_FORMAT_EASYMINI) - supply = 3.0; + return AltosConvert.easy_mini_voltage(sensor); else - supply = 3.3; - return sensor / 32767.0 * supply * 127/27; + return AltosConvert.tele_mini_voltage(sensor); } public void update_state(AltosState state) { |