Cut over commander app to new build system

makefiles/config_px4fmu_default.mk

@@ -17,6 +17,11 @@ MODULES		+= drivers/l3gd20
 MODULES		+= drivers/ardrone_interface
 MODULES		+= systemcmds/eeprom
 
+#
+# General system control
+#
+MODULES		+= modules/commander
+
 #
 # Estimation modules (EKF / other filters)
 #
@@ -41,7 +46,6 @@ BUILTIN_COMMANDS := \
 	$(call _B, blinkm,                 ,                          2048,  blinkm_main                ) \
 	$(call _B, bma180,                 ,                          2048,  bma180_main                ) \
 	$(call _B, boardinfo,              ,                          2048,  boardinfo_main             ) \
-	$(call _B, commander,              SCHED_PRIORITY_MAX-30,     2048,  commander_main             ) \
 	$(call _B, control_demo,           ,                          2048,  control_demo_main          ) \
 	$(call _B, delay_test,             ,                          2048,  delay_test_main            ) \
 	$(call _B, fixedwing_att_control,  SCHED_PRIORITY_MAX-30,     2048,  fixedwing_att_control_main ) \

makefiles/config_px4fmuv2_default.mk

@@ -17,6 +17,11 @@ MODULES		+= drivers/px4fmu
 MODULES		+= drivers/rgbled
 MODULES		+= systemcmds/ramtron
 
+#
+# General system control
+#
+MODULES		+= modules/commander
+
 #
 # Estimation modules (EKF / other filters)
 #

src/modules/commander/module.mk

@@ -1,6 +1,6 @@
 ############################################################################
 #
-#   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+#   Copyright (C) 2012-2013 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -32,14 +32,10 @@
 ############################################################################
 
 #
-# Commander application
+# Main system state machine
 #
 
-APPNAME		 = commander
+MODULE_COMMAND	 = commander
-PRIORITY	 = SCHED_PRIORITY_MAX - 30
+SRCS		 = commander.c \
-STACKSIZE	 = 2048
+			   state_machine_helper.c \
-
+			   calibration_routines.c
-INCLUDES	= $(TOPDIR)/../mavlink/include/mavlink
-
-include $(APPDIR)/mk/app.mk
-