projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
capture pnpservo makefiles too
[fw/altos]
/
altoslib
/
AltosIdleFetch.java
diff --git
a/altoslib/AltosIdleFetch.java
b/altoslib/AltosIdleFetch.java
index 5102c16b3f6f92f0cb50478d26500944899a0dff..5c6f57e049cd4a56e43f625f237aae957e42fef7 100644
(file)
--- a/
altoslib/AltosIdleFetch.java
+++ b/
altoslib/AltosIdleFetch.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-37,8
+38,9
@@
class AltosIdler {
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_metrum = 11;
static final int idle_sensor_mega = 12;
static final int idle_sensor_emini = 13;
- static final int idle_sensor_tmini = 14;
+ static final int idle_sensor_tmini
2
= 14;
static final int idle_sensor_tgps = 15;
static final int idle_sensor_tgps = 15;
+ static final int idle_sensor_tmini3 = 16;
public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException, AltosUnknownProduct {
for (int idler : idlers) {
public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException, AltosUnknownProduct {
for (int idler : idlers) {
@@
-71,12
+73,15
@@
class AltosIdler {
case idle_sensor_emini:
AltosSensorEMini.update_state(state, link, config_data);
break;
case idle_sensor_emini:
AltosSensorEMini.update_state(state, link, config_data);
break;
- case idle_sensor_tmini:
+ case idle_sensor_tmini
2
:
AltosSensorTMini.update_state(state, link, config_data);
break;
case idle_sensor_tgps:
AltosSensorTGPS.update_state(state, link, config_data);
break;
AltosSensorTMini.update_state(state, link, config_data);
break;
case idle_sensor_tgps:
AltosSensorTGPS.update_state(state, link, config_data);
break;
+ case idle_sensor_tmini3:
+ AltosSensorTMini3.update_state(state, link, config_data);
+ break;
}
if (idle != null)
idle.update_state(state);
}
if (idle != null)
idle.update_state(state);
@@
-107,7
+112,11
@@
public class AltosIdleFetch implements AltosStateUpdate {
new AltosIdler("TeleMini-v2",
AltosIdler.idle_ms5607,
new AltosIdler("TeleMini-v2",
AltosIdler.idle_ms5607,
- AltosIdler.idle_sensor_tmini),
+ AltosIdler.idle_sensor_tmini2),
+
+ new AltosIdler("TeleMini-v3",
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_sensor_tmini3),
new AltosIdler("TeleMetrum-v1",
AltosIdler.idle_gps,
new AltosIdler("TeleMetrum-v1",
AltosIdler.idle_gps,