projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Merge GPS logging into a single function
[fw/altos]
/
src
/
core
/
ao_flight.c
diff --git
a/src/core/ao_flight.c
b/src/core/ao_flight.c
index 9d9d4c6e0b3ddea72a724b1b3eacee94dbb9f76c..2495a44bafe85553a3facfcb5eac0839c416b73c 100644
(file)
--- a/
src/core/ao_flight.c
+++ b/
src/core/ao_flight.c
@@
-117,14
+117,14
@@
ao_flight(void)
{
/* Set pad mode - we can fly! */
ao_flight_state = ao_flight_pad;
{
/* Set pad mode - we can fly! */
ao_flight_state = ao_flight_pad;
-#if HAS_USB &&
HAS_RADIO &&
!HAS_FLIGHT_DEBUG && !HAS_SAMPLE_PROFILE
+#if HAS_USB && !HAS_FLIGHT_DEBUG && !HAS_SAMPLE_PROFILE
/* Disable the USB controller in flight mode
* to save power
*/
ao_usb_disable();
#endif
/* 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
/* 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
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);
/* 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;
} else {
/* Set idle mode */
ao_flight_state = ao_flight_idle;
@@
-145,8
+147,10
@@
ao_flight(void)
ao_packet_slave_start();
#endif
ao_packet_slave_start();
#endif
+#if HAS_LED
/* signal successful initialization by turning off the LED */
ao_led_off(AO_LED_RED);
/* 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));
}
/* wakeup threads due to state change */
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
@@
-190,8
+194,8
@@
ao_flight(void)
#if HAS_GPS
/* Record current GPS position by waking up GPS log tasks */
#if HAS_GPS
/* Record current GPS position by waking up GPS log tasks */
- ao_
wakeup(&ao_gps_data)
;
- ao_wakeup(&ao_gps_
tracking_data
);
+ ao_
gps_new = AO_GPS_NEW_DATA | AO_GPS_NEW_TRACKING
;
+ ao_wakeup(&ao_gps_
new
);
#endif
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));
#endif
ao_wakeup(DATA_TO_XDATA(&ao_flight_state));