X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosRomconfig.java;h=d868b9aa444cfc488476ea7b244de71e24053691;hp=ccd01274427b9520bb4622a532cf2db4b5523deb;hb=ec46adee44ea08120b1940ca55a5fbdf56874bb1;hpb=3c48b0fd504ae97dfaca91d2064b5822ca6e1344

diff --git a/altoslib/AltosRomconfig.java b/altoslib/AltosRomconfig.java
index ccd01274..d868b9aa 100644
--- a/altoslib/AltosRomconfig.java
+++ b/altoslib/AltosRomconfig.java
@@ -16,12 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
+import java.util.concurrent.*;
 
-public class AltosRomconfig {
+public class AltosRomconfig implements AltosUnitInfoListener {
 	public boolean	valid;
+	public boolean	radio_calibration_broken;
 	public int	version;
 	public int	check;
 	public int	serial_number;
@@ -117,6 +119,29 @@ public class AltosRomconfig {
 	final static String ao_radio_cal = "ao_radio_cal";
 	final static String ao_usb_descriptors = "ao_usb_descriptors";
 
+	Semaphore	unit_info_done;
+
+	public void notify_unit_info(AltosUnitInfo unit_info) {
+		unit_info_done.release();
+	}
+
+	private void fetch_radio_cal() {
+		unit_info_done = new Semaphore(0);
+		AltosUnitInfo	info = new AltosUnitInfo(serial_number, this);
+
+		/* Block waiting for the rf calibration data */
+		radio_calibration_broken = true;
+		try {
+			unit_info_done.acquire();
+			int new_cal = info.rfcal();
+			if (new_cal != AltosLib.MISSING) {
+				radio_calibration = new_cal;
+				radio_calibration_broken = false;
+			}
+		} catch (InterruptedException ie) {
+		}
+	}
+
 	public AltosRomconfig(AltosHexfile hexfile) {
 		try {
 			version = get_int(hexfile, ao_romconfig_version, 2);
@@ -131,7 +156,18 @@ public class AltosRomconfig {
 					} catch (AltosNoSymbol missing) {
 						radio_calibration = 0;
 					}
+
 					valid = true;
+
+					/* XXX TeleBT v4.0 units originally shipped without RF calibration programmed. Go fetch
+					 * the correct value from the web site
+					 */
+					if (serial_number == 2584 ||
+					    (3686 <= serial_number && serial_number <= 3938 && radio_calibration == 5695485))
+					{
+						fetch_radio_cal();
+					}
+
 					break;
 				}
 			}
@@ -237,6 +273,14 @@ public class AltosRomconfig {
 			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;
@@ -246,7 +290,7 @@ public class AltosRomconfig {
 	}
 
 	public boolean valid() {
-		return valid && serial_number != 0;
+		return valid;
 	}
 
 	public AltosRomconfig() {