projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-usbload: Check target device name to avoid mis-flashing
[fw/altos]
/
altoslib
/
AltosRotation.java
diff --git
a/altoslib/AltosRotation.java
b/altoslib/AltosRotation.java
index 6db0b541595ce37f51acd0f78c413abd07b72c38..1235d86b90e57a1c0da9d3923b2c16db0cd09d0f 100644
(file)
--- a/
altoslib/AltosRotation.java
+++ b/
altoslib/AltosRotation.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
@@
-17,7
+18,7
@@
package org.altusmetrum.altoslib_11;
package org.altusmetrum.altoslib_11;
-public class AltosRotation
implements AltosJsonable
{
+public class AltosRotation
extends AltosQuaternion
{
private AltosQuaternion rotation;
public double tilt() {
private AltosQuaternion rotation;
public double tilt() {
@@
-48,22
+49,7
@@
public class AltosRotation implements AltosJsonable {
rotation = up.vectors_to_rotation(orient);
}
rotation = up.vectors_to_rotation(orient);
}
- public AltosRotation(AltosJson j) {
- rotation = new AltosQuaternion(j);
- }
-
public AltosRotation() {
rotation = new AltosQuaternion();
}
public AltosRotation() {
rotation = new AltosQuaternion();
}
-
- public AltosJson json() {
- return rotation.json();
- }
-
- public static AltosRotation fromJson(AltosJson j, AltosRotation def) {
- if (j == null)
- return def;
-
- return new AltosRotation(j);
- }
}
}