From 2c335edd7f4ddca29e9a6a4bd37dd898ecfa3026 Mon Sep 17 00:00:00 2001 From: peabody124 Date: Fri, 14 Jan 2011 01:38:32 +0000 Subject: [PATCH] OP-266 CopterControl: For now no USB support for code size git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2419 ebee16cc-31ac-478f-84a7-5cbb03baadba --- flight/CopterControl/Makefile | 30 +++++++------------ flight/CopterControl/System/inc/pios_config.h | 2 +- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile index 1de0aa511..b218d02fc 100644 --- a/flight/CopterControl/Makefile +++ b/flight/CopterControl/Makefile @@ -224,28 +224,20 @@ SRC += $(PIOSSTM32F10X)/pios_wdg.c # PIOS USB related files (seperated to make code maintenance more easy) -SRC += $(PIOSSTM32F10X)/pios_usb_hid.c -SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c -#SRC += $(PIOSSTM32F10X)/pios_usb_hid_endp.c -SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c -SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c -SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c +#SRC += $(PIOSSTM32F10X)/pios_usb_hid.c +#SRC += $(PIOSSTM32F10X)/pios_usb_hid_desc.c +#SRC += $(PIOSSTM32F10X)/pios_usb_hid_istr.c +#SRC += $(PIOSSTM32F10X)/pios_usb_hid_prop.c +#SRC += $(PIOSSTM32F10X)/pios_usb_hid_pwr.c ## PIOS Hardware (Common) SRC += $(PIOSCOMMON)/pios_sdcard.c SRC += $(PIOSCOMMON)/pios_com.c -SRC += $(PIOSCOMMON)/pios_bmp085.c SRC += $(PIOSCOMMON)/pios_i2c_esc.c SRC += $(PIOSCOMMON)/pios_iap.c -#SRC += $(PIOSCOMMON)/pios_opahrs.c -#SRC += $(PIOSCOMMON)/pios_opahrs_proto.c SRC += $(PIOSCOMMON)/printf-stdarg.c -SRC += $(FLIGHTLIB)/ahrs_spi_comm.c -SRC += $(FLIGHTLIB)/ahrs_comm_objects.c ## Libraries for flight calculations SRC += $(FLIGHTLIB)/fifo_buffer.c -SRC += $(FLIGHTLIB)/WorldMagModel.c -SRC += $(FLIGHTLIB)/CoordinateConversions.c ## CMSIS for STM32 SRC += $(CMSISDIR)/core_cm3.c @@ -272,12 +264,12 @@ SRC += $(STMSPDSRCDIR)/stm32f10x_dbgmcu.c SRC += $(STMSPDSRCDIR)/misc.c ## STM32 USB Library -SRC += $(STMUSBSRCDIR)/usb_core.c -SRC += $(STMUSBSRCDIR)/usb_init.c -SRC += $(STMUSBSRCDIR)/usb_int.c -SRC += $(STMUSBSRCDIR)/usb_mem.c -SRC += $(STMUSBSRCDIR)/usb_regs.c -SRC += $(STMUSBSRCDIR)/usb_sil.c +#SRC += $(STMUSBSRCDIR)/usb_core.c +#SRC += $(STMUSBSRCDIR)/usb_init.c +#SRC += $(STMUSBSRCDIR)/usb_int.c +#SRC += $(STMUSBSRCDIR)/usb_mem.c +#SRC += $(STMUSBSRCDIR)/usb_regs.c +#SRC += $(STMUSBSRCDIR)/usb_sil.c ## RTOS SRC += $(RTOSSRCDIR)/list.c diff --git a/flight/CopterControl/System/inc/pios_config.h b/flight/CopterControl/System/inc/pios_config.h index 10d06d951..a22a74d5d 100644 --- a/flight/CopterControl/System/inc/pios_config.h +++ b/flight/CopterControl/System/inc/pios_config.h @@ -48,7 +48,7 @@ #define PIOS_INCLUDE_SPI #define PIOS_INCLUDE_SYS #define PIOS_INCLUDE_USART -#define PIOS_INCLUDE_USB_HID +//#define PIOS_INCLUDE_USB_HID #define PIOS_INCLUDE_COM #define PIOS_INCLUDE_SETTINGS #define PIOS_INCLUDE_FREERTOS