first cut at turnon scripts for EasyTimer v2

[fw/altos] / altoslib / AltosTelemetrySensor.java

diff --git a/altoslib/AltosTelemetrySensor.java b/altoslib/AltosTelemetrySensor.java
index da253eea16ac581abdcd1f7e883d1ad9e7912d37..897976623cc5245a3549815a45e852dcef84187e 100644 (file)
--- a/altoslib/AltosTelemetrySensor.java
+++ b/altoslib/AltosTelemetrySensor.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 
 public class AltosTelemetrySensor extends AltosTelemetryStandard {
@@ -32,8 +32,8 @@ public class AltosTelemetrySensor extends AltosTelemetryStandard {
        int     speed() { return int16(20); }
        int     height_16() { return int16(22); }
 
-       int     ground_accel() { return int16(24); }
-       int     ground_pres() { return int16(26); }
+       int     ground_pres() { return int16(24); }
+       int     ground_accel() { return int16(26); }
        int     accel_plus_g() { return int16(28); }
        int     accel_minus_g() { return int16(30); }
 
@@ -41,11 +41,12 @@ public class AltosTelemetrySensor extends AltosTelemetryStandard {
                super(bytes);
        }
 
-       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-               super.provide_data(listener, cal_data);
+       public void provide_data(AltosDataListener listener) {
+               super.provide_data(listener);
 
                listener.set_state(state());
-               cal_data.set_state(state());
+
+               AltosCalData    cal_data = listener.cal_data();
 
                if (type() == packet_type_TM_sensor) {
                        cal_data.set_ground_accel(ground_accel());