altosdroid: Fix offline map messages to match new meanings

[fw/altos] / altoslib / AltosSensorTM.java

diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java
index 7d7becfbc6785bd9fac5215f46b3f973f7da76f7..a25f4d1962474eaeedd613ba6af8d7eec1fe6ed4 100644 (file)
--- a/altoslib/AltosSensorTM.java
+++ b/altoslib/AltosSensorTM.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.util.concurrent.TimeoutException;
 
@@ -29,9 +29,10 @@ public class AltosSensorTM {
        public int      drogue;
        public int      main;
 
-       static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException {
+       static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException {
                try {
                        AltosSensorTM   sensor_tm = new AltosSensorTM(link);
+                       AltosCalData    cal_data = listener.cal_data();
 
                        if (sensor_tm == null)
                                return;
@@ -39,8 +40,8 @@ public class AltosSensorTM {
                        listener.set_pressure(AltosConvert.barometer_to_pressure(sensor_tm.pres));
                        listener.set_temperature(AltosConvert.thermometer_to_temperature(sensor_tm.temp));
                        listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(sensor_tm.batt));
-                       listener.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.drogue));
-                       listener.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.main));
+                       listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(sensor_tm.drogue));
+                       listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(sensor_tm.main));
 
                } catch (TimeoutException te) {
                }