projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Make reported 'max height' value show filtered max height
[fw/altos]
/
altoslib
/
AltosIdleFetch.java
diff --git
a/altoslib/AltosIdleFetch.java
b/altoslib/AltosIdleFetch.java
index 43eb980a64340c6f0395f6394575ad9785292f6e..058df0a1a246db3455e4f4877b05df0f8ff241fa 100644
(file)
--- a/
altoslib/AltosIdleFetch.java
+++ b/
altoslib/AltosIdleFetch.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
2
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-31,53
+31,60
@@
class AltosIdler {
static final int idle_imu = 1;
static final int idle_mag = 2;
static final int idle_mma655x = 4;
static final int idle_imu = 1;
static final int idle_mag = 2;
static final int idle_mma655x = 4;
+ static final int idle_ms5607 = 5;
static final int idle_sensor_tm = 10;
static final int idle_sensor_metrum = 11;
static final int idle_sensor_mega = 12;
static final int idle_sensor_tm = 10;
static final int idle_sensor_metrum = 11;
static final int idle_sensor_mega = 12;
- static final int idle_sensor_emini = 13;
- static final int idle_sensor_tmini2 = 14;
- static final int idle_sensor_tgps = 15;
- static final int idle_sensor_tmini3 = 16;
+ static final int idle_sensor_emini1 = 13;
+ static final int idle_sensor_emini2 = 14;
+ static final int idle_sensor_tmini2 = 15;
+ static final int idle_sensor_tgps = 16;
+ static final int idle_sensor_tmini3 = 17;
- public void provide_data(AltosDataListener listener, AltosLink link
, AltosCalData cal_data
) throws InterruptedException, TimeoutException, AltosUnknownProduct {
+ public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
for (int idler : idlers) {
switch (idler) {
case idle_gps:
for (int idler : idlers) {
switch (idler) {
case idle_gps:
- AltosGPS.provide_data(listener, link
, cal_data
);
+ AltosGPS.provide_data(listener, link);
break;
case idle_imu:
break;
case idle_imu:
- AltosIMU.provide_data(listener, link
, cal_data
);
+ AltosIMU.provide_data(listener, link);
break;
case idle_mag:
break;
case idle_mag:
- AltosMag.provide_data(listener, link
, cal_data
);
+ AltosMag.provide_data(listener, link);
break;
case idle_mma655x:
break;
case idle_mma655x:
- AltosMma655x.provide_data(listener, link
, cal_data
);
+ AltosMma655x.provide_data(listener, link);
break;
break;
-/* case idle_sensor_tm:
- AltosSensorTM.provide_data(listener, link, cal_data);
+ case idle_ms5607:
+ AltosMs5607.provide_data(listener, link);
+ break;
+ case idle_sensor_tm:
+ AltosSensorTM.provide_data(listener, link);
break;
case idle_sensor_metrum:
break;
case idle_sensor_metrum:
- AltosSensorMetrum.provide_data(listener, link
, cal_data
);
+ AltosSensorMetrum.provide_data(listener, link);
break;
case idle_sensor_mega:
break;
case idle_sensor_mega:
- AltosSensorMega.provide_data(listener, link, cal_data);
+ AltosSensorMega.provide_data(listener, link);
+ break;
+ case idle_sensor_emini1:
+ AltosSensorEMini.provide_data(listener, link, 1);
break;
break;
- case idle_sensor_emini:
- AltosSensorEMini.provide_data(listener, link,
cal_data
);
+ case idle_sensor_emini
2
:
+ AltosSensorEMini.provide_data(listener, link,
2
);
break;
case idle_sensor_tmini2:
break;
case idle_sensor_tmini2:
- AltosSensorTMini2.provide_data(listener, link
, cal_data
);
+ AltosSensorTMini2.provide_data(listener, link);
break;
case idle_sensor_tgps:
break;
case idle_sensor_tgps:
- AltosSensorTGPS.provide_data(listener, link
, cal_data
);
+ AltosSensorTGPS.provide_data(listener, link);
break;
case idle_sensor_tmini3:
break;
case idle_sensor_tmini3:
- AltosSensorTMini3.provide_data(listener, link
, cal_data
);
+ AltosSensorTMini3.provide_data(listener, link);
break;
break;
-*/
}
}
}
}
}
}
@@
-97,16
+104,23
@@
public class AltosIdleFetch implements AltosDataProvider {
static final AltosIdler[] idlers = {
static final AltosIdler[] idlers = {
- new AltosIdler("EasyMini",
- AltosIdler.idle_sensor_emini),
+ new AltosIdler("EasyMini-v1",
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_sensor_emini1),
+
+ new AltosIdler("EasyMini-v2",
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_sensor_emini2),
new AltosIdler("TeleMini-v1",
AltosIdler.idle_sensor_tm),
new AltosIdler("TeleMini-v2",
new AltosIdler("TeleMini-v1",
AltosIdler.idle_sensor_tm),
new AltosIdler("TeleMini-v2",
+ AltosIdler.idle_ms5607,
AltosIdler.idle_sensor_tmini2),
new AltosIdler("TeleMini-v3",
AltosIdler.idle_sensor_tmini2),
new AltosIdler("TeleMini-v3",
+ AltosIdler.idle_ms5607,
AltosIdler.idle_sensor_tmini3),
new AltosIdler("TeleMetrum-v1",
AltosIdler.idle_sensor_tmini3),
new AltosIdler("TeleMetrum-v1",
@@
-116,15
+130,18
@@
public class AltosIdleFetch implements AltosDataProvider {
new AltosIdler("TeleMetrum-v2",
AltosIdler.idle_gps,
AltosIdler.idle_mma655x,
new AltosIdler("TeleMetrum-v2",
AltosIdler.idle_gps,
AltosIdler.idle_mma655x,
+ AltosIdler.idle_ms5607,
AltosIdler.idle_sensor_metrum),
new AltosIdler("TeleMega",
AltosIdler.idle_gps,
AltosIdler.idle_mma655x,
AltosIdler.idle_sensor_metrum),
new AltosIdler("TeleMega",
AltosIdler.idle_gps,
AltosIdler.idle_mma655x,
+ AltosIdler.idle_ms5607,
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
new AltosIdler("EasyMega",
AltosIdler.idle_mma655x,
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
new AltosIdler("EasyMega",
AltosIdler.idle_mma655x,
+ AltosIdler.idle_ms5607,
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
new AltosIdler("TeleGPS",
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
new AltosIdler("TeleGPS",
@@
-134,7
+151,7
@@
public class AltosIdleFetch implements AltosDataProvider {
AltosLink link;
AltosLink link;
- public void provide_data(AltosDataListener listener
, AltosCalData cal_data
) throws InterruptedException, AltosUnknownProduct {
+ public void provide_data(AltosDataListener listener) throws InterruptedException, AltosUnknownProduct {
try {
boolean matched = false;
/* Fetch config data from remote */
try {
boolean matched = false;
/* Fetch config data from remote */
@@
-142,7
+159,7
@@
public class AltosIdleFetch implements AltosDataProvider {
listener.set_state(AltosLib.ao_flight_stateless);
for (AltosIdler idler : idlers) {
if (idler.matches(config_data)) {
listener.set_state(AltosLib.ao_flight_stateless);
for (AltosIdler idler : idlers) {
if (idler.matches(config_data)) {
- idler.provide_data(listener, link
, cal_data
);
+ idler.provide_data(listener, link);
matched = true;
break;
}
matched = true;
break;
}