projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: Add ao-elftohex and .ihx symbol support
[fw/altos]
/
altosui
/
AltosAscent.java
diff --git
a/altosui/AltosAscent.java
b/altosui/AltosAscent.java
index 4da4d591d70edaf06a2921a734cb9af616d8b40f..1d9af54679d4f637a82aadb7d32306eed069337d 100644
(file)
--- a/
altosui/AltosAscent.java
+++ b/
altosui/AltosAscent.java
@@
-19,7
+19,7
@@
package altosui;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
public class AltosAscent extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosAscent extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-179,7
+179,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
void reset() {
value.setText("");
max_value.setText("");
void reset() {
value.setText("");
max_value.setText("");
- max = Altos
Record
.MISSING;
+ max = Altos
Lib
.MISSING;
}
void set_font() {
}
void set_font() {
@@
-189,12
+189,12
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
}
void show(AltosUnits units, double v) {
}
void show(AltosUnits units, double v) {
- if (v == Altos
Record
.MISSING) {
+ if (v == Altos
Lib
.MISSING) {
value.setText("Missing");
max_value.setText("Missing");
} else {
value.setText(units.show(8, v));
value.setText("Missing");
max_value.setText("Missing");
} else {
value.setText(units.show(8, v));
- if (v > max || max == Altos
Record
.MISSING) {
+ if (v > max || max == Altos
Lib
.MISSING) {
max_value.setText(units.show(8, v));
max = v;
}
max_value.setText(units.show(8, v));
max = v;
}
@@
-240,7
+240,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Height extends AscentValueHold {
void show (AltosState state, AltosListenerState listener_state) {
class Height extends AscentValueHold {
void show (AltosState state, AltosListenerState listener_state) {
- show(AltosConvert.height, state.height);
+ show(AltosConvert.height, state.height
()
);
}
public Height (GridBagLayout layout, int y) {
super (layout, y, "Height");
}
public Height (GridBagLayout layout, int y) {
super (layout, y, "Height");
@@
-251,10
+251,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Speed extends AscentValueHold {
void show (AltosState state, AltosListenerState listener_state) {
class Speed extends AscentValueHold {
void show (AltosState state, AltosListenerState listener_state) {
- double speed = state.accel_speed;
- if (!state.ascent)
- speed = state.baro_speed;
- show(AltosConvert.speed, speed);
+ show(AltosConvert.speed, state.speed());
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Speed");
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Speed");
@@
-265,7
+262,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Accel extends AscentValueHold {
void show (AltosState state, AltosListenerState listener_state) {
class Accel extends AscentValueHold {
void show (AltosState state, AltosListenerState listener_state) {
- show(AltosConvert.accel, state.acceleration);
+ show(AltosConvert.accel, state.acceleration
()
);
}
public Accel (GridBagLayout layout, int y) {
super (layout, y, "Acceleration");
}
public Accel (GridBagLayout layout, int y) {
super (layout, y, "Acceleration");
@@
-287,8
+284,8
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Apogee extends AscentStatus {
void show (AltosState state, AltosListenerState listener_state) {
class Apogee extends AscentStatus {
void show (AltosState state, AltosListenerState listener_state) {
- show("%4.2f V", state.
drogue_sens
e);
- lights.set(state.
drogue_sense > 3.2
);
+ show("%4.2f V", state.
apogee_voltag
e);
+ lights.set(state.
apogee_voltage > 3.7
);
}
public Apogee (GridBagLayout layout, int y) {
super(layout, y, "Apogee Igniter Voltage");
}
public Apogee (GridBagLayout layout, int y) {
super(layout, y, "Apogee Igniter Voltage");
@@
-299,8
+296,8
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Main extends AscentStatus {
void show (AltosState state, AltosListenerState listener_state) {
class Main extends AscentStatus {
void show (AltosState state, AltosListenerState listener_state) {
- show("%4.2f V", state.main_
sens
e);
- lights.set(state.main_
sense > 3.2
);
+ show("%4.2f V", state.main_
voltag
e);
+ lights.set(state.main_
voltage > 3.7
);
}
public Main (GridBagLayout layout, int y) {
super(layout, y, "Main Igniter Voltage");
}
public Main (GridBagLayout layout, int y) {
super(layout, y, "Main Igniter Voltage");
@@
-311,7
+308,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Lat extends AscentValue {
void show (AltosState state, AltosListenerState listener_state) {
class Lat extends AscentValue {
void show (AltosState state, AltosListenerState listener_state) {
- if (state.gps != null)
+ if (state.gps != null
&& state.gps.connected && state.gps.lat != AltosLib.MISSING
)
show(pos(state.gps.lat,"N", "S"));
else
show("???");
show(pos(state.gps.lat,"N", "S"));
else
show("???");
@@
-325,7
+322,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Lon extends AscentValue {
void show (AltosState state, AltosListenerState listener_state) {
class Lon extends AscentValue {
void show (AltosState state, AltosListenerState listener_state) {
- if (state.gps != null)
+ if (state.gps != null
&& state.gps.connected && state.gps.lon != AltosLib.MISSING
)
show(pos(state.gps.lon,"E", "W"));
else
show("???");
show(pos(state.gps.lon,"E", "W"));
else
show("???");
@@
-368,11
+365,11
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
lon.hide();
}
height.show(state, listener_state);
lon.hide();
}
height.show(state, listener_state);
- if (state.main_
sense != AltosRecord
.MISSING)
+ if (state.main_
voltage != AltosLib
.MISSING)
main.show(state, listener_state);
else
main.hide();
main.show(state, listener_state);
else
main.hide();
- if (state.
drogue_sense != AltosRecord
.MISSING)
+ if (state.
apogee_voltage != AltosLib
.MISSING)
apogee.show(state, listener_state);
else
apogee.hide();
apogee.show(state, listener_state);
else
apogee.hide();