X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosSensorMega.java;h=0aa52176d48b03ba6fdad5c5fb892414bf26bf38;hp=82696038583da23233438a0feb0be198bdf01e63;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hpb=222158581887b5f9e8b9843d14321c313fa023fa diff --git a/altoslib/AltosSensorMega.java b/altoslib/AltosSensorMega.java index 82696038..0aa52176 100644 --- a/altoslib/AltosSensorMega.java +++ b/altoslib/AltosSensorMega.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; @@ -89,18 +89,18 @@ class AltosSensorMega { } } - static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException { + static public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException { try { AltosSensorMega sensor_mega = new AltosSensorMega(link); - state.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_mega.v_batt)); - state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[4])); - state.set_main_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[5])); + listener.set_battery_voltage(AltosConvert.mega_battery_voltage(sensor_mega.v_batt)); + listener.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[4])); + listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sensor_mega.sense[5])); double[] igniter_voltage = new double[4]; for (int i = 0; i < 4; i++) igniter_voltage[i] = AltosConvert.mega_pyro_voltage(sensor_mega.sense[i]); - state.set_igniter_voltage(igniter_voltage); + listener.set_igniter_voltage(igniter_voltage); } catch (TimeoutException te) { }