projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Document which MPU6000 revs have broken accel values
[fw/altos]
/
altosui
/
AltosFlashUI.java
diff --git
a/altosui/AltosFlashUI.java
b/altosui/AltosFlashUI.java
index 3874b5004995cb0269a612005b2949783f2747de..f26a391614e17275f5451d94517daa661b2019b5 100644
(file)
--- a/
altosui/AltosFlashUI.java
+++ b/
altosui/AltosFlashUI.java
@@
-21,15
+21,12
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
+import org.altusmetrum.altosuilib_1.*;
public class AltosFlashUI
public class AltosFlashUI
- extends
J
Dialog
+ extends
AltosUI
Dialog
implements ActionListener
{
Container pane;
implements ActionListener
{
Container pane;
@@
-161,7
+158,7
@@
public class AltosFlashUI
boolean select_source_file() {
JFileChooser hexfile_chooser = new JFileChooser();
boolean select_source_file() {
JFileChooser hexfile_chooser = new JFileChooser();
- File firmwaredir = AltosPreferences.firmwaredir();
+ File firmwaredir = Altos
UI
Preferences.firmwaredir();
if (firmwaredir != null)
hexfile_chooser.setCurrentDirectory(firmwaredir);
if (firmwaredir != null)
hexfile_chooser.setCurrentDirectory(firmwaredir);
@@
-174,12
+171,12
@@
public class AltosFlashUI
file = hexfile_chooser.getSelectedFile();
if (file == null)
return false;
file = hexfile_chooser.getSelectedFile();
if (file == null)
return false;
- AltosPreferences.set_firmwaredir(file.getParentFile());
+ Altos
UI
Preferences.set_firmwaredir(file.getParentFile());
return true;
}
boolean select_debug_dongle() {
return true;
}
boolean select_debug_dongle() {
- debug_dongle = AltosDeviceDialog.show(frame, Altos.product_any);
+ debug_dongle = AltosDevice
UI
Dialog.show(frame, Altos.product_any);
if (debug_dongle == null)
return false;
if (debug_dongle == null)
return false;
@@
-200,8
+197,8
@@
public class AltosFlashUI
void exception (Exception e) {
if (e instanceof FileNotFoundException) {
JOptionPane.showMessageDialog(frame,
void exception (Exception e) {
if (e instanceof FileNotFoundException) {
JOptionPane.showMessageDialog(frame,
-
"Cannot open image"
,
-
file.toString()
,
+
((FileNotFoundException) e).getMessage()
,
+
"Cannot open file"
,
JOptionPane.ERROR_MESSAGE);
} else if (e instanceof AltosSerialInUseException) {
JOptionPane.showMessageDialog(frame,
JOptionPane.ERROR_MESSAGE);
} else if (e instanceof AltosSerialInUseException) {
JOptionPane.showMessageDialog(frame,
@@
-234,30
+231,40
@@
public class AltosFlashUI
public void run() {
ui.flash = flash;
ui.update_rom_config_info(current_config);
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();
}
});
await_rom_config.release();
}
});
- System.out.printf("Waiting for rom configuration updates\n");
await_rom_config.acquire();
await_rom_config.acquire();
- System.out.printf("Got rom config update\n");
if (ui.rom_config != null) {
if (ui.rom_config != null) {
- System.out.printf("rom_config not null\n");
flash.set_romconfig(ui.rom_config);
flash.flash();
}
flash.set_romconfig(ui.rom_config);
flash.flash();
}
- } catch (Exception ee) {
+ } catch (InterruptedException ee) {
+ final Exception e = ee;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ ui.exception(e);
+ }
+ });
+ } catch (IOException ee) {
final Exception e = ee;
final Exception e = ee;
- System.out.printf("exception %s\n", e.toString());
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
}
});
SwingUtilities.invokeLater(new Runnable() {
public void run() {
ui.exception(e);
}
});
+ } catch (AltosSerialInUseException ee) {
+ final Exception e = ee;
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ ui.exception(e);
+ }
+ });
+ } finally {
+ if (flash != null)
+ flash.close();
}
}
- if (flash != null)
- flash.close();
}
public flash_task(AltosFlashUI in_ui) {
}
public flash_task(AltosFlashUI in_ui) {