diff options
| author | Keith Packard <keithp@keithp.com> | 2011-01-15 22:43:37 -0800 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-01-16 14:19:48 -0800 | 
| commit | deb3c7b9206be0c9c46f75d35c8f766c26d9838f (patch) | |
| tree | aea222b9991c2c15fa325df06bd51435468e5add | |
| parent | eec9eb2e81535e62c52fbb2e57a2d33f88f92c1a (diff) | |
altosui: Reset eeprom download instance variables before reading flight
To deal with downloading multiple flights in a single invocation, make
sure all relevant instance variables are set back to start of flight
download values each time a log is read.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosui/AltosEepromDownload.java | 22 | 
1 files changed, 17 insertions, 5 deletions
| diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java index 5d19acec..af70b15c 100644 --- a/altosui/AltosEepromDownload.java +++ b/altosui/AltosEepromDownload.java @@ -37,11 +37,13 @@ public class AltosEepromDownload implements Runnable {  	boolean			remote;  	Thread			eeprom_thread;  	AltosEepromMonitor	monitor; -	int			flight = 0; -	int			year = 0, month = 0, day = 0; -	boolean			want_file = false; -	FileWriter		eeprom_file = null; -	LinkedList<String>	eeprom_pending = new LinkedList<String>(); + +	int			flight; +	int			year, month, day; +	boolean			want_file; +	FileWriter		eeprom_file; +	LinkedList<String>	eeprom_pending; +  	AltosEepromList		flights;  	ActionListener		listener;  	boolean			success; @@ -84,6 +86,16 @@ public class AltosEepromDownload implements Runnable {  		if (flights.config_data.serial == 0)  			throw new IOException("no serial number found"); +		/* Reset per-capture variables */ +		flight = 0; +		year = 0; +		month = 0; +		day = 0; +		want_file = false; +		eeprom_file = null; +		eeprom_pending = new LinkedList<String>(); + +		/* Set serial number in the monitor dialog window */  		monitor.set_serial(flights.config_data.serial);  		/* Now scan the eeprom, reading blocks of data and converting to .eeprom file form */ | 
