projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/ao_flight_test: Show recorded pyro firing
[fw/altos]
/
altoslib
/
AltosFile.java
diff --git
a/altoslib/AltosFile.java
b/altoslib/AltosFile.java
index 2a7389960b08bb8604fabe0c4beb3e5ea3f347d9..69f779c1d46f50e87e16c3617f17071109036ed7 100644
(file)
--- a/
altoslib/AltosFile.java
+++ b/
altoslib/AltosFile.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,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_
4
;
+package org.altusmetrum.altoslib_
12
;
import java.io.File;
import java.util.*;
import java.io.File;
import java.util.*;
@@
-65,7
+66,7
@@
public class AltosFile extends File {
extension);
}
extension);
}
- public AltosFile(Altos
State state
) {
- this(
state.serial, state.flight, state
.receiver_serial, "telem");
+ public AltosFile(Altos
CalData cal_data
) {
+ this(
cal_data.serial, cal_data.flight, cal_data
.receiver_serial, "telem");
}
}
}
}