altosui: Remove a bunch of debugging printfs
authorKeith Packard <keithp@keithp.com>
Wed, 11 Jul 2012 21:28:53 +0000 (14:28 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 11 Jul 2012 21:28:53 +0000 (14:28 -0700)
These aren't useful at this point.

Signed-off-by: Keith Packard <keithp@keithp.com>
13 files changed:
altoslib/AltosLog.java
altoslib/AltosPreferences.java
altoslib/AltosRecordMM.java
altoslib/AltosTelemetryRecordMegaData.java
altoslib/AltosTelemetryRecordMegaSensor.java
altosui/AltosBTDevice.java
altosui/AltosBTDeviceIterator.java
altosui/AltosBTKnown.java
altosui/AltosBTManage.java
altosui/AltosConfigTD.java
altosui/AltosConfigureUI.java
altosui/AltosFlashUI.java
altosui/AltosLaunchUI.java

index 08c45ca..55a25bb 100644 (file)
@@ -62,7 +62,6 @@ class AltosLog implements Runnable {
        boolean open (AltosRecord telem) throws IOException {
                AltosFile       a = new AltosFile(telem);
 
-               System.out.printf("open %s\n", a.toString());
                log_file = new FileWriter(a, true);
                if (log_file != null) {
                        while (!pending_queue.isEmpty()) {
index 43c7088..9ab80cf 100644 (file)
@@ -306,7 +306,6 @@ public class AltosPreferences {
 
        public static void set_launcher_serial(int new_launcher_serial) {
                launcher_serial = new_launcher_serial;
-               System.out.printf("set launcher serial to %d\n", new_launcher_serial);
                synchronized (preferences) {
                        preferences.putInt(launcherSerialPreference, launcher_serial);
                        flush_preferences();
@@ -319,7 +318,6 @@ public class AltosPreferences {
 
        public static void set_launcher_channel(int new_launcher_channel) {
                launcher_channel = new_launcher_channel;
-               System.out.printf("set launcher channel to %d\n", new_launcher_channel);
                synchronized (preferences) {
                        preferences.putInt(launcherChannelPreference, launcher_channel);
                        flush_preferences();
index 8b3d745..055cf85 100644 (file)
@@ -98,8 +98,6 @@ public class AltosRecordMM extends AltosRecord {
        }
 
        public double acceleration() {
-               System.out.printf("MM record acceleration %g ground_accel %d accel %d accel_minus_g %d accel_plus_g %d\n",
-                                 acceleration, ground_accel, accel, accel_minus_g, accel_plus_g);
                if (acceleration != MISSING)
                        return acceleration;
 
index cc35cd8..8f55d23 100644 (file)
@@ -65,10 +65,8 @@ public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
 
                AltosRecordMM   next;
                if (!(n instanceof AltosRecordMM)) {
-                       System.out.printf("data making record MM\n");
                        next = new AltosRecordMM(n);
                } else {
-                       System.out.printf ("data already has MM\n");
                        next = (AltosRecordMM) n;
                }
 
index 85a32d1..93c001d 100644 (file)
@@ -57,7 +57,6 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
                mag_z         = int16(30);
 
                rssi          = in_rssi;
-               System.out.printf ("telem record accel: %d\n", accel);
        }
 
        public AltosRecord update_state(AltosRecord previous) {
@@ -65,14 +64,11 @@ public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
 
                AltosRecordMM   next;
                if (!(n instanceof AltosRecordMM)) {
-                       System.out.printf("sensor making MM\n");
                        next = new AltosRecordMM(n);
                } else {
-                       System.out.printf("sensor has MM\n");
                        next = (AltosRecordMM) n;
                }
 
-               System.out.printf("telem update_state accel: %d\n", accel);
                next.accel = accel;
                next.pres = pres;
                next.temp = temp;
index f6926b1..5e353fd 100644 (file)
@@ -87,7 +87,6 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
 
        public boolean matchProduct(int want_product) {
 
-               System.out.printf("matchProduct %s %d\n", toString(), want_product);
 //             if (!isAltusMetrum())
 //                     return false;
 
@@ -107,7 +106,6 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
                if (!(o instanceof AltosBTDevice))
                        return false;
                AltosBTDevice other = (AltosBTDevice) o;
-               System.out.printf("AltosBTDevice equals %s == %s\n", toString(), other.toString());
                return getName().equals(other.getName()) && getAddr().equals(other.getAddr());
        }
 
index 7c36070..58ed86d 100644 (file)
@@ -26,7 +26,6 @@ public class AltosBTDeviceIterator implements Iterator<AltosBTDevice> {
        SWIGTYPE_p_altos_bt_list list;
 
        public boolean hasNext() {
-               System.out.printf ("BT has next?\n");
                if (list == null)
                        return false;
                if (current != null)
@@ -35,7 +34,6 @@ public class AltosBTDeviceIterator implements Iterator<AltosBTDevice> {
                        return false;
                current = new AltosBTDevice();
                while (libaltos.altos_bt_list_next(list, current) != 0) {
-                       System.out.printf("Got BT device %s\n", current.toString());
 //                     if (current.matchProduct(product))
                                return true;
                }
index 021e4d0..6a8e53c 100644 (file)
@@ -31,7 +31,6 @@ public class AltosBTKnown implements Iterable<AltosBTDevice> {
 
        private void set_address(String name, String addr) {
                bt_pref.put(name, addr);
-               System.out.printf("saving known %s %s\n", name, addr);
        }
 
        private void remove(String name) {
@@ -44,7 +43,6 @@ public class AltosBTKnown implements Iterable<AltosBTDevice> {
                        for (int i = 0; i < names.length; i++) {
                                String  name = names[i];
                                String  addr = get_address(name);
-                               System.out.printf("Known device %s %s\n", name, addr);
                                devices.add(new AltosBTDevice(name, addr));
                        }
                } catch (BackingStoreException be) {
index d2899d6..aeb964b 100644 (file)
@@ -126,7 +126,6 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
 
        public void add_known() {
                for (AltosBTDevice device : visible_devices.selected_list()) {
-                       System.out.printf("Add known %s\n", device.toString());
                        known_devices.add(device);
                        visible_devices.remove(device);
                }
@@ -134,7 +133,6 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
 
        public void remove_known() {
                for (AltosBTDevice device : known_devices.selected_list()) {
-                       System.out.printf("Remove known %s\n", device.toString());
                        known_devices.remove(device);
                        visible_devices.add(device);
                }
@@ -151,7 +149,6 @@ public class AltosBTManage extends AltosDialog implements ActionListener, Iterab
 
        public void actionPerformed(ActionEvent e) {
                String  command = e.getActionCommand();
-               System.out.printf("manage command %s\n", command);
                if ("ok".equals(command)) {
                        bt_thread.interrupt();
                        commit();
index 4048166..324a598 100644 (file)
@@ -144,10 +144,8 @@ public class AltosConfigTD implements ActionListener {
                get_string(line, "Config version", config_version);
                get_int(line, "serial-number", serial);
                get_int(line, "Radio channel:", radio_channel);
-               if (get_int(line, "Radio cal:", radio_calibration))
-                       System.out.printf("got radio cal %d\n", radio_calibration.get());
-               if (get_int(line, "Frequency:", radio_frequency))
-                       System.out.printf("got radio freq %d\n", radio_frequency.get());
+               get_int(line, "Radio cal:", radio_calibration);
+               get_int(line, "Frequency:", radio_frequency);
                get_int(line, "Radio setting:", radio_setting);
                get_string(line,"software-version", version);
                get_string(line,"product", product);
@@ -205,7 +203,6 @@ public class AltosConfigTD implements ActionListener {
                                                        break;
                                                }
                                        }
-                                       System.out.printf("config_version %s\n", config_version.get());
                                        if (been_there)
                                                break;
                                        if (!config_version.get().equals("0.0"))
index d0ed932..ace245a 100644 (file)
@@ -291,7 +291,6 @@ public class AltosConfigureUI
 
                final UIManager.LookAndFeelInfo[] look_and_feels = UIManager.getInstalledLookAndFeels();
 
-               System.out.printf("look_and_feels %d\n", look_and_feels.length);
                look_and_feel_value = new JComboBox(look_and_feels);
 
                DelegatingRenderer.install(look_and_feel_value);
index 4ab73a6..66991d1 100644 (file)
@@ -235,22 +235,17 @@ public class AltosFlashUI
                                                public void run() {
                                                        ui.flash = flash;
                                                        ui.update_rom_config_info(current_config);
-                                                       System.out.printf("Done updating rom config info\n");
                                                        await_rom_config.release();
                                                }
                                        });
-                               System.out.printf("Waiting for rom configuration updates\n");
                                await_rom_config.acquire();
-                               System.out.printf("Got rom config update\n");
 
                                if (ui.rom_config != null) {
-                                       System.out.printf("rom_config not null\n");
                                        flash.set_romconfig(ui.rom_config);
                                        flash.flash();
                                }
                        } catch (InterruptedException ee) {
                                final Exception e = ee;
-                               System.out.printf("exception %s\n", e.toString());
                                SwingUtilities.invokeLater(new Runnable() {
                                                public void run() {
                                                        ui.exception(e);
@@ -258,7 +253,6 @@ public class AltosFlashUI
                                        });
                        } catch (IOException ee) {
                                final Exception e = ee;
-                               System.out.printf("exception %s\n", e.toString());
                                SwingUtilities.invokeLater(new Runnable() {
                                                public void run() {
                                                        ui.exception(e);
@@ -266,7 +260,6 @@ public class AltosFlashUI
                                        });
                        } catch (AltosSerialInUseException ee) {
                                final Exception e = ee;
-                               System.out.printf("exception %s\n", e.toString());
                                SwingUtilities.invokeLater(new Runnable() {
                                                public void run() {
                                                        ui.exception(e);
index eb76243..4448154 100644 (file)
@@ -336,7 +336,6 @@ public class AltosLaunchUI
 
        public void actionPerformed(ActionEvent e) {
                String cmd = e.getActionCommand();
-               System.out.printf("cmd %s\n", cmd);
                if (cmd.equals("armed") || cmd.equals("igniter")) {
                        stop_arm_timer();
                }