X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMetrumSensor.java;h=232468bbf67ca5967d42f4d4f8996f1ffee09b5c;hb=f750ef6f9745b15af45bb80f5b46b9e6f51796d8;hp=72d2f564e76130b6b57ed4600ca96614ed181883;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00;p=fw%2Faltos diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java index 72d2f564..232468bb 100644 --- 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); } }