X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosSensorEMini.java;h=53a8e998845aab74ccbc70c058ae769dceb5e59d;hb=HEAD;hp=2d7bab833d7b99a7a36b626ab99fd8c6a36844ad;hpb=5c4e473ef5d13da9c2f356702cb8767b55aa2137;p=fw%2Faltos diff --git a/altoslib/AltosSensorEMini.java b/altoslib/AltosSensorEMini.java index 2d7bab83..33026c07 100644 --- a/altoslib/AltosSensorEMini.java +++ b/altoslib/AltosSensorEMini.java @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_11; +package org.altusmetrum.altoslib_14; import java.util.concurrent.TimeoutException; @@ -26,9 +26,10 @@ public class AltosSensorEMini { public int main; public int batt; - static public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data, int version) throws InterruptedException { + static public void provide_data(AltosDataListener listener, AltosLink link, int version) throws InterruptedException { try { AltosSensorEMini sensor_emini = new AltosSensorEMini(link); + AltosCalData cal_data = listener.cal_data(); if (sensor_emini == null) return; @@ -43,6 +44,11 @@ public class AltosSensorEMini { listener.set_apogee_voltage(AltosConvert.easy_mini_2_voltage(sensor_emini.apogee)); listener.set_main_voltage(AltosConvert.easy_mini_2_voltage(sensor_emini.main)); break; + case 3: + listener.set_battery_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.batt)); + listener.set_apogee_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.apogee)); + listener.set_main_voltage(AltosConvert.easy_mini_3_voltage(sensor_emini.main)); + break; } } catch (TimeoutException te) {