From 48f57997452e17564e28fe3e37403f6f63d32dea Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 9 Sep 2010 20:24:42 -0700 Subject: altosui: conflating USB product and vendor IDs is a bad idea We've now got a USB vendor ID called 'altusmetrum' for generic altusmetrum devices (old USB ID 0x000A) while the general vendor name for all devices is 'altusmetrum' as well. This patch splits vendors and products into separate name spaces, products are prefixed with product_ and vendor with (oddly) vendor_. Signed-off-by: Keith Packard --- ao-tools/altosui/AltosConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ao-tools/altosui/AltosConfig.java') diff --git a/ao-tools/altosui/AltosConfig.java b/ao-tools/altosui/AltosConfig.java index 3d970748..7b6cd78c 100644 --- a/ao-tools/altosui/AltosConfig.java +++ b/ao-tools/altosui/AltosConfig.java @@ -238,12 +238,12 @@ public class AltosConfig implements Runnable, ActionListener { version = new string_ref("unknown"); product = new string_ref("unknown"); - device = AltosDeviceDialog.show(owner, AltosDevice.Any); + device = AltosDeviceDialog.show(owner, AltosDevice.product_any); serial_line = new AltosSerial(); if (device != null) { try { serial_line.open(device); - if (!device.matchProduct(AltosDevice.TeleMetrum)) + if (!device.matchProduct(AltosDevice.product_telemetrum)) remote = true; config_thread = new Thread(this); config_thread.start(); -- cgit v1.2.3