From 297eb795b24ec31f6599f48bc8c3769557a7ec6f Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 5 Aug 2018 12:32:42 +0800 Subject: Bump java lib versions to 13 Signed-off-by: Keith Packard --- micropeak/MicroUSB.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'micropeak/MicroUSB.java') diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java index a2db3835..dcc4b602 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 { -- cgit v1.2.3 From 523e51d2cd2dfc5c0c4ca5a893b005916c46d46a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 2 Oct 2018 12:49:12 -0700 Subject: micropeak: Add MicroUSB 'equals' method This lets the code which polls for devices work with MicroUSB devices too. Signed-off-by: Keith Packard --- micropeak/MicroUSB.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'micropeak/MicroUSB.java') diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java index dcc4b602..092c3d44 100644 --- a/micropeak/MicroUSB.java +++ b/micropeak/MicroUSB.java @@ -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 list() { if (!load_library()) return null; -- cgit v1.2.3