X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosAscent.java;h=f6ccbf0c0713426fc8f59fe4dbe9d76609182b33;hp=e90e0e232003c99548bbaf7c5d84a2a7b6dab0f8;hb=f0216d721ed13f4d3dc608bb6ad8f83732b27c0a;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index e90e0e23..f6ccbf0c 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -42,13 +43,13 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			label.setVisible(false);
 		}
 
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void show(String s) {
 			show();
 			value.setText(s);
 		}
-		
+
 		void show(AltosUnits units, double v) {
 			show(units.show(8, v));
 		}
@@ -107,7 +108,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	public class AscentValue {
 		JLabel		label;
 		JTextField	value;
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
@@ -122,7 +123,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 			show();
 			value.setText(s);
 		}
-		
+
 		void show(AltosUnits units, double v) {
 			show(units.show(8, v));
 		}
@@ -174,12 +175,12 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		JTextField	max_value;
 		double		max;
 
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
 			max_value.setText("");
-			max = AltosRecord.MISSING;
+			max = AltosLib.MISSING;
 		}
 
 		void set_font() {
@@ -189,17 +190,24 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		}
 
 		void show(AltosUnits units, double v) {
-			if (v == AltosRecord.MISSING) {
+			if (v == AltosLib.MISSING) {
 				value.setText("Missing");
 				max_value.setText("Missing");
 			} else {
 				value.setText(units.show(8, v));
-				if (v > max || max == AltosRecord.MISSING) {
+				if (v > max || max == AltosLib.MISSING) {
 					max_value.setText(units.show(8, v));
 					max = v;
 				}
 			}
 		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+			max_value.setVisible(false);
+		}
+
 		public AscentValueHold (GridBagLayout layout, int y, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.weighty = 1;
@@ -239,8 +247,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 
 	class Height extends AscentValueHold {
-		void show (AltosState state, int crc_errors) {
-			show(AltosConvert.height, state.height);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.height, state.height());
 		}
 		public Height (GridBagLayout layout, int y) {
 			super (layout, y, "Height");
@@ -250,11 +258,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Height	height;
 
 	class Speed extends AscentValueHold {
-		void show (AltosState state, int crc_errors) {
-			double speed = state.accel_speed;
-			if (!state.ascent)
-				speed = state.baro_speed;
-			show(AltosConvert.speed, speed);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.speed, state.speed());
 		}
 		public Speed (GridBagLayout layout, int y) {
 			super (layout, y, "Speed");
@@ -264,8 +269,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Speed	speed;
 
 	class Accel extends AscentValueHold {
-		void show (AltosState state, int crc_errors) {
-			show(AltosConvert.accel, state.acceleration);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.accel, state.acceleration());
 		}
 		public Accel (GridBagLayout layout, int y) {
 			super (layout, y, "Acceleration");
@@ -274,6 +279,17 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
 	Accel	accel;
 
+	class Orient extends AscentValueHold {
+		void show (AltosState state, AltosListenerState listener_state) {
+			show(AltosConvert.orient, state.orient());
+		}
+		public Orient (GridBagLayout layout, int y) {
+			super (layout, y, "Tilt Angle");
+		}
+	}
+
+	Orient	orient;
+
 	String pos(double p, String pos, String neg) {
 		String	h = pos;
 		if (p < 0) {
@@ -286,9 +302,9 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	}
 
 	class Apogee extends AscentStatus {
-		void show (AltosState state, int crc_errors) {
-			show("%4.2f V", state.drogue_sense);
-			lights.set(state.drogue_sense > 3.2);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show("%4.2f V", state.apogee_voltage);
+ 			lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -298,9 +314,9 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Apogee apogee;
 
 	class Main extends AscentStatus {
-		void show (AltosState state, int crc_errors) {
-			show("%4.2f V", state.main_sense);
-			lights.set(state.main_sense > 3.2);
+		void show (AltosState state, AltosListenerState listener_state) {
+			show("%4.2f V", state.main_voltage);
+			lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
@@ -310,8 +326,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Main main;
 
 	class Lat extends AscentValue {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state.gps != null && state.gps.connected && state.gps.lat != AltosLib.MISSING)
 				show(pos(state.gps.lat,"N", "S"));
 			else
 				show("???");
@@ -324,8 +340,8 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	Lat lat;
 
 	class Lon extends AscentValue {
-		void show (AltosState state, int crc_errors) {
-			if (state.gps != null)
+		void show (AltosState state, AltosListenerState listener_state) {
+			if (state.gps != null && state.gps.connected && state.gps.lon != AltosLib.MISSING)
 				show(pos(state.gps.lon,"E", "W"));
 			else
 				show("???");
@@ -345,6 +361,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		height.reset();
 		speed.reset();
 		accel.reset();
+		orient.reset();
 	}
 
 	public void set_font() {
@@ -357,27 +374,32 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		height.set_font();
 		speed.set_font();
 		accel.set_font();
+		orient.set_font();
 	}
 
-	public void show(AltosState state, int crc_errors) {
+	public void show(AltosState state, AltosListenerState listener_state) {
 		if (state.gps != null && state.gps.connected) {
-			lat.show(state, crc_errors);
-			lon.show(state, crc_errors);
+			lat.show(state, listener_state);
+			lon.show(state, listener_state);
 		} else {
 			lat.hide();
 			lon.hide();
 		}
-		height.show(state, crc_errors);
-		if (state.main_sense != AltosRecord.MISSING)
-			main.show(state, crc_errors);
+		height.show(state, listener_state);
+		if (state.main_voltage != AltosLib.MISSING)
+			main.show(state, listener_state);
 		else
 			main.hide();
-		if (state.drogue_sense != AltosRecord.MISSING)
-			apogee.show(state, crc_errors);
+		if (state.apogee_voltage != AltosLib.MISSING)
+			apogee.show(state, listener_state);
 		else
 			apogee.hide();
-		speed.show(state, crc_errors);
-		accel.show(state, crc_errors);
+		speed.show(state, listener_state);
+		accel.show(state, listener_state);
+		if (state.orient() != AltosLib.MISSING)
+			orient.show(state, listener_state);
+		else
+			orient.hide();
 	}
 
 	public void labels(GridBagLayout layout, int y) {
@@ -398,6 +420,10 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		add(max);
 	}
 
+	public String getName() {
+		return "Ascent";
+	}
+
 	public AltosAscent() {
 		layout = new GridBagLayout();
 
@@ -409,13 +435,15 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 		 * lon
 		 * height
 		 */
-		labels(layout, 0);
-		height = new Height(layout, 1);
-		speed = new Speed(layout, 2);
-		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);
+		int y = 0;
+		labels(layout, y++);
+		height = new Height(layout, y++);
+		speed = new Speed(layout, y++);
+		accel = new Accel(layout, y++);
+		orient = new Orient(layout, y++);
+		lat = new Lat(layout, y++);
+		lon = new Lon(layout, y++);
+		apogee = new Apogee(layout, y++);
+		main = new Main(layout, y++);
 	}
 }