projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add site map tab, at least for QRS launches
[fw/altos]
/
ao-tools
/
altosui
/
AltosEepromDownload.java
diff --git
a/ao-tools/altosui/AltosEepromDownload.java
b/ao-tools/altosui/AltosEepromDownload.java
index 02a71118c331e72c0af2fb4d6d76d6b043defe49..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,10
+224,10
@@
public class AltosEepromDownload implements Runnable {
public void run () {
if (remote) {
public void run () {
if (remote) {
- serial_line.printf("m 0\n");
- serial_line.set_channel(AltosPreferences.channel());
+ serial_line.set_channel(AltosPreferences.channel(device.getSerial()));
serial_line.set_callsign(AltosPreferences.callsign());
serial_line.set_callsign(AltosPreferences.callsign());
- serial_line.printf("p\n");
+ serial_line.printf("p\nE 0\n");
+ serial_line.flush_input();
}
monitor = new AltosEepromMonitor(frame, Altos.ao_flight_boost, Altos.ao_flight_landed);
}
monitor = new AltosEepromMonitor(frame, Altos.ao_flight_boost, Altos.ao_flight_landed);
@@
-247,12
+248,13
@@
public class AltosEepromDownload implements Runnable {
if (remote)
serial_line.printf("~");
monitor.done();
if (remote)
serial_line.printf("~");
monitor.done();
+ serial_line.flush_output();
serial_line.close();
}
public AltosEepromDownload(JFrame given_frame) {
frame = given_frame;
serial_line.close();
}
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;
@@
-260,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();