X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosAscent.java;h=64bdcf3097cc5eae63ad395e96eded6ef6ad4a9f;hb=84cd5d42d8b5659463544fe2a400758b56478609;hp=8e1b6347d5e7a054154633636da4239317f12fca;hpb=d0eb41619544ead6d9dab3a8d024a12936c9cdd0;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosAscent.java b/ao-tools/altosui/AltosAscent.java
index 8e1b6347..64bdcf30 100644
--- a/ao-tools/altosui/AltosAscent.java
+++ b/ao-tools/altosui/AltosAscent.java
@@ -31,6 +31,54 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
 
+	public class AscentStatus {
+		JLabel		label;
+		JTextField	value;
+		AltosLights	lights;
+
+		void show(AltosState state, int crc_errors) {}
+		void reset() {
+			value.setText("");
+			lights.set(false);
+		}
+
+		public AscentStatus (GridBagLayout layout, int y, String text) {
+			GridBagConstraints	c = new GridBagConstraints();
+			c.weighty = 1;
+
+			lights = new AltosLights();
+			c.gridx = 0; c.gridy = y;
+			c.anchor = GridBagConstraints.CENTER;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
+			layout.setConstraints(lights, c);
+			add(lights);
+
+			label = new JLabel(text);
+			label.setFont(Altos.label_font);
+			label.setHorizontalAlignment(SwingConstants.LEFT);
+			c.gridx = 1; c.gridy = y;
+			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.VERTICAL;
+			c.weightx = 0;
+			layout.setConstraints(label, c);
+			add(label);
+
+			value = new JTextField(Altos.text_width);
+			value.setFont(Altos.value_font);
+			value.setHorizontalAlignment(SwingConstants.RIGHT);
+			c.gridx = 2; c.gridy = y;
+			c.gridwidth = 2;
+			c.anchor = GridBagConstraints.WEST;
+			c.fill = GridBagConstraints.BOTH;
+			c.weightx = 1;
+			layout.setConstraints(value, c);
+			add(value);
+
+		}
+	}
+
 	public class AscentValue {
 		JLabel		label;
 		JTextField	value;
@@ -46,7 +94,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			label = new JLabel(text);
 			label.setFont(Altos.label_font);
 			label.setHorizontalAlignment(SwingConstants.LEFT);
-			c.gridx = 0; c.gridy = y;
+			c.gridx = 1; c.gridy = y;
 			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
 			c.anchor = GridBagConstraints.WEST;
 			c.fill = GridBagConstraints.VERTICAL;
@@ -54,10 +102,10 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			layout.setConstraints(label, c);
 			add(label);
 
-			value = new JTextField(30);
+			value = new JTextField(Altos.text_width);
 			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 1; c.gridy = y;
+			c.gridx = 2; c.gridy = y;
 			c.anchor = GridBagConstraints.WEST;
 			c.fill = GridBagConstraints.BOTH;
 			c.gridwidth = 2;
@@ -95,7 +143,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			label = new JLabel(text);
 			label.setFont(Altos.label_font);
 			label.setHorizontalAlignment(SwingConstants.LEFT);
-			c.gridx = 0; c.gridy = y;
+			c.gridx = 1; c.gridy = y;
 			c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
 			c.anchor = GridBagConstraints.WEST;
 			c.fill = GridBagConstraints.VERTICAL;
@@ -103,20 +151,20 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			layout.setConstraints(label, c);
 			add(label);
 
-			value = new JTextField(15);
+			value = new JTextField(Altos.text_width);
 			value.setFont(Altos.value_font);
 			value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 1; c.gridy = y;
+			c.gridx = 2; c.gridy = y;
 			c.anchor = GridBagConstraints.EAST;
 			c.fill = GridBagConstraints.BOTH;
 			c.weightx = 1;
 			layout.setConstraints(value, c);
 			add(value);
 
-			max_value = new JTextField(15);
+			max_value = new JTextField(Altos.text_width);
 			max_value.setFont(Altos.value_font);
 			max_value.setHorizontalAlignment(SwingConstants.RIGHT);
-			c.gridx = 2; c.gridy = y;
+			c.gridx = 3; c.gridy = y;
 			c.anchor = GridBagConstraints.EAST;
 			c.fill = GridBagConstraints.BOTH;
 			c.weightx = 1;
@@ -173,6 +221,30 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		return String.format("%s %4d° %9.6f", h, deg, min);
 	}
 
+	class Apogee extends AscentStatus {
+		void show (AltosState state, int crc_errors) {
+			value.setText(String.format("%4.2f V", state.drogue_sense));
+			lights.set(state.drogue_sense > 3.2);
+		}
+		public Apogee (GridBagLayout layout, int y) {
+			super(layout, y, "Apogee Igniter Voltage");
+		}
+	}
+
+	Apogee apogee;
+
+	class Main extends AscentStatus {
+		void show (AltosState state, int crc_errors) {
+			value.setText(String.format("%4.2f V", state.main_sense));
+			lights.set(state.main_sense > 3.2);
+		}
+		public Main (GridBagLayout layout, int y) {
+			super(layout, y, "Main Igniter Voltage");
+		}
+	}
+
+	Main main;
+
 	class Lat extends AscentValue {
 		void show (AltosState state, int crc_errors) {
 			if (state.gps != null)
@@ -204,6 +276,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	public void reset() {
 		lat.reset();
 		lon.reset();
+		main.reset();
+		apogee.reset();
 		height.reset();
 		speed.reset();
 		accel.reset();
@@ -213,6 +287,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		lat.show(state, crc_errors);
 		lon.show(state, crc_errors);
 		height.show(state, crc_errors);
+		main.show(state, crc_errors);
+		apogee.show(state, crc_errors);
 		speed.show(state, crc_errors);
 		accel.show(state, crc_errors);
 	}
@@ -224,14 +300,14 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		cur = new JLabel("Current");
 		cur.setFont(Altos.label_font);
 		c = new GridBagConstraints();
-		c.gridx = 1; c.gridy = y;
+		c.gridx = 2; c.gridy = y;
 		c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
 		layout.setConstraints(cur, c);
 		add(cur);
 
 		max = new JLabel("Maximum");
 		max.setFont(Altos.label_font);
-		c.gridx = 2; c.gridy = y;
+		c.gridx = 3; c.gridy = y;
 		layout.setConstraints(max, c);
 		add(max);
 	}
@@ -253,5 +329,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		accel = new Accel(layout, 3);
 		lat = new Lat(layout, 4);
 		lon = new Lon(layout, 5);
+		apogee = new Apogee(layout, 6);
+		main = new Main(layout, 7);
 	}
 }