X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosTelemetryRecordMegaSensor.java;h=234cda27ba36f44a6b90e35bfeb0cfbb9bafdf3b;hp=85a32d12c8d4283125b54597d8b9dd1f9e725e76;hb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00;hpb=6f421818fd7062f03bfaf9e606d6a4cfdcb13b49

diff --git a/altoslib/AltosTelemetryRecordMegaSensor.java b/altoslib/AltosTelemetryRecordMegaSensor.java
index 85a32d12..234cda27 100644
--- a/altoslib/AltosTelemetryRecordMegaSensor.java
+++ b/altoslib/AltosTelemetryRecordMegaSensor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_2;
 
 
 public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
@@ -35,10 +35,8 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
 	int	mag_y;
 	int	mag_z;
 
-	int	rssi;
-
-	public AltosTelemetryRecordMegaSensor(int[] in_bytes, int in_rssi) {
-		super(in_bytes);
+	public AltosTelemetryRecordMegaSensor(int[] in_bytes, int rssi) {
+		super(in_bytes, rssi);
 
 		accel         = int16(6);
 		pres          = int32(8);
@@ -55,9 +53,6 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
 		mag_x	      = int16(26);
 		mag_y	      = int16(28);
 		mag_z	      = int16(30);
-
-		rssi	      = in_rssi;
-		System.out.printf ("telem record accel: %d\n", accel);
 	}
 
 	public AltosRecord update_state(AltosRecord previous) {
@@ -65,14 +60,11 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
 
 		AltosRecordMM	next;
 		if (!(n instanceof AltosRecordMM)) {
-			System.out.printf("sensor making MM\n");
 			next = new AltosRecordMM(n);
 		} else {
-			System.out.printf("sensor has MM\n");
 			next = (AltosRecordMM) n;
 		}
 
-		System.out.printf("telem update_state accel: %d\n", accel);
 		next.accel = accel;
 		next.pres = pres;
 		next.temp = temp;
@@ -89,8 +81,6 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
 		next.mag.y = mag_y;
 		next.mag.z = mag_z;
 
-		next.rssi = rssi;
-
 		next.seen |= AltosRecord.seen_sensor;
 
 		return next;