Merge branch 'master' into branch-1.8

1 files changed, 21 insertions, 2 deletions

diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java
index a2db3835..092c3d44 100644
--- a/micropeak/MicroUSB.java
+++ b/micropeak/MicroUSB.java
@@ -20,8 +20,8 @@ package org.altusmetrum.micropeak;
 
 import java.util.*;
 import libaltosJNI.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 public class MicroUSB extends altos_device implements AltosDevice {
 
@@ -97,6 +97,25 @@ public class MicroUSB extends altos_device implements AltosDevice {
 		return isFTDI() || isMicro();
 	}
 
+	public int hashCode() {
+		return getVendor() ^ getProduct() ^ getSerial() ^ getPath().hashCode();
+	}
+
+	public boolean equals(Object o) {
+		if (o == null)
+			return false;
+
+		if (!(o instanceof MicroUSB))
+			return false;
+
+		MicroUSB other = (MicroUSB) o;
+
+		return getVendor() == other.getVendor() &&
+			getProduct() == other.getProduct() &&
+			getSerial() == other.getSerial() &&
+			getPath().equals(other.getPath());
+	}
+
 	static java.util.List<MicroUSB> list() {
 		if (!load_library())
 			return null;