X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCompanion.java;fp=altoslib%2FAltosCompanion.java;h=d517fd4fd87f9bdf359db473c4ddce7f7dac46fe;hp=2db8ea1b3d8b8845197f93e0f04ef3f8c5cf6745;hb=1dce20f7eee56166ac61798ca26eeb323dc8f012;hpb=7175774c4f60ed3efd54417f2035b50ea0108c7b

diff --git a/altoslib/AltosCompanion.java b/altoslib/AltosCompanion.java
index 2db8ea1b..d517fd4f 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 AltosJsonable {
+public class AltosCompanion {
 	public final static int	board_id_telescience = 0x0a;
 	public final static int	MAX_CHANNELS = 12;
 
@@ -37,30 +37,4 @@ public class AltosCompanion implements AltosJsonable {
 			channels = MAX_CHANNELS;
 		companion_data = new int[channels];
 	}
-
-	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(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);
-	}
 }