projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/cc1111: Wake up non-ADC sensor code each timer tick
[fw/altos]
/
altoslib
/
AltosIdleMonitor.java
diff --git
a/altoslib/AltosIdleMonitor.java
b/altoslib/AltosIdleMonitor.java
index f2f75bbb60f80dc21cf388a70459e7c239c76b37..b3ce5b204a8774976f9764fb2d738d37de99fdf1 100644
(file)
--- a/
altoslib/AltosIdleMonitor.java
+++ b/
altoslib/AltosIdleMonitor.java
@@
-29,6
+29,7
@@
public class AltosIdleMonitor extends Thread {
double frequency;
String callsign;
AltosState previous_state;
double frequency;
String callsign;
AltosState previous_state;
+ AltosListenerState listener_state;
AltosConfigData config_data;
AltosGPS gps;
AltosConfigData config_data;
AltosGPS gps;
@@
-51,11
+52,11
@@
public class AltosIdleMonitor extends Thread {
}
boolean has_sensor_mm(AltosConfigData config_data) {
}
boolean has_sensor_mm(AltosConfigData config_data) {
- return config_data.product.startsWith("
MegaMetrum
");
+ return config_data.product.startsWith("
TeleMega
");
}
boolean has_gps(AltosConfigData config_data) {
}
boolean has_gps(AltosConfigData config_data) {
- return config_data.product.startsWith("TeleMetrum") || config_data.product.startsWith("
MegaMetrum
");
+ return config_data.product.startsWith("TeleMetrum") || config_data.product.startsWith("
TeleMega
");
}
AltosRecord sensor_mm(AltosConfigData config_data) throws InterruptedException, TimeoutException {
}
AltosRecord sensor_mm(AltosConfigData config_data) throws InterruptedException, TimeoutException {
@@
-111,13
+112,15
@@
public class AltosIdleMonitor extends Thread {
record.status = 0;
record.state = AltosLib.ao_flight_idle;
record.gps = gps;
record.status = 0;
record.state = AltosLib.ao_flight_idle;
record.gps = gps;
- record.
new_gps = true
;
+ record.
gps_sequence++
;
state = new AltosState (record, state);
} finally {
if (remote) {
link.stop_remote();
state = new AltosState (record, state);
} finally {
if (remote) {
link.stop_remote();
- if (record != null)
- record.rssi = AltosRSSI();
+ if (record != null) {
+ record.rssi = link.rssi();
+ listener_state.battery = link.monitor_battery();
+ }
} else {
if (record != null)
record.rssi = 0;
} else {
if (record != null)
record.rssi = 0;
@@
-137,7
+140,7
@@
public class AltosIdleMonitor extends Thread {
}
public void post_state() {
}
public void post_state() {
- listener.update(state);
+ listener.update(state
, listener_state
);
}
public void abort() {
}
public void abort() {
@@
-172,5
+175,6
@@
public class AltosIdleMonitor extends Thread {
link = in_link;
remote = in_remote;
state = null;
link = in_link;
remote = in_remote;
state = null;
+ listener_state = new AltosListenerState();
}
}
}
}