projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Merge info into one screen
[fw/altos]
/
altoslib
/
AltosIdleFetch.java
diff --git
a/altoslib/AltosIdleFetch.java
b/altoslib/AltosIdleFetch.java
index 7ab8395ac8df5f8d8250f715267b25051c35680a..b64ba0a4c9ee0828d876e80709229b51f5e877e8 100644
(file)
--- a/
altoslib/AltosIdleFetch.java
+++ b/
altoslib/AltosIdleFetch.java
@@
-40,6
+40,8
@@
class AltosIdler {
static final int idle_adxl375 = 10;
static final int idle_adxl375_easymotor_v2 = 11;
static final int idle_imu = 12;
static final int idle_adxl375 = 10;
static final int idle_adxl375_easymotor_v2 = 11;
static final int idle_imu = 12;
+ static final int idle_imu_et_v2 = 13;
+ static final int idle_imu_em_v3 = 14;
static final int idle_sensor_tm = 100;
static final int idle_sensor_metrum = 101;
static final int idle_sensor_tm = 100;
static final int idle_sensor_metrum = 101;
@@
-53,6
+55,9
@@
class AltosIdler {
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_tmini3 = 109;
static final int idle_sensor_easytimer1 = 110;
static final int idle_sensor_easymotor2 = 111;
+ static final int idle_sensor_emini3 = 112;
+ static final int idle_sensor_etimer2 = 113;
+ static final int idle_sensor_emega3 = 114;
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) {
@@
-78,6
+83,9
@@
class AltosIdler {
case idle_imu_et_v1:
AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v1);
break;
case idle_imu_et_v1:
AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v1);
break;
+ case idle_imu_et_v2:
+ AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v2);
+ break;
case idle_imu:
AltosIMU.provide_data(listener, link, AltosLib.MISSING);
break;
case idle_imu:
AltosIMU.provide_data(listener, link, AltosLib.MISSING);
break;
@@
-111,6
+119,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;
@@
-159,6
+170,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),
@@
-244,6
+259,12
@@
public class AltosIdleFetch implements AltosDataProvider {
AltosIdler.idle_ms5607,
AltosIdler.idle_imu_em_v2,
AltosIdler.idle_sensor_mega),
AltosIdler.idle_ms5607,
AltosIdler.idle_imu_em_v2,
AltosIdler.idle_sensor_mega),
+ new AltosIdler("EasyMega-v3",
+ AltosIdler.idle_adxl375,
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_imu,
+ AltosIdler.idle_mag,
+ AltosIdler.idle_sensor_mega),
new AltosIdler("TeleGPS-v1",
AltosIdler.idle_gps,
AltosIdler.idle_sensor_tgps1),
new AltosIdler("TeleGPS-v1",
AltosIdler.idle_gps,
AltosIdler.idle_sensor_tgps1),
@@
-259,6
+280,9
@@
public class AltosIdleFetch implements AltosDataProvider {
new AltosIdler("EasyMotor-v2",
AltosIdler.idle_adxl375_easymotor_v2,
AltosIdler.idle_sensor_easymotor2),
new AltosIdler("EasyMotor-v2",
AltosIdler.idle_adxl375_easymotor_v2,
AltosIdler.idle_sensor_easymotor2),
+ new AltosIdler("EasyTimer-v2",
+ AltosIdler.idle_imu_et_v2,
+ AltosIdler.idle_sensor_easymotor2),
};
AltosLink link;
};
AltosLink link;