projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add VGA driver for STM32L processors
[fw/altos]
/
altoslib
/
AltosTelemetryMegaData.java
diff --git
a/altoslib/AltosTelemetryMegaData.java
b/altoslib/AltosTelemetryMegaData.java
index f5cc01d07a5d1913ebad9d7629e6fdde4fe0d43f..6ea5ec89897ab541bf1a2c7ca85328f806f65163 100644
(file)
--- a/
altoslib/AltosTelemetryMegaData.java
+++ b/
altoslib/AltosTelemetryMegaData.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
@@
-15,11
+16,11
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
2
;
+package org.altusmetrum.altoslib_
11
;
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
int state;
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
int state;
-
+
int v_batt;
int v_pyro;
int sense[];
int v_batt;
int v_pyro;
int sense[];
@@
-31,20
+32,20
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
int acceleration;
int speed;
int acceleration;
int speed;
- int height;
+ int height
_16
;
public AltosTelemetryMegaData(int[] bytes) {
super(bytes);
public AltosTelemetryMegaData(int[] bytes) {
super(bytes);
- state = int8(5);
+ state =
u
int8(5);
v_batt = int16(6);
v_pyro = int16(8);
v_batt = int16(6);
v_pyro = int16(8);
- sense = new int[6];
+ sense = new int[6];
for (int i = 0; i < 6; i++) {
for (int i = 0; i < 6; i++) {
- sense[i] = int8(10 + i) << 4;
+ sense[i] =
u
int8(10 + i) << 4;
sense[i] |= sense[i] >> 8;
}
sense[i] |= sense[i] >> 8;
}
@@
-55,14
+56,15
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
acceleration = int16(26);
speed = int16(28);
acceleration = int16(26);
speed = int16(28);
- height = int16(30);
+
+ height_16 = int16(30);
}
public void update_state(AltosState state) {
super.update_state(state);
state.set_state(this.state);
}
public void update_state(AltosState state) {
super.update_state(state);
state.set_state(this.state);
-
+
state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));
state.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro));
state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));
state.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro));
@@
-79,7
+81,13
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
state.set_ground_pressure(ground_pres);
state.set_accel_g(accel_plus_g, accel_minus_g);
state.set_ground_pressure(ground_pres);
state.set_accel_g(accel_plus_g, accel_minus_g);
- state.set_kalman(height, speed/16.0, acceleration / 16.0);
+ /* Fill in the high bits of height from recent GPS
+ * data if available, otherwise guess using the
+ * previous kalman height
+ */
+
+ state.set_kalman(extend_height(state, height_16),
+ speed/16.0, acceleration / 16.0);
}
}
}
}