From fdf853a2fe6c8ef57be2f65a64cdfc86f57b0fc2 Mon Sep 17 00:00:00 2001
From: Brian Webb <webbbn@gmail.com>
Date: Sun, 18 Mar 2012 19:26:18 -0700
Subject: [PATCH] Cleaned up the PipXtreme makefile.

---
 flight/PipXtreme/Makefile | 53 +--------------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/flight/PipXtreme/Makefile b/flight/PipXtreme/Makefile
index 15b3a89f3..28c652168 100755
--- a/flight/PipXtreme/Makefile
+++ b/flight/PipXtreme/Makefile
@@ -52,12 +52,6 @@ USE_GPS ?= NO
 
 USE_I2C ?= YES
 
-# Select the type of hardware you're using
-ENABLE_TRANSMITTER_BOX ?= NO
-ENABLE_ANALOG_TRANSMITTER ?= NO
-ENABLE_MOVE_CONTROLLER ?= NO
-ENABLE_MAPLE_MINI_TRANSMITTER ?= YES
-
 # Set to YES when using Code Sourcery toolchain
 CODE_SOURCERY ?= YES
 
@@ -72,10 +66,7 @@ FLASH_TOOL = OPENOCD
 
 # List of modules to include
 OPTMODULES = 
-MODULES = TransmitterControls FirmwareIAP RadioComBridge
-ifeq ($(ENABLE_MOVE_CONTROLLER), YES)
-MODULES += AttitudeMARG
-endif
+MODULES = FirmwareIAP RadioComBridge
 
 # Paths
 OPSYSTEM = ./System
@@ -145,8 +136,6 @@ SRC += $(OPTESTS)/test_common.c
 SRC += $(OPTESTS)/$(TESTAPP).c
 endif
 
-
-
 ## UAVOBJECTS
 ifndef TESTAPP
 SRC += $(OPUAVSYNTHDIR)/accessorydesired.c
@@ -253,26 +242,6 @@ SRC += $(RTOSSRCDIR)/tasks.c
 SRC += $(RTOSSRCDIR)/portable/GCC/ARM_CM3/port.c
 SRC += $(RTOSSRCDIR)/portable/MemMang/heap_1.c
 
-## Dosfs file system
-#SRC += $(DOSFSDIR)/dosfs.c
-#SRC += $(DOSFSDIR)/dfs_sdcard.c
-
-## PyMite files
-#SRC += $(wildcard ${PYMITEVM}/*.c)
-#SRC += $(wildcard ${PYMITEPLAT}/*.c)
-#SRC += $(OUTDIR)/pmlib_img.c
-#SRC += $(OUTDIR)/pmlib_nat.c
-#SRC += $(OUTDIR)/pmlibusr_img.c
-#SRC += $(OUTDIR)/pmlibusr_nat.c
-
-## Mass Storage Device
-#SRC += $(MSDDIR)/msd.c
-#SRC += $(MSDDIR)/msd_bot.c
-#SRC += $(MSDDIR)/msd_desc.c
-#SRC += $(MSDDIR)/msd_memory.c
-#SRC += $(MSDDIR)/msd_scsi.c
-#SRC += $(MSDDIR)/msd_scsi_data.c
-
 # List C source files here which must be compiled in ARM-Mode (no -mthumb).
 # use file-extension c for "c-only"-files
 ## just for testing, timer.c could be compiled in thumb-mode too
@@ -390,19 +359,6 @@ ifeq ($(USE_I2C), YES)
 CDEFS += -DUSE_I2C
 endif
 
-ifeq ($(ENABLE_TRANSMITTER_BOX), YES)
-CDEFS += -DTRANSMITTER_BOX
-endif
-ifeq ($(ENABLE_ANALOG_TRANSMITTER), YES)
-CDEFS += -DANALOG_TRANSMITTER
-endif
-ifeq ($(ENABLE_MOVE_CONTROLLER), YES)
-CDEFS += -DMOVE_CONTROLLER
-endif
-ifeq ($(ENABLE_MAPLE_MINI_TRANSMITTER), YES)
-CDEFS += -DMAPLE_MINI
-endif
-
 # Place project-specific -D and/or -U options for
 # Assembler with preprocessor here.
 #ADEFS = -DUSE_IRQ_ASM_WRAPPER
@@ -524,13 +480,6 @@ endif
 endif
 endif
 
-# Generate code for PyMite
-#$(OUTDIR)/pmlib_img.c $(OUTDIR)/pmlib_nat.c $(OUTDIR)/pmlibusr_img.c $(OUTDIR)/pmlibusr_nat.c $(OUTDIR)/pmfeatures.h: $(wildcard $(PYMITELIB)/*.py) $(wildcard $(PYMITEPLAT)/*.py) $(wildcard $(FLIGHTPLANLIB)/*.py) $(wildcard $(FLIGHTPLANS)/*.py)
-#	@echo $(MSG_PYMITEINIT) $(call toprel, $@)
-#	@$(PYTHON) $(PYMITETOOLS)/pmImgCreator.py -f $(PYMITEPLAT)/pmfeatures.py -c -s --memspace=flash -o $(OUTDIR)/pmlib_img.c --native-file=$(OUTDIR)/pmlib_nat.c $(PYMITELIB)/list.py $(PYMITELIB)/dict.py $(PYMITELIB)/__bi.py $(PYMITELIB)/sys.py $(PYMITELIB)/string.py $(wildcard $(FLIGHTPLANLIB)/*.py)
-#	@$(PYTHON) $(PYMITETOOLS)/pmGenPmFeatures.py $(PYMITEPLAT)/pmfeatures.py > $(OUTDIR)/pmfeatures.h
-#	@$(PYTHON) $(PYMITETOOLS)/pmImgCreator.py -f $(PYMITEPLAT)/pmfeatures.py -c -u -o $(OUTDIR)/pmlibusr_img.c --native-file=$(OUTDIR)/pmlibusr_nat.c $(FLIGHTPLANS)/test.py
-
 # Link: create ELF output file from object files.
 $(eval $(call LINK_TEMPLATE, $(OUTDIR)/$(TARGET).elf, $(ALLOBJ)))