X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosCompanion.java;h=e228b074d8f5729ae77e822e081efa7ebdb16972;hb=1ed6a3fb6356415c0d57ce2ce556435c6ff06e73;hp=abb988304e3d4c7e17f668125ffc93b1cce3ebb8;hpb=1b5ea911049a8afae6af475a4a2bf62a6e3aa57b;p=fw%2Faltos

diff --git a/altoslib/AltosCompanion.java b/altoslib/AltosCompanion.java
index abb98830..e228b074 100644
--- a/altoslib/AltosCompanion.java
+++ b/altoslib/AltosCompanion.java
@@ -19,7 +19,7 @@ package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 
-public class AltosCompanion implements AltosHashable, AltosJsonable {
+public class AltosCompanion {
 	public final static int	board_id_telescience = 0x0a;
 	public final static int	MAX_CHANNELS = 12;
 
@@ -38,55 +38,8 @@ public class AltosCompanion implements AltosHashable, AltosJsonable {
 		companion_data = new int[channels];
 	}
 
-	public AltosHashSet hashSet() {
-		AltosHashSet h = new AltosHashSet();
-
-		h.putInt("tick", tick);
-		h.putInt("board_id", board_id);
-		h.putInt("update_period", update_period);
-		h.putInt("channels", channels);
-		h.putIntArray("companion_data", companion_data);
-		return h;
-	}
-
-	public AltosJson json() {
-		AltosJson j = new AltosJson();
-
-		j.put("tick", tick);
-		j.put("board_id", board_id);
-		j.put("update_period", update_period);
-		j.put("channels", channels);
-		j.put("companion_data", companion_data);
-		return j;
-	}
-
-	public AltosCompanion(AltosHashSet h) {
-		tick = h.getInt("tick", tick);
-		board_id = h.getInt("board_id", board_id);
-		update_period = h.getInt("update_period", update_period);
-		channels = h.getInt("channels", channels);
-		companion_data = h.getIntArray("companion_data", new int[channels]);
-	}
-
-	public static AltosCompanion fromHashSet(AltosHashSet h, AltosCompanion def) {
-		if (h == null)
-			return def;
-
-		return new AltosCompanion(h);
-	}
-
-	public AltosCompanion(AltosJson j) {
-		tick = j.get_int("tick", tick);
-		board_id = j.get_int("board_id", board_id);
-		update_period = j.get_int("update_period", update_period);
-		channels = j.get_int("channels", channels);
-		companion_data = j.get_int_array("companion_data", new int[channels]);
-	}
-
-	public static AltosCompanion fromJson(AltosJson j, AltosCompanion def) {
-		if (j == null)
-			return def;
-
-		return new AltosCompanion(j);
+	public AltosCompanion() {
+		channels = 0;
+		companion_data = new int[0];
 	}
 }