projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f5b584
)
altosui: Remove a bunch of debug printfs from the eeprom manager code
author
Keith Packard
<keithp@keithp.com>
Sat, 26 Mar 2011 04:29:50 +0000
(21:29 -0700)
committer
Keith Packard
<keithp@keithp.com>
Sat, 26 Mar 2011 04:29:50 +0000
(21:29 -0700)
Just noise on stdout.
Signed-off-by: Keith Packard <keithp@keithp.com>
altosui/AltosEepromDelete.java
patch
|
blob
|
history
altosui/AltosEepromList.java
patch
|
blob
|
history
altosui/AltosEepromLog.java
patch
|
blob
|
history
altosui/AltosEepromManage.java
patch
|
blob
|
history
altosui/AltosEepromSelect.java
patch
|
blob
|
history
diff --git
a/altosui/AltosEepromDelete.java
b/altosui/AltosEepromDelete.java
index c95eda153d5c5edc07eee944b0cd0324a7266d8d..ecd82c187bd2328126cd882706b6c09e39282afa 100644
(file)
--- a/
altosui/AltosEepromDelete.java
+++ b/
altosui/AltosEepromDelete.java
@@
-49,11
+49,9
@@
public class AltosEepromDelete implements Runnable {
*/
serial_line.flush_input();
serial_line.printf("d %d\n", log.flight);
*/
serial_line.flush_input();
serial_line.printf("d %d\n", log.flight);
- System.out.printf("Attempt to delete flight %d\n", log.flight);
for (;;) {
/* It can take a while to erase the flash... */
String line = serial_line.get_reply(20000);
for (;;) {
/* It can take a while to erase the flash... */
String line = serial_line.get_reply(20000);
- System.out.printf("got back line %s\n", line);
if (line == null)
throw new TimeoutException();
if (line.equals("Erased"))
if (line == null)
throw new TimeoutException();
if (line.equals("Erased"))
@@
-96,7
+94,6
@@
public class AltosEepromDelete implements Runnable {
DeleteLog(log);
}
}
DeleteLog(log);
}
}
- System.out.printf("All flights successfully deleted\n");
success = true;
} catch (IOException ee) {
show_error (ee.getLocalizedMessage(),
success = true;
} catch (IOException ee) {
show_error (ee.getLocalizedMessage(),
diff --git
a/altosui/AltosEepromList.java
b/altosui/AltosEepromList.java
index a932dd129760ed1b0ca34e2df7f22c8751ce5357..575c0bc2c3f044977468eab46b579166de1f006c 100644
(file)
--- a/
altosui/AltosEepromList.java
+++ b/
altosui/AltosEepromList.java
@@
-83,7
+83,6
@@
public class AltosEepromList extends ArrayList<AltosEepromLog> {
if (line.contains("Syntax"))
continue;
String[] tokens = line.split("\\s+");
if (line.contains("Syntax"))
continue;
String[] tokens = line.split("\\s+");
- System.out.printf("got line %s (%d tokens)\n", line, tokens.length);
if (tokens.length < 6)
break;
if (tokens.length < 6)
break;
@@
-95,7
+94,6
@@
public class AltosEepromList extends ArrayList<AltosEepromLog> {
start = AltosParse.parse_hex(tokens[3]);
if (tokens[4].equals("end"))
end = AltosParse.parse_hex(tokens[5]);
start = AltosParse.parse_hex(tokens[3]);
if (tokens[4].equals("end"))
end = AltosParse.parse_hex(tokens[5]);
- System.out.printf("parsed flight %d %x %x\n", flight, start, end);
if (flight > 0 && start >= 0 && end > 0)
flights.add(new AltosEepromFlight(flight, start, end));
} catch (ParseException pe) { System.out.printf("Parse error %s\n", pe.toString()); }
if (flight > 0 && start >= 0 && end > 0)
flights.add(new AltosEepromFlight(flight, start, end));
} catch (ParseException pe) { System.out.printf("Parse error %s\n", pe.toString()); }
@@
-115,7
+113,6
@@
public class AltosEepromList extends ArrayList<AltosEepromLog> {
* firmware, this will also extract the flight number.
*/
for (AltosEepromFlight flight : flights) {
* firmware, this will also extract the flight number.
*/
for (AltosEepromFlight flight : flights) {
- System.out.printf("Scanning flight %d %x %x\n", flight.flight, flight.start, flight.end);
add(new AltosEepromLog(serial_line, config_data.serial,
flight.start, flight.end));
}
add(new AltosEepromLog(serial_line, config_data.serial,
flight.start, flight.end));
}
@@
-124,9
+121,5
@@
public class AltosEepromList extends ArrayList<AltosEepromLog> {
serial_line.stop_remote();
serial_line.flush_output();
}
serial_line.stop_remote();
serial_line.flush_output();
}
- for (int i = 0; i < size(); i++) {
- AltosEepromLog l = get(i);
- System.out.printf("Found flight %d at %x - %x\n", l.flight, l.start_block, l.end_block);
- }
}
}
\ No newline at end of file
}
}
\ No newline at end of file
diff --git
a/altosui/AltosEepromLog.java
b/altosui/AltosEepromLog.java
index f284f1038894267fb219880f33b29a2719f32626..10befad49765b3ee61fb92c37a5d9cf6f5987d56 100644
(file)
--- a/
altosui/AltosEepromLog.java
+++ b/
altosui/AltosEepromLog.java
@@
-103,12
+103,5
@@
public class AltosEepromLog {
if (has_gps && has_flight)
break;
}
if (has_gps && has_flight)
break;
}
- System.out.printf("Serial %d start block %d end block %d\n",
- serial, start_block, end_block);
- if (has_flight)
- System.out.printf("Flight %d\n", flight);
- if (has_gps)
- System.out.printf("%d-%d-%d %d:%02d:%02d Lat %f Lon %f\n",
- year, month, day, hour, minute, second, lat, lon);
}
}
}
}
diff --git
a/altosui/AltosEepromManage.java
b/altosui/AltosEepromManage.java
index d10f79549b5bf242bac0fdfed6e13a461a12766e..b12d95fa0c48b5b0064205cbbced922f78a80ef0 100644
(file)
--- a/
altosui/AltosEepromManage.java
+++ b/
altosui/AltosEepromManage.java
@@
-69,7
+69,6
@@
public class AltosEepromManage implements ActionListener {
boolean success = e.getID() != 0;
boolean running = false;
boolean success = e.getID() != 0;
boolean running = false;
- System.out.printf("Eeprom manager action %s %d\n", cmd, e.getID());
if (cmd.equals("download")) {
if (success) {
if (any_delete) {
if (cmd.equals("download")) {
if (success) {
if (any_delete) {
diff --git
a/altosui/AltosEepromSelect.java
b/altosui/AltosEepromSelect.java
index a3069f064292997a4fc953e6c12ccd4bb0c7a659..cb71524d48dad38d04b4d7ef573c6f4c2a6c747b 100644
(file)
--- a/
altosui/AltosEepromSelect.java
+++ b/
altosui/AltosEepromSelect.java
@@
-35,13
+35,10
@@
class AltosEepromItem implements ActionListener {
JCheckBox delete;
public void actionPerformed(ActionEvent e) {
JCheckBox delete;
public void actionPerformed(ActionEvent e) {
- System.out.printf("eeprom item action %s %d\n", e.getActionCommand(), e.getID());
if (e.getSource() == download) {
log.download = download.isSelected();
if (e.getSource() == download) {
log.download = download.isSelected();
- System.out.printf("download for flight %d set to %b\n", log.flight, log.download);
} else if (e.getSource() == delete) {
log.delete = delete.isSelected();
} else if (e.getSource() == delete) {
log.delete = delete.isSelected();
- System.out.printf("delete for flight %d set to %b\n", log.flight, log.delete);
}
}
}
}