X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_flight.c;h=88dc816d25578858aa2c3e8c672cb414b0eb418e;hp=fc018f009cdf62a0d018e5d3a00d3efc3f9ea754;hb=4254de22864de2ed7ae5928c6b8bfd9df1c8a3fb;hpb=d90587535676f9492f0fde6b974353158104ef88

diff --git a/src/core/ao_flight.c b/src/core/ao_flight.c
index fc018f00..88dc816d 100644
--- a/src/core/ao_flight.c
+++ b/src/core/ao_flight.c
@@ -40,9 +40,7 @@
 
 __pdata enum ao_flight_state	ao_flight_state;	/* current flight state */
 __pdata uint16_t		ao_boost_tick;		/* time of launch detect */
-#if AO_PYRO_NUM
 __pdata uint16_t		ao_motor_number;	/* number of motors burned so far */
-#endif
 
 /*
  * track min/max data over a long interval to detect
@@ -96,7 +94,9 @@ ao_flight(void)
 			if (ao_config.accel_plus_g == 0 ||
 			    ao_config.accel_minus_g == 0 ||
 			    ao_ground_accel < ao_config.accel_plus_g - ACCEL_NOSE_UP ||
-			    ao_ground_accel > ao_config.accel_minus_g + ACCEL_NOSE_UP)
+			    ao_ground_accel > ao_config.accel_minus_g + ACCEL_NOSE_UP ||
+			    ao_ground_height < -1000 ||
+			    ao_ground_height > 7000)
 			{
 				/* Detected an accel value outside -1.5g to 1.5g
 				 * (or uncalibrated values), so we go into invalid mode
@@ -117,14 +117,14 @@ ao_flight(void)
  			{
 				/* Set pad mode - we can fly! */
 				ao_flight_state = ao_flight_pad;
-#if HAS_USB && HAS_RADIO && !HAS_FLIGHT_DEBUG
+#if HAS_USB && !HAS_FLIGHT_DEBUG && !HAS_SAMPLE_PROFILE
 				/* Disable the USB controller in flight mode
 				 * to save power
 				 */
 				ao_usb_disable();
 #endif
 
-#if !HAS_ACCEL
+#if !HAS_ACCEL && PACKET_HAS_SLAVE
 				/* Disable packet mode in pad state on TeleMini */
 				ao_packet_slave_stop();
 #endif
@@ -134,8 +134,10 @@ ao_flight(void)
 				ao_rdf_set(1);
 				ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD);
 #endif
+#if HAS_LED
 				/* signal successful initialization by turning off the LED */
 				ao_led_off(AO_LED_RED);
+#endif
 			} else {
 				/* Set idle mode */
  				ao_flight_state = ao_flight_idle;
@@ -145,8 +147,10 @@ ao_flight(void)
 				ao_packet_slave_start();
 #endif
 
+#if HAS_LED
 				/* signal successful initialization by turning off the LED */
 				ao_led_off(AO_LED_RED);
+#endif
 			}
 			/* wakeup threads due to state change */
 			ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
@@ -218,9 +222,7 @@ ao_flight(void)
 #else
 				ao_flight_state = ao_flight_coast;
 #endif
-#if AO_PYRO_NUM
 				++ao_motor_number;
-#endif
 				ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
 			}
 			break;