Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

5 files changed, 11 insertions, 11 deletions

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 1d9af546..ba4fc614 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -285,7 +285,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	class Apogee extends AscentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.apogee_voltage);
-			lights.set(state.apogee_voltage > 3.7);
+ 			lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -297,7 +297,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	class Main extends AscentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.main_voltage);
-			lights.set(state.main_voltage > 3.7);
+			lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 77776ff2..e73d990c 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -323,7 +323,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	class Apogee extends DescentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.apogee_voltage);
-			lights.set(state.apogee_voltage > 3.7);
+			lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -335,7 +335,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	class Main extends DescentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.main_voltage);
-			lights.set(state.main_voltage > 3.7);
+			lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 6da920e2..6a79604e 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -195,13 +195,11 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
-					System.out.printf("Closing idle monitor window\n");
 					try {
 						disconnect();
 					} catch (Exception ex) {
 						System.out.println(Arrays.toString(ex.getStackTrace()));
 					}
-					System.out.printf("hiding\n");
 					setVisible(false);
 					dispose();
 					AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index b35bd23a..06a0f1ef 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -180,7 +180,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.battery_voltage);
-				lights.set(state.battery_voltage > 3.7);
+				lights.set(state.battery_voltage >= AltosLib.ao_battery_good);
 			}
 		}
 		public Battery (GridBagLayout layout, int y) {
@@ -196,7 +196,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.apogee_voltage);
-				lights.set(state.apogee_voltage > 3.7);
+				lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Apogee (GridBagLayout layout, int y) {
@@ -212,7 +212,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.main_voltage);
-				lights.set(state.main_voltage > 3.7);
+				lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Main (GridBagLayout layout, int y) {
@@ -287,7 +287,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", listener_state.battery);
-				lights.set(listener_state.battery > 3.7);
+				lights.set(listener_state.battery > AltosLib.ao_battery_good);
 			}
 		}
 		public ReceiverBattery (GridBagLayout layout, int y) {
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 0b75a2b1..824ec9e1 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -178,7 +178,7 @@ LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) ReadMe-Mac.rtf
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(DOC) ReadMe-Mac.rtf
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
@@ -329,6 +329,8 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA) Makefile
 	mkdir macosx
 	cp -a AltosUI.app macosx/
 	cp -a ReadMe-Mac.rtf macosx/ReadMe.rtf
+	mkdir -p macosx/Doc
+	cp -a $(DOC) macosx/Doc
 	cp -p Info.plist macosx/AltosUI.app/Contents
 	mkdir -p macosx/AltOS-$(VERSION) macosx/AltosUI.app/Contents/Resources/Java
 	cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar