projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Merge gps date and time classes into gps class
[fw/altos]
/
ao-tools
/
altosui
/
AltosUI.java
diff --git
a/ao-tools/altosui/AltosUI.java
b/ao-tools/altosui/AltosUI.java
index 4994f093dcbfed6eb80e7c9534a2715fea65843a..fa5a9ade54f9f5806de9cdc3b0cf96d284425e55 100644
(file)
--- a/
ao-tools/altosui/AltosUI.java
+++ b/
ao-tools/altosui/AltosUI.java
@@
-28,6
+28,7
@@
import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
+import altosui.Altos;
import altosui.AltosSerial;
import altosui.AltosSerialMonitor;
import altosui.AltosTelemetry;
import altosui.AltosSerial;
import altosui.AltosSerialMonitor;
import altosui.AltosTelemetry;
@@
-309,13
+310,13
@@
public class AltosUI extends JFrame {
info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
}
info_add_row(1, "GPS date", "%04d-%02d-%02d",
info_add_row(1, "Pad GPS alt", "%6.0f m", state.pad_alt);
}
info_add_row(1, "GPS date", "%04d-%02d-%02d",
- state.gps.
gps_time.
year,
- state.gps.
gps_time.
month,
- state.gps.
gps_time.
day);
+ state.gps.year,
+ state.gps.month,
+ state.gps.day);
info_add_row(1, "GPS time", " %02d:%02d:%02d",
info_add_row(1, "GPS time", " %02d:%02d:%02d",
- state.gps.
gps_time.
hour,
- state.gps.
gps_time.
minute,
- state.gps.
gps_time.
second);
+ state.gps.hour,
+ state.gps.minute,
+ state.gps.second);
int nsat_vis = 0;
int c;
int nsat_vis = 0;
int c;
@@
-344,7
+345,7
@@
public class AltosUI extends JFrame {
return;
/* reset the landing count once we hear about a new flight */
return;
/* reset the landing count once we hear about a new flight */
- if (state.state < Altos
Telemetry
.ao_flight_drogue)
+ if (state.state < Altos.ao_flight_drogue)
reported_landing = 0;
/* Shut up once the rocket is on the ground */
reported_landing = 0;
/* Shut up once the rocket is on the ground */
@@
-353,7
+354,7
@@
public class AltosUI extends JFrame {
}
/* If the rocket isn't on the pad, then report height */
}
/* If the rocket isn't on the pad, then report height */
- if (state.state > Altos
Telemetry
.ao_flight_pad) {
+ if (state.state > Altos.ao_flight_pad) {
voice.speak("%d meters", (int) (state.height + 0.5));
} else {
reported_landing = 0;
voice.speak("%d meters", (int) (state.height + 0.5));
} else {
reported_landing = 0;
@@
-366,7
+367,7
@@
public class AltosUI extends JFrame {
if (!state.ascent &&
(last ||
System.currentTimeMillis() - state.report_time >= 15000 ||
if (!state.ascent &&
(last ||
System.currentTimeMillis() - state.report_time >= 15000 ||
- state.state == Altos
Telemetry
.ao_flight_landed))
+ state.state == Altos.ao_flight_landed))
{
if (Math.abs(state.baro_speed) < 20 && state.height < 100)
voice.speak("rocket landed safely");
{
if (Math.abs(state.baro_speed) < 20 && state.height < 100)
voice.speak("rocket landed safely");
@@
-401,12
+402,12
@@
public class AltosUI extends JFrame {
private void tell(AltosState state, AltosState old_state) {
if (old_state == null || old_state.state != state.state) {
voice.speak(state.data.state);
private void tell(AltosState state, AltosState old_state) {
if (old_state == null || old_state.state != state.state) {
voice.speak(state.data.state);
- if ((old_state == null || old_state.state <= Altos
Telemetry
.ao_flight_boost) &&
- state.state > Altos
Telemetry
.ao_flight_boost) {
+ 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.",
(int) (state.max_speed + 0.5));
voice.speak("max speed: %d meters per second.",
(int) (state.max_speed + 0.5));
- } else if ((old_state == null || old_state.state < Altos
Telemetry
.ao_flight_drogue) &&
- state.state >= Altos
Telemetry
.ao_flight_drogue) {
+ } else if ((old_state == null || old_state.state < Altos.ao_flight_drogue) &&
+ state.state >= Altos.ao_flight_drogue) {
voice.speak("max height: %d meters.",
(int) (state.max_height + 0.5));
}
voice.speak("max height: %d meters.",
(int) (state.max_height + 0.5));
}
@@
-617,7
+618,7
@@
public class AltosUI extends JFrame {
* a TeleDongle over the packet link
*/
private void SaveFlightData() {
* a TeleDongle over the packet link
*/
private void SaveFlightData() {
- new AltosEeprom(AltosUI.this);
+ new AltosEeprom
Download
(AltosUI.this);
}
/* Create the AltosUI menus
}
/* Create the AltosUI menus