X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetryMetrumSensor.java;h=e7055404b24fe5b1f6c36309d3ca0e32355f0525;hb=e0dfa934ba76d6f913af37999e05c20e614bd3e9;hp=59d34dbafb13e2080b1ee01f7b8b37b79be583f6;hpb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea;p=fw%2Faltos diff --git a/altoslib/AltosTelemetryMetrumSensor.java b/altoslib/AltosTelemetryMetrumSensor.java index 59d34dba..e7055404 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_1; +package org.altusmetrum.altoslib_4; 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); } }