projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Deal with AltosState changes
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index d3929b8f7e047480ddcd02cef4eed0953863f26c..e5a0541e18af3d73ede2e596ae2c7d9c31cf814a 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-43,8
+43,6
@@
public class AltosState extends AltosDataListener {
public int rssi;
public int status;
public int rssi;
public int status;
- public double time;
-
class AltosValue {
double value;
double prev_value;
class AltosValue {
double value;
double prev_value;
@@
-288,7
+286,6
@@
public class AltosState extends AltosDataListener {
}
}
}
}
- private int state;
public boolean landed;
public boolean ascent; /* going up? */
public boolean boost; /* under power */
public boolean landed;
public boolean ascent; /* going up? */
public boolean boost; /* under power */
@@
-506,23
+503,7
@@
public class AltosState extends AltosDataListener {
pressure.set(p, time);
}
pressure.set(p, time);
}
- class AltosForce extends AltosValue {
- void set(double p, double time) {
- super.set(p, time);
- }
-
- AltosForce() {
- super();
- }
- }
- private AltosForce thrust;
-
- public double thrust() {
- return thrust.value();
- }
-
public void set_thrust(double N) {
public void set_thrust(double N) {
- thrust.set(N, time);
}
public double baro_height() {
}
public double baro_height() {
@@
-720,15
+701,8
@@
public class AltosState extends AltosDataListener {
public int speak_tick;
public double speak_altitude;
public int speak_tick;
public double speak_altitude;
- public String callsign;
- public String firmware_version;
-
public double ground_accel;
public double ground_accel;
- public int log_format;
- public int log_space;
- public String product;
-
public AltosCompanion companion;
public int pyro_fired;
public AltosCompanion companion;
public int pyro_fired;
@@
-756,7
+730,6
@@
public class AltosState extends AltosDataListener {
ground_pressure = new AltosGroundPressure();
altitude = new AltosAltitude();
pressure = new AltosPressure();
ground_pressure = new AltosGroundPressure();
altitude = new AltosAltitude();
pressure = new AltosPressure();
- thrust = new AltosForce();
speed = new AltosSpeed();
acceleration = new AltosAccel();
orient = new AltosCValue();
speed = new AltosSpeed();
acceleration = new AltosAccel();
orient = new AltosCValue();
@@
-810,15
+783,8
@@
public class AltosState extends AltosDataListener {
speak_tick = AltosLib.MISSING;
speak_altitude = AltosLib.MISSING;
speak_tick = AltosLib.MISSING;
speak_altitude = AltosLib.MISSING;
- callsign = null;
- firmware_version = null;
-
ground_accel = AltosLib.MISSING;
ground_accel = AltosLib.MISSING;
- log_format = AltosLib.MISSING;
- log_space = AltosLib.MISSING;
- product = null;
-
companion = null;
pyro_fired = 0;
companion = null;
pyro_fired = 0;
@@
-1108,6
+1074,10
@@
public class AltosState extends AltosDataListener {
this.pyro_fired = fired;
}
this.pyro_fired = fired;
}
+ public AltosState() {
+ init();
+ }
+
public AltosState (AltosCalData cal_data) {
super(cal_data);
init();
public AltosState (AltosCalData cal_data) {
super(cal_data);
init();