projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update configure.ac for 1.9.6 release
[fw/altos]
/
altoslib
/
AltosLog.java
diff --git
a/altoslib/AltosLog.java
b/altoslib/AltosLog.java
index 015d9f65aa13ad28ef3aadef04bcf044becabf12..7065614b21c50f52a5f59eca71dc691084282c03 100644
(file)
--- a/
altoslib/AltosLog.java
+++ b/
altoslib/AltosLog.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
2
;
+package org.altusmetrum.altoslib_
14
;
import java.io.*;
import java.text.*;
import java.io.*;
import java.text.*;
@@
-48,6
+49,7
@@
public class AltosLog implements Runnable {
}
public void close() {
}
public void close() {
+ link.remove_monitor(input_queue);
close_log_file();
if (log_thread != null) {
log_thread.interrupt();
close_log_file();
if (log_thread != null) {
log_thread.interrupt();
@@
-59,45
+61,50
@@
public class AltosLog implements Runnable {
return file;
}
return file;
}
- boolean open (Altos
State state) throws IO
Exception {
- AltosFile a = new AltosFile(
state
);
+ boolean open (Altos
CalData cal_data) throws IOException, Interrupted
Exception {
+ AltosFile a = new AltosFile(
cal_data
);
log_file = new FileWriter(a, true);
if (log_file != null) {
while (!pending_queue.isEmpty()) {
log_file = new FileWriter(a, true);
if (log_file != null) {
while (!pending_queue.isEmpty()) {
- try {
- String s = pending_queue.take();
- log_file.write(s);
- log_file.write('\n');
- } catch (InterruptedException ie) {
- }
+ String s = pending_queue.take();
+ log_file.write(s);
+ log_file.write('\n');
}
log_file.flush();
file = a;
}
log_file.flush();
file = a;
+ AltosPreferences.set_logfile(link.serial, file);
}
return log_file != null;
}
public void run () {
try {
}
return log_file != null;
}
public void run () {
try {
- AltosState state = new AltosState();
AltosConfigData receiver_config = link.config_data();
AltosConfigData receiver_config = link.config_data();
- state.set_receiver_serial(receiver_config.serial);
+ AltosCalData cal_data = new AltosCalData();
+ AltosState state = null;
+ cal_data.set_receiver_serial(receiver_config.serial);
for (;;) {
AltosLine line = input_queue.take();
if (line.line == null)
continue;
try {
AltosTelemetry telem = AltosTelemetry.parse(line.line);
for (;;) {
AltosLine line = input_queue.take();
if (line.line == null)
continue;
try {
AltosTelemetry telem = AltosTelemetry.parse(line.line);
- state = state.clone();
- telem.update_state(state);
- if (state.serial != serial || state.flight != flight || log_file == null)
+ if (state == null)
+ state = new AltosState(cal_data);
+ telem.provide_data(state);
+
+ if (cal_data.serial != serial ||
+ cal_data.flight != flight ||
+ log_file == null)
{
close_log_file();
{
close_log_file();
- serial = state.serial;
- flight = state.flight;
- if (state.serial != AltosLib.MISSING && state.flight != AltosLib.MISSING)
- open(state);
+ serial = cal_data.serial;
+ flight = cal_data.flight;
+ state = null;
+ if (cal_data.serial != AltosLib.MISSING &&
+ cal_data.flight != AltosLib.MISSING)
+ open(cal_data);
}
} catch (ParseException pe) {
} catch (AltosCRCException ce) {
}
} catch (ParseException pe) {
} catch (AltosCRCException ce) {