projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
publish support for TeleGPS v2.0
[fw/altos]
/
altoslib
/
AltosTelemetry.java
diff --git
a/altoslib/AltosTelemetry.java
b/altoslib/AltosTelemetry.java
index e93e6601ea417bece40a9f68c9a08c6e67228558..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++)
@@
-46,12
+49,13
@@
public abstract class AltosTelemetry implements AltosDataProvider {
return sum == bytes[bytes.length - 1];
}
return sum == bytes[bytes.length - 1];
}
- public void provide_data(AltosDataListener listener
, AltosCalData cal_data
) {
-
cal_data
.set_serial(serial());
+ public void provide_data(AltosDataListener listener) {
+
listener
.set_serial(serial());
if (listener.state == AltosLib.ao_flight_invalid)
listener.set_state(AltosLib.ao_flight_startup);
if (listener.state == AltosLib.ao_flight_invalid)
listener.set_state(AltosLib.ao_flight_startup);
- cal_data.set_tick(tick());
- listener.set_time(cal_data.time());
+ 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_rssi(rssi(), status());
listener.set_received_time(received_time);
}
@@
-109,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();
}