summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--altoslib/AltosLog.java1
-rw-r--r--altoslib/AltosPreferences.java2
-rw-r--r--altoslib/AltosRecordMM.java2
-rw-r--r--altoslib/AltosTelemetryRecordMegaData.java2
-rw-r--r--altoslib/AltosTelemetryRecordMegaSensor.java4
-rw-r--r--altosui/AltosBTDevice.java2
-rw-r--r--altosui/AltosBTDeviceIterator.java2
-rw-r--r--altosui/AltosBTKnown.java2
-rw-r--r--altosui/AltosBTManage.java3
-rw-r--r--altosui/AltosConfigTD.java7
-rw-r--r--altosui/AltosConfigureUI.java1
-rw-r--r--altosui/AltosFlashUI.java7
-rw-r--r--altosui/AltosLaunchUI.java1
13 files changed, 2 insertions, 34 deletions
diff --git a/altoslib/AltosLog.java b/altoslib/AltosLog.java
index 08c45ca8..55a25bb4 100644
--- a/altoslib/AltosLog.java
+++ b/altoslib/AltosLog.java
@@ -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()) {
diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java
index 43c7088d..9ab80cf5 100644
--- a/altoslib/AltosPreferences.java
+++ b/altoslib/AltosPreferences.java
@@ -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();
diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index 8b3d745a..055cf85f 100644
--- a/altoslib/AltosRecordMM.java
+++ b/altoslib/AltosRecordMM.java
@@ -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;
diff --git a/altoslib/AltosTelemetryRecordMegaData.java b/altoslib/AltosTelemetryRecordMegaData.java
index cc35cd83..8f55d238 100644
--- a/altoslib/AltosTelemetryRecordMegaData.java
+++ b/altoslib/AltosTelemetryRecordMegaData.java
@@ -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;
}
diff --git a/altoslib/AltosTelemetryRecordMegaSensor.java b/altoslib/AltosTelemetryRecordMegaSensor.java
index 85a32d12..93c001de 100644
--- a/altoslib/AltosTelemetryRecordMegaSensor.java
+++ b/altoslib/AltosTelemetryRecordMegaSensor.java
@@ -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;
diff --git a/altosui/AltosBTDevice.java b/altosui/AltosBTDevice.java
index f6926b10..5e353fdd 100644
--- a/altosui/AltosBTDevice.java
+++ b/altosui/AltosBTDevice.java
@@ -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());
}
diff --git a/altosui/AltosBTDeviceIterator.java b/altosui/AltosBTDeviceIterator.java
index 7c360705..58ed86d5 100644
--- a/altosui/AltosBTDeviceIterator.java
+++ b/altosui/AltosBTDeviceIterator.java
@@ -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;
}
diff --git a/altosui/AltosBTKnown.java b/altosui/AltosBTKnown.java
index 021e4d0b..6a8e53cb 100644
--- a/altosui/AltosBTKnown.java
+++ b/altosui/AltosBTKnown.java
@@ -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) {
diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index d2899d65..aeb964bb 100644
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -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();
diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index 4048166c..324a5988 100644
--- a/altosui/AltosConfigTD.java
+++ b/altosui/AltosConfigTD.java
@@ -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"))
diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index d0ed9325..ace245a0 100644
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -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);
diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 4ab73a6d..66991d10 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -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);
diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index eb76243d..44481544 100644
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -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();
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 16:17:46 +0000