altoslib: Make receive frequency available in telem data

This lets AltosDroid record which frequency each station was heard on.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index 5f89b3e4b5adae46772f47387ea0e5da37107f19..be6d840f0091e9b20d21589634ff63099272f5eb 100644 (file)
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -20,6 +20,7 @@ public abstract class AltosDataListener {
 
        public double           time = AltosLib.MISSING;
        public int              state = AltosLib.MISSING;
 
        public double           time = AltosLib.MISSING;
        public int              state = AltosLib.MISSING;

+       public double           frequency = AltosLib.MISSING;

 
        public void set_tick(int tick) {
                cal_data.set_tick(tick);
 
        public void set_tick(int tick) {
                cal_data.set_tick(tick);


@@ -55,6 +56,10 @@ public abstract class AltosDataListener {
                cal_data().set_flight(flight);
        }
 
                cal_data().set_flight(flight);
        }
 

+       public void set_frequency(double frequency) {
+               this.frequency = frequency;
+       }
+

        /* Called after all records are captured */
        public void finish() {
        }
        /* Called after all records are captured */
        public void finish() {
        }

diff --git a/altoslib/AltosTelemetry.java b/altoslib/AltosTelemetry.java
index 7d576942c22f6348cd2b804c9855d751f1745f69..f17e11717c391410fd222148b4e6733165c45ed0 100644 (file)
--- a/altoslib/AltosTelemetry.java
+++ b/altoslib/AltosTelemetry.java
@@ -38,6 +38,9 @@ public abstract class AltosTelemetry implements AltosDataProvider {
        /* Mark when we received the packet */
        long            received_time;
 
        /* Mark when we received the packet */
        long            received_time;
 

+       /* Mark frequency packet was received on */
+       public double           frequency = AltosLib.MISSING;
+

        static boolean cksum(int[] bytes) {
                int     sum = 0x5a;
                for (int i = 1; i < bytes.length - 1; i++)
        static boolean cksum(int[] bytes) {
                int     sum = 0x5a;
                for (int i = 1; i < bytes.length - 1; i++)


@@ -50,6 +53,8 @@ public abstract class AltosTelemetry implements AltosDataProvider {
                listener.set_serial(serial());
                if (listener.state == AltosLib.ao_flight_invalid)
                        listener.set_state(AltosLib.ao_flight_startup);
                listener.set_serial(serial());
                if (listener.state == AltosLib.ao_flight_invalid)
                        listener.set_state(AltosLib.ao_flight_startup);

+               if (frequency != AltosLib.MISSING)
+                       listener.set_frequency(frequency);

                listener.set_tick(tick());
                listener.set_rssi(rssi(), status());
                listener.set_received_time(received_time);
                listener.set_tick(tick());
                listener.set_rssi(rssi(), status());
                listener.set_received_time(received_time);


@@ -108,6 +113,10 @@ public abstract class AltosTelemetry implements AltosDataProvider {
                return telem;
        }
 
                return telem;
        }
 

+       public void set_frequency(double frequency) {
+               this.frequency = frequency;
+       }
+

        public AltosTelemetry() {
                this.received_time = System.currentTimeMillis();
        }
        public AltosTelemetry() {
                this.received_time = System.currentTimeMillis();
        }