altoslib: When flashing hardware, pull USB data from device if needed

If we fail to extract USB vid/pid and product values from the device
ROM, use the data discovered over USB when the device was originally
discovered.

Also, use the USB product to select appropriate .ihx files instead of
only using the USB vid/pid. This will help people avoid using the
wrong file when reflashing devices.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/altoslib/AltosRomconfig.java b/altoslib/AltosRomconfig.java
index ebeb76f3..00811ce7 100644
--- a/altoslib/AltosRomconfig.java
+++ b/altoslib/AltosRomconfig.java
@@ -273,6 +273,14 @@ public class AltosRomconfig implements AltosUnitInfoListener {
 			throw new IOException("writing new rom config failed\n");
 	}
 
+	public String toString() {
+		return String.format("valid %b version %d serial %d radio %d usb %04x:%04x %s",
+				     valid, version, serial_number, radio_calibration,
+				     usb_id == null ? 0 : usb_id.vid,
+				     usb_id == null ? 0 : usb_id.pid,
+				     usb_product == null ? "unknown" : usb_product);
+	}
+
 	public AltosRomconfig(int in_serial_number, int in_radio_calibration) {
 		valid = true;
 		version = 1;
@@ -282,7 +290,7 @@ public class AltosRomconfig implements AltosUnitInfoListener {
 	}
 
 	public boolean valid() {
-		return valid && serial_number != 0;
+		return valid;
 	}
 
 	public AltosRomconfig() {