projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ICP3 working
[fw/altos]
/
altosui
/
AltosEepromDownload.java
diff --git
a/altosui/AltosEepromDownload.java
b/altosui/AltosEepromDownload.java
index 080bfc99cfa94c4e248e5c18e86c7b55751a6f95..4a35c2f1c299b8bbb9121d2565fc7284a5e6208c 100644
(file)
--- a/
altosui/AltosEepromDownload.java
+++ b/
altosui/AltosEepromDownload.java
@@
-319,11
+319,9
@@
public class AltosEepromDownload implements Runnable {
done = false;
start = true;
done = false;
start = true;
-
//
if (flights.config_data.serial == 0)
-
//
throw new IOException("no serial number found");
+
if (flights.config_data.serial == 0)
+
throw new IOException("no serial number found");
- log_format = 5;
- System.out.printf ("log format: %d\n", log_format);
/* Reset per-capture variables */
flight = 0;
year = 0;
/* Reset per-capture variables */
flight = 0;
year = 0;
@@
-357,23
+355,23
@@
public class AltosEepromDownload implements Runnable {
}
switch (log_format) {
}
switch (log_format) {
- case Altos.AO_LOG_FORMAT_FULL:
+ case Altos
Lib
.AO_LOG_FORMAT_FULL:
extension = "eeprom";
CaptureFull(eechunk);
break;
extension = "eeprom";
CaptureFull(eechunk);
break;
- case Altos.AO_LOG_FORMAT_TINY:
+ case Altos
Lib
.AO_LOG_FORMAT_TINY:
extension = "eeprom";
CaptureTiny(eechunk);
break;
extension = "eeprom";
CaptureTiny(eechunk);
break;
- case Altos.AO_LOG_FORMAT_TELEMETRY:
+ case Altos
Lib
.AO_LOG_FORMAT_TELEMETRY:
extension = "telem";
CaptureTelemetry(eechunk);
break;
extension = "telem";
CaptureTelemetry(eechunk);
break;
- case Altos.AO_LOG_FORMAT_TELESCIENCE:
+ case Altos
Lib
.AO_LOG_FORMAT_TELESCIENCE:
extension = "science";
CaptureTeleScience(eechunk);
break;
extension = "science";
CaptureTeleScience(eechunk);
break;
- case Altos.AO_LOG_FORMAT_MEGAMETRUM:
+ case Altos
Lib
.AO_LOG_FORMAT_MEGAMETRUM:
extension = "mega";
CaptureMega(eechunk);
}
extension = "mega";
CaptureMega(eechunk);
}