X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosCompanion.java;h=6f18d93eba01acda5e7e55224eeadc38f97e24da;hp=87e701cfa6703375bab0f209ec433322c0cc2385;hb=b1a90adac9f6e2a609ce1ccd6749462bb5c9adbe;hpb=7041c386cdf37716f8daf0bc1a9204db620e3de9

diff --git a/altoslib/AltosCompanion.java b/altoslib/AltosCompanion.java
index 87e701cf..6f18d93e 100644
--- a/altoslib/AltosCompanion.java
+++ b/altoslib/AltosCompanion.java
@@ -15,11 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_9;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 
-public class AltosCompanion implements Serializable {
+public class AltosCompanion implements AltosHashable {
 	public final static int	board_id_telescience = 0x0a;
 	public final static int	MAX_CHANNELS = 12;
 
@@ -37,4 +37,30 @@ public class AltosCompanion implements Serializable {
 			channels = MAX_CHANNELS;
 		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 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);
+	}
 }