X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetry.java;h=8182ec6bb67fe9eaefa016b1337a6f9c9bba5d16;hb=75766b0e7ee30fb3bfbf90ecb68f7758bac6eeba;hp=642e742118dd6c2429c303c9971c422d199f3bb8;hpb=528e2e41112cad8a81bccbb89c3bd202b818a506;p=fw%2Faltos diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java index 642e7421..8182ec6b 100644 --- a/altoslib/AltosTelemetry.java +++ b/altoslib/AltosTelemetry.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; import java.text.*; @@ -43,9 +43,9 @@ public abstract class AltosTelemetry implements AltosStateUpdate { } public void update_state(AltosState state) { + state.set_serial(serial); if (state.state == AltosLib.ao_flight_invalid) state.set_state(AltosLib.ao_flight_startup); - state.set_serial(serial); state.set_tick(tick); state.set_rssi(rssi, status); state.set_received_time(received_time); @@ -67,7 +67,7 @@ public abstract class AltosTelemetry implements AltosStateUpdate { final static int packet_type_metrum_sensor = 0x0a; final static int packet_type_metrum_data = 0x0b; final static int packet_type_mini = 0x10; - + static AltosTelemetry parse_hex(String hex) throws ParseException, AltosCRCException { AltosTelemetry telem = null;