projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib/altosui: Fixes for state changes
[fw/altos]
/
altoslib
/
AltosRecordMM.java
diff --git
a/altoslib/AltosRecordMM.java
b/altoslib/AltosRecordMM.java
index 9f5292346a61e773aee88f2aa22e290fda86590f..d697111ccb186d287ae4ac780fc2c5164369c7c2 100644
(file)
--- a/
altoslib/AltosRecordMM.java
+++ b/
altoslib/AltosRecordMM.java
@@
-15,7
+15,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
;
+package org.altusmetrum.
altoslib_1
;
public class AltosRecordMM extends AltosRecord {
public class AltosRecordMM extends AltosRecord {
@@
-71,11
+71,11
@@
public class AltosRecordMM extends AltosRecord {
}
public double main_voltage() {
}
public double main_voltage() {
- return pyro(sense[
1
]);
+ return pyro(sense[
5
]);
}
public double drogue_voltage() {
}
public double drogue_voltage() {
- return pyro(sense[
0
]);
+ return pyro(sense[
4
]);
}
public double temperature() {
}
public double temperature() {
@@
-131,10
+131,10
@@
public class AltosRecordMM extends AltosRecord {
mag = old.mag;
}
mag = old.mag;
}
+
+
public AltosRecordMM clone() {
public AltosRecordMM clone() {
- AltosRecordMM n = (AltosRecordMM) super.clone();
- n.copy(this);
- return n;
+ return new AltosRecordMM(this);
}
void make_missing() {
}
void make_missing() {
@@
-167,6
+167,10
@@
public class AltosRecordMM extends AltosRecord {
make_missing();
}
make_missing();
}
+ public AltosRecordMM(AltosRecordMM old) {
+ copy(old);
+ }
+
public AltosRecordMM() {
super();
make_missing();
public AltosRecordMM() {
super();
make_missing();