projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add TeleBalloon v1.2 support
[fw/altos]
/
altosui
/
AltosAscent.java
diff --git
a/altosui/AltosAscent.java
b/altosui/AltosAscent.java
index 38b3b30fe8cec9ee6ccd79306b0696fd5add6cc9..3fe517aa6bb08388aeef0874e11ff2577dac8e89 100644
(file)
--- a/
altosui/AltosAscent.java
+++ b/
altosui/AltosAscent.java
@@
-51,6
+51,20
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
}
void show(AltosState state, int crc_errors) {}
}
void show(AltosState state, int crc_errors) {}
+
+ void show(String s) {
+ show();
+ value.setText(s);
+ }
+
+ void show(AltosUnits units, double v) {
+ show(units.show(8, v));
+ }
+
+ void show(String format, double v) {
+ show(String.format(format, v));
+ }
+
void reset() {
value.setText("");
lights.set(false);
void reset() {
value.setText("");
lights.set(false);
@@
-112,6
+126,19
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
value.setVisible(true);
}
value.setVisible(true);
}
+ void show(String s) {
+ show();
+ value.setText(s);
+ }
+
+ void show(AltosUnits units, double v) {
+ show(units.show(8, v));
+ }
+
+ void show(String format, double v) {
+ show(String.format(format, v));
+ }
+
void hide() {
label.setVisible(false);
value.setVisible(false);
void hide() {
label.setVisible(false);
value.setVisible(false);
@@
-169,14
+196,14
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
max_value.setFont(Altos.value_font);
}
max_value.setFont(Altos.value_font);
}
- void show(
String format
, double v) {
+ void show(
AltosUnits units
, double v) {
if (v == AltosRecord.MISSING) {
value.setText("Missing");
max_value.setText("Missing");
} else {
if (v == AltosRecord.MISSING) {
value.setText("Missing");
max_value.setText("Missing");
} else {
- value.setText(
String.format(format
, v));
+ value.setText(
units.show(8
, v));
if (v > max || max == AltosRecord.MISSING) {
if (v > max || max == AltosRecord.MISSING) {
- max_value.setText(
String.format(format
, v));
+ max_value.setText(
units.show(8
, v));
max = v;
}
}
max = v;
}
}
@@
-221,7
+248,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Height extends AscentValueHold {
void show (AltosState state, int crc_errors) {
class Height extends AscentValueHold {
void show (AltosState state, int crc_errors) {
- show(
"%6.0f m"
, 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");
@@
-235,7
+262,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
double speed = state.speed;
if (!state.ascent)
speed = state.baro_speed;
double speed = state.speed;
if (!state.ascent)
speed = state.baro_speed;
- show(
"%6.0f m/s"
, speed);
+ show(
AltosConvert.speed
, speed);
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Speed");
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Speed");
@@
-246,7
+273,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Accel extends AscentValueHold {
void show (AltosState state, int crc_errors) {
class Accel extends AscentValueHold {
void show (AltosState state, int crc_errors) {
- show(
"%6.0f m/s²"
, 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");
@@
-268,8
+295,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Apogee extends AscentStatus {
void show (AltosState state, int crc_errors) {
class Apogee extends AscentStatus {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(String.format("%4.2f V", state.drogue_sense));
+ show("%4.2f V", state.drogue_sense);
lights.set(state.drogue_sense > 3.2);
}
public Apogee (GridBagLayout layout, int y) {
lights.set(state.drogue_sense > 3.2);
}
public Apogee (GridBagLayout layout, int y) {
@@
-281,8
+307,7
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Main extends AscentStatus {
void show (AltosState state, int crc_errors) {
class Main extends AscentStatus {
void show (AltosState state, int crc_errors) {
- show();
- value.setText(String.format("%4.2f V", state.main_sense));
+ show("%4.2f V", state.main_sense);
lights.set(state.main_sense > 3.2);
}
public Main (GridBagLayout layout, int y) {
lights.set(state.main_sense > 3.2);
}
public Main (GridBagLayout layout, int y) {
@@
-294,11
+319,10
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Lat extends AscentValue {
void show (AltosState state, int crc_errors) {
class Lat extends AscentValue {
void show (AltosState state, int crc_errors) {
- show();
if (state.gps != null)
if (state.gps != null)
-
value.setText
(pos(state.gps.lat,"N", "S"));
+
show
(pos(state.gps.lat,"N", "S"));
else
else
-
value.setText
("???");
+
show
("???");
}
public Lat (GridBagLayout layout, int y) {
super (layout, y, "Latitude");
}
public Lat (GridBagLayout layout, int y) {
super (layout, y, "Latitude");
@@
-309,11
+333,10
@@
public class AltosAscent extends JComponent implements AltosFlightDisplay {
class Lon extends AscentValue {
void show (AltosState state, int crc_errors) {
class Lon extends AscentValue {
void show (AltosState state, int crc_errors) {
- show();
if (state.gps != null)
if (state.gps != null)
-
value.setText
(pos(state.gps.lon,"E", "W"));
+
show
(pos(state.gps.lon,"E", "W"));
else
else
-
value.setText
("???");
+
show
("???");
}
public Lon (GridBagLayout layout, int y) {
super (layout, y, "Longitude");
}
public Lon (GridBagLayout layout, int y) {
super (layout, y, "Longitude");