altos/telefireone-v2.0: Remove build of ao_product.h from Makefile

[fw/altos] / altoslib / AltosTelemetryMetrumSensor.java

diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index 211f9c687fe10ec732e5fb5e780b835ae5dac6d8..383f645ad7e2244c5b4bbe3573155873152ac7d0 100644 (file)
--- a/altoslib/AltosTelemetryMetrumSensor.java
+++ b/altoslib/AltosTelemetryMetrumSensor.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 

-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;

 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {


@@ -38,13 +38,12 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
                super(bytes);
        }
 
                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());
 
                listener.set_state(state());

-               cal_data.set_state(state());

 
 

-               listener.set_acceleration(cal_data.acceleration(accel()));
+               listener.set_acceleration(listener.cal_data().acceleration(accel()));

                listener.set_pressure(pres());
                listener.set_temperature(temp()/100.0);
 
                listener.set_pressure(pres());
                listener.set_temperature(temp()/100.0);