projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Simple timeouts don't work with query data
[fw/altos]
/
altosui
/
AltosConfigData.java
diff --git
a/altosui/AltosConfigData.java
b/altosui/AltosConfigData.java
index 8c32ed86cfd2d4cb699ccde4998c486ce02e3788..1d50ade9aeaa0a2c3ec48327537b8a3c86fb20fd 100644
(file)
--- a/
altosui/AltosConfigData.java
+++ b/
altosui/AltosConfigData.java
@@
-51,6
+51,7
@@
public class AltosConfigData implements Iterable<String> {
int accel_cal_plus, accel_cal_minus;
int radio_calibration;
int flight_log_max;
int accel_cal_plus, accel_cal_minus;
int radio_calibration;
int flight_log_max;
+ int ignite_mode;
static String get_string(String line, String label) throws ParseException {
static String get_string(String line, String label) throws ParseException {
@@
-84,7
+85,7
@@
public class AltosConfigData implements Iterable<String> {
serial_line.printf("c s\nv\n");
lines = new LinkedList<String>();
for (;;) {
serial_line.printf("c s\nv\n");
lines = new LinkedList<String>();
for (;;) {
- String line = serial_line.get_reply(5000);
+ String line = serial_line.get_reply
_no_dialog
(5000);
if (line == null)
throw new TimeoutException();
if (line.contains("Syntax error"))
if (line == null)
throw new TimeoutException();
if (line.contains("Syntax error"))
@@
-94,8
+95,18
@@
public class AltosConfigData implements Iterable<String> {
try { main_deploy = get_int(line, "Main deploy:"); } catch (Exception e) {}
try { apogee_delay = get_int(line, "Apogee delay:"); } catch (Exception e) {}
try { radio_channel = get_int(line, "Radio channel:"); } catch (Exception e) {}
try { main_deploy = get_int(line, "Main deploy:"); } catch (Exception e) {}
try { apogee_delay = get_int(line, "Apogee delay:"); } catch (Exception e) {}
try { radio_channel = get_int(line, "Radio channel:"); } catch (Exception e) {}
+ try {
+ if (line.startsWith("Accel cal")) {
+ String[] bits = line.split("\\s+");
+ if (bits.length >= 6) {
+ accel_cal_plus = Integer.parseInt(bits[3]);
+ accel_cal_minus = Integer.parseInt(bits[5]);
+ }
+ }
+ } catch (Exception e) {}
try { radio_calibration = get_int(line, "Radio cal:"); } catch (Exception e) {}
try { flight_log_max = get_int(line, "Max flight log:"); } catch (Exception e) {}
try { radio_calibration = get_int(line, "Radio cal:"); } catch (Exception e) {}
try { flight_log_max = get_int(line, "Max flight log:"); } catch (Exception e) {}
+ try { ignite_mode = get_int(line, "Ignite mode:"); } catch (Exception e) {}
try { callsign = get_string(line, "Callsign:"); } catch (Exception e) {}
try { version = get_string(line,"software-version"); } catch (Exception e) {}
try { product = get_string(line,"product"); } catch (Exception e) {}
try { callsign = get_string(line, "Callsign:"); } catch (Exception e) {}
try { version = get_string(line,"software-version"); } catch (Exception e) {}
try { product = get_string(line,"product"); } catch (Exception e) {}