projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
read preferences for --replay
[fw/altos]
/
ao-tools
/
altosui
/
AltosEepromDownload.java
diff --git
a/ao-tools/altosui/AltosEepromDownload.java
b/ao-tools/altosui/AltosEepromDownload.java
index 5e43345b6197b845262deb994cc435ffd6812d23..8efc94d284db7618db4c538a1c4db37fbbf29a11 100644
(file)
--- a/
ao-tools/altosui/AltosEepromDownload.java
+++ b/
ao-tools/altosui/AltosEepromDownload.java
@@
-142,6
+142,7
@@
public class AltosEepromDownload implements Runnable {
if (values == null) {
System.out.printf("invalid line: %s\n", line);
if (values == null) {
System.out.printf("invalid line: %s\n", line);
+ continue;
} else if (values[0] != addr) {
System.out.printf("data address out of sync at 0x%x\n",
block * 256 + values[0]);
} else if (values[0] != addr) {
System.out.printf("data address out of sync at 0x%x\n",
block * 256 + values[0]);
@@
-223,7
+224,7
@@
public class AltosEepromDownload implements Runnable {
public void run () {
if (remote) {
public void run () {
if (remote) {
- serial_line.set_channel(AltosPreferences.channel());
+ serial_line.set_channel(AltosPreferences.channel(
device.getSerial()
));
serial_line.set_callsign(AltosPreferences.callsign());
serial_line.printf("p\nE 0\n");
serial_line.flush_input();
serial_line.set_callsign(AltosPreferences.callsign());
serial_line.printf("p\nE 0\n");
serial_line.flush_input();
@@
-253,7
+254,7
@@
public class AltosEepromDownload implements Runnable {
public AltosEepromDownload(JFrame given_frame) {
frame = given_frame;
public AltosEepromDownload(JFrame given_frame) {
frame = given_frame;
- device = AltosDeviceDialog.show(frame, AltosDevice.
A
ny);
+ device = AltosDeviceDialog.show(frame, AltosDevice.
product_a
ny);
serial_line = new AltosSerial();
remote = false;
serial_line = new AltosSerial();
remote = false;
@@
-261,7
+262,7
@@
public class AltosEepromDownload implements Runnable {
if (device != null) {
try {
serial_line.open(device);
if (device != null) {
try {
serial_line.open(device);
- if (!device.matchProduct(AltosDevice.
TeleM
etrum))
+ if (!device.matchProduct(AltosDevice.
product_telem
etrum))
remote = true;
eeprom_thread = new Thread(this);
eeprom_thread.start();
remote = true;
eeprom_thread = new Thread(this);
eeprom_thread.start();