else
info_add_row(0, "Ground state", "wait (%d)",
state.gps_waiting);
- info_add_row(0, "Rocket state", "%s", state.data.state);
+ info_add_row(0, "Rocket state", "%s", state.data.state());
info_add_row(0, "Callsign", "%s", state.data.callsign);
info_add_row(0, "Rocket serial", "%6d", state.data.serial);
info_add_row(0, "Rocket flight", "%6d", state.data.flight);
if (state.gps == null) {
info_add_row(1, "GPS", "not available");
} else {
- if (state.data.gps.gps_locked)
+ if (state.data.gps.locked)
info_add_row(1, "GPS", " locked");
- else if (state.data.gps.gps_connected)
+ else if (state.data.gps.connected)
info_add_row(1, "GPS", " unlocked");
else
info_add_row(1, "GPS", " missing");
private void tell(AltosState state, AltosState old_state) {
if (old_state == null || old_state.state != state.state) {
- voice.speak(state.data.state);
+ voice.speak(state.data.state());
if ((old_state == null || old_state.state <= Altos.ao_flight_boost) &&
state.state > Altos.ao_flight_boost) {
voice.speak("max speed: %d meters per second.",
}
}
- class TelemetryThread extends DisplayThread {
-
- String readline() throws InterruptedException { return null; }
-
- AltosRecord read() throws InterruptedException, ParseException {
- return new AltosTelemetry(readline());
- }
- }
-
- class DeviceThread extends TelemetryThread {
+ class DeviceThread extends DisplayThread {
AltosSerial serial;
LinkedBlockingQueue<String> telem;
- String readline() throws InterruptedException {
- return telem.take();
+ AltosRecord read() throws InterruptedException, ParseException {
+ return new AltosTelemetry(telem.take());
}
void close() {
}
private void ConnectToDevice() {
- altos_device device = AltosDeviceDialog.show(AltosUI.this, "TeleDongle");
+ AltosDevice device = AltosDeviceDialog.show(AltosUI.this, AltosDevice.BaseStation);
if (device != null) {
try {
* Open an existing telemetry file and replay it in realtime
*/
- class ReplayTelemetryThread extends TelemetryThread {
- FileInputStream replay;
-
- ReplayTelemetryThread(FileInputStream in, String in_name) {
- replay = in;
- name = in_name;
- }
+ class ReplayThread extends DisplayThread {
+ AltosReader reader;
+ String name;
- String readline() {
+ public AltosRecord read() {
try {
- String line = AltosRecord.gets(replay);
- System.out.printf("telemetry line %s\n", line);
- return line;
- } catch (IOException ee) {
+ return reader.read();
+ } catch (IOException ie) {
JOptionPane.showMessageDialog(AltosUI.this,
name,
"error reading",
JOptionPane.ERROR_MESSAGE);
+ } catch (ParseException pe) {
}
return null;
}
- void close () {
- try {
- replay.close();
- } catch (IOException ee) {
- }
+ public void close () {
report();
}
+ public ReplayThread(AltosReader in_reader, String in_name) {
+ reader = in_reader;
+ }
void update(AltosState state) throws InterruptedException {
/* Make it run in realtime after the rocket leaves the pad */
if (state.state > Altos.ao_flight_pad)
}
}
- class ReplayEepromThread extends DisplayThread {
- FileInputStream replay;
-
- AltosRecord read () {
- return null;
+ class ReplayTelemetryThread extends ReplayThread {
+ ReplayTelemetryThread(FileInputStream in, String in_name) {
+ super(new AltosTelemetryReader(in), in_name);
}
- void close () {
- try {
- replay.close();
- } catch (IOException ee) {
- }
- report();
- }
+ }
+ class ReplayEepromThread extends ReplayThread {
ReplayEepromThread(FileInputStream in, String in_name) {
- replay = in;
- name = in_name;
+ super(new AltosEepromReader(in), in_name);
}
}