Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 84 insertions, 0 deletions

diff --git a/altoslib/AltosTelemetryMegaSensor.java b/altoslib/AltosTelemetryMegaSensor.java
new file mode 100644
index 00000000..23b67af8
--- /dev/null
+++ b/altoslib/AltosTelemetryMegaSensor.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2011 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_2;
+
+public class AltosTelemetryMegaSensor extends AltosTelemetryStandard {
+	int	accel;
+	int	pres;
+	int	temp;
+
+	int	accel_x;
+	int	accel_y;
+	int	accel_z;
+
+	int	gyro_x;
+	int	gyro_y;
+	int	gyro_z;
+
+	int	mag_x;
+	int	mag_y;
+	int	mag_z;
+
+	public AltosTelemetryMegaSensor(int[] bytes) {
+		super(bytes);
+
+		accel         = int16(6);
+		pres          = int32(8);
+		temp          = int16(12);
+
+		accel_x	      = int16(14);
+		accel_y	      = int16(16);
+		accel_z	      = int16(18);
+
+		gyro_x	      = int16(20);
+		gyro_y	      = int16(22);
+		gyro_z	      = int16(24);
+
+		mag_x	      = int16(26);
+		mag_y	      = int16(28);
+		mag_z	      = int16(30);
+	}
+
+	public void update_state(AltosState state) {
+		super.update_state(state);
+
+		state.set_accel(accel);
+		state.set_pressure(pres);
+		state.set_temperature(temp / 100.0);
+
+		AltosIMU imu = new AltosIMU();
+		
+		imu.accel_x = accel_x;
+		imu.accel_y = accel_y;
+		imu.accel_z = accel_z;
+
+		imu.gyro_x = gyro_x;
+		imu.gyro_y = gyro_y;
+		imu.gyro_z = gyro_z;
+
+		state.imu = imu;
+
+		AltosMag mag = new AltosMag();
+
+		mag.x = mag_x;
+		mag.y = mag_y;
+		mag.z = mag_z;
+
+		state.mag = mag;
+	}
+}