Checkpoint: More state machine fixes, commited to wrong branch and now copied over

apps/ardrone_interface/ardrone_interface.c

@@ -331,7 +331,9 @@ int ardrone_interface_thread_main(int argc, char *argv[])
 			/* for now only spin if armed and immediately shut down
 			 * if in failsafe
 			 */
-			if (armed.armed && !armed.lockdown) {
+			//XXX fix this
+			//if (armed.armed && !armed.lockdown) {
+			if (state.flag_fmu_armed) {
 				ardrone_mixing_and_output(ardrone_write, &actuator_controls);
 
 			} else {