projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Support Monitor Idle for EasyMini-3
[fw/altos]
/
altoslib
/
AltosIdleFetch.java
diff --git
a/altoslib/AltosIdleFetch.java
b/altoslib/AltosIdleFetch.java
index b2552b24bdf73d561378585808c8c8660c61621f..90f4f53e0374407ed1d124e61d055b843d418154 100644
(file)
--- a/
altoslib/AltosIdleFetch.java
+++ b/
altoslib/AltosIdleFetch.java
@@
-49,9
+49,11
@@
class AltosIdler {
static final int idle_sensor_tmini2 = 105;
static final int idle_sensor_tgps1 = 106;
static final int idle_sensor_tgps2 = 107;
static final int idle_sensor_tmini2 = 105;
static final int idle_sensor_tgps1 = 106;
static final int idle_sensor_tgps2 = 107;
- static final int idle_sensor_tmini3 = 108;
- static final int idle_sensor_easytimer1 = 109;
- static final int idle_sensor_easymotor2 = 110;
+ static final int idle_sensor_tgps3 = 108;
+ static final int idle_sensor_tmini3 = 109;
+ static final int idle_sensor_easytimer1 = 110;
+ static final int idle_sensor_easymotor2 = 111;
+ static final int idle_sensor_emini3 = 112;
public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
for (int idler : idlers) {
public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
for (int idler : idlers) {
@@
-110,6
+112,9
@@
class AltosIdler {
case idle_sensor_emini2:
AltosSensorEMini.provide_data(listener, link, 2);
break;
case idle_sensor_emini2:
AltosSensorEMini.provide_data(listener, link, 2);
break;
+ case idle_sensor_emini3:
+ AltosSensorEMini.provide_data(listener, link, 3);
+ break;
case idle_sensor_tmini2:
AltosSensorTMini2.provide_data(listener, link);
break;
case idle_sensor_tmini2:
AltosSensorTMini2.provide_data(listener, link);
break;
@@
-119,6
+124,9
@@
class AltosIdler {
case idle_sensor_tgps2:
AltosSensorTGPS2.provide_data(listener, link);
break;
case idle_sensor_tgps2:
AltosSensorTGPS2.provide_data(listener, link);
break;
+ case idle_sensor_tgps3:
+ AltosSensorTGPS3.provide_data(listener, link);
+ break;
case idle_sensor_tmini3:
AltosSensorTMini3.provide_data(listener, link);
break;
case idle_sensor_tmini3:
AltosSensorTMini3.provide_data(listener, link);
break;
@@
-155,6
+163,10
@@
public class AltosIdleFetch implements AltosDataProvider {
AltosIdler.idle_ms5607,
AltosIdler.idle_sensor_emini2),
AltosIdler.idle_ms5607,
AltosIdler.idle_sensor_emini2),
+ new AltosIdler("EasyMini-v3",
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_sensor_emini3),
+
new AltosIdler("TeleMini-v1",
AltosIdler.idle_sensor_tm),
new AltosIdler("TeleMini-v1",
AltosIdler.idle_sensor_tm),
@@
-224,6
+236,12
@@
public class AltosIdleFetch implements AltosDataProvider {
AltosIdler.idle_ms5607,
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
AltosIdler.idle_ms5607,
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
+ new AltosIdler("TeleMega-v6",
+ AltosIdler.idle_gps,
+ AltosIdler.idle_adxl375,
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_imu, AltosIdler.idle_mag,
+ AltosIdler.idle_sensor_mega),
new AltosIdler("EasyMega-v1",
AltosIdler.idle_mma655x,
AltosIdler.idle_ms5607,
new AltosIdler("EasyMega-v1",
AltosIdler.idle_mma655x,
AltosIdler.idle_ms5607,
@@
-240,6
+258,9
@@
public class AltosIdleFetch implements AltosDataProvider {
new AltosIdler("TeleGPS-v2",
AltosIdler.idle_gps,
AltosIdler.idle_sensor_tgps2),
new AltosIdler("TeleGPS-v2",
AltosIdler.idle_gps,
AltosIdler.idle_sensor_tgps2),
+ new AltosIdler("TeleGPS-v3",
+ AltosIdler.idle_gps,
+ AltosIdler.idle_sensor_tgps3),
new AltosIdler("EasyTimer-v1",
AltosIdler.idle_imu_et_v1,
AltosIdler.idle_sensor_easytimer1),
new AltosIdler("EasyTimer-v1",
AltosIdler.idle_imu_et_v1,
AltosIdler.idle_sensor_easytimer1),