altosui: Fetch RF calibration value for TBT v4.0 units from web

We shipped a pile of TBT v4.0 units without programming the RF
calibration value into flash. This change checks to see if the target
is in the right serial number range and has the default RF calibration
value, in which case it fetches the RF calibration value from our web
site.

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

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 254448d015ddcc73ac964e3b129ca2068e5d4a08..40d7a27ba2a87bb26899c6e3522c2d1e8c6c1b6a 100644 (file)
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -230,6 +230,9 @@ public class AltosLib {
        public static final String launch_sites_env = "LAUNCH_SITES";
 //     public static final String launch_sites_url = "file:///home/keithp/misc/text/altusmetrum/AltOS/launch-sites.txt";
 
        public static final String launch_sites_env = "LAUNCH_SITES";
 //     public static final String launch_sites_url = "file:///home/keithp/misc/text/altusmetrum/AltOS/launch-sites.txt";
 

+       public static final String unit_info_url = "https://altusmetrum.org/cgi-bin/unitinfo.cgi?sn=%d";
+       public static final String unit_info_env = "UNIT_INFO";
+

        public static final int ao_telemetry_standard_len = 32;
        public static final int ao_telemetry_0_9_len = 95;
        public static final int ao_telemetry_0_8_len = 94;
        public static final int ao_telemetry_standard_len = 32;
        public static final int ao_telemetry_0_9_len = 95;
        public static final int ao_telemetry_0_8_len = 94;

diff --git a/altoslib/AltosRomconfig.java b/altoslib/AltosRomconfig.java
index ccd01274427b9520bb4622a532cf2db4b5523deb..ebeb76f32b54375db7ed9b1be2469f3658f0f949 100644 (file)
--- a/altoslib/AltosRomconfig.java
+++ b/altoslib/AltosRomconfig.java
@@ -19,9 +19,11 @@
 package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 package org.altusmetrum.altoslib_13;
 
 import java.io.*;

+import java.util.concurrent.*;

 
 

-public class AltosRomconfig {
+public class AltosRomconfig implements AltosUnitInfoListener {

        public boolean  valid;
        public boolean  valid;

+       public boolean  radio_calibration_broken;

        public int      version;
        public int      check;
        public int      serial_number;
        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";
 
        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);
        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;
                                        }
                                        } catch (AltosNoSymbol missing) {
                                                radio_calibration = 0;
                                        }

+

                                        valid = true;
                                        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;
                                }
                        }
                                        break;
                                }
                        }

diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 7c5d767d7916d34ac1fad9f32e7c1560c67c9a0f..929763324a3788f5aacb5875e7f4d4646ae6f09e 100644 (file)
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -183,7 +183,9 @@ altoslib_JAVA = \
        AltosMapLoader.java \
        AltosMapTypeListener.java \
        AltosJson.java \
        AltosMapLoader.java \
        AltosMapTypeListener.java \
        AltosJson.java \

-       AltosVersion.java
+       AltosVersion.java \
+       AltosUnitInfo.java \
+       AltosUnitInfoListener.java

 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
 
 
 JAR=altoslib_$(ALTOSLIB_VERSION).jar
 

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index 6c9cae520a52143c049aa69947c79ed719d3ded1..b91776aa198ebb120c4b0a633c3a4d21ff1830cf 100644 (file)
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -325,6 +325,17 @@ public class AltosFlashUI
                                return false;
                }
 
                                return false;
                }
 

+               if (existing_config.radio_calibration_broken) {
+                       int ret = JOptionPane.showConfirmDialog(this,
+                                                               String.format("Radio calibration value %d may be incorrect\nFlash anyways?",
+                                                                             existing_config.radio_calibration),
+                                                               "Radio Calibration Invalid",
+                                                               JOptionPane.YES_NO_OPTION);
+                       if (ret != JOptionPane.YES_OPTION)
+                               return false;
+               }
+
+

                new_config = AltosRomconfigUI.show(frame, existing_config);
                if (new_config == null)
                        return false;
                new_config = AltosRomconfigUI.show(frame, existing_config);
                if (new_config == null)
                        return false;