altos: Complain about sensor self-test errors only in idle mode

[fw/altos] / altoslib / AltosTelemetryMetrumSensor.java

diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java
index 72d2f564e76130b6b57ed4600ca96614ed181883..232468bbf67ca5967d42f4d4f8996f1ffee09b5c 100644 (file)
--- a/altoslib/AltosTelemetryMetrumSensor.java
+++ b/altoslib/AltosTelemetryMetrumSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_3;
 
 
 public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
@@ -56,7 +56,8 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
                state.set_state(this.state);
 
                state.set_accel(accel);
-               state.set_ms5607(pres, temp);
+               state.set_pressure(pres);
+               state.set_temperature(temp/100.0);
 
                state.set_kalman(height, speed/16.0, acceleration/16.0);
 
@@ -64,6 +65,5 @@ public class AltosTelemetryMetrumSensor extends AltosTelemetryStandard {
 
                state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense_a));
                state.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m));
-               System.out.printf ("sense_a %d apogee voltage %g\n", sense_a, state.apogee_voltage);
        }
 }