From dff66607c75c81cfa9922219726e4ceb85354851 Mon Sep 17 00:00:00 2001
From: cwabbott <cwabbott>
Date: Sat, 16 Oct 2010 12:15:47 +0000
Subject: [PATCH] More UAVObject fixes, stuff to get PiOS.win32 compiling
 again.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1962 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 flight/OpenPilot/Makefile.win32                          | 9 ++-------
 .../OpenPilot/Modules/Stabilization/inc/stabilization.h  | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/flight/OpenPilot/Makefile.win32 b/flight/OpenPilot/Makefile.win32
index 9d5f94ab1..fbfa226c5 100644
--- a/flight/OpenPilot/Makefile.win32
+++ b/flight/OpenPilot/Makefile.win32
@@ -53,7 +53,7 @@ FLASH_TOOL = OPENOCD
 USE_THUMB_MODE = YES
 
 # List of modules to include
-MODULES =  Telemetry Stabilization/experimental/Stabilization ManualControl
+MODULES =  Telemetry Stabilization ManualControl
 #MODULES =  Telemetry GPS ManualControl Actuator Altitude Attitude Stabilization
 #MODULES = Telemetry Example
 #MODULES = Telemetry MK/MKSerial
@@ -126,9 +126,6 @@ endif
 
 ## UAVOBJECTS
 ifndef TESTAPP
-SRC += $(OPUAVOBJ)/exampleobject1.c
-SRC += $(OPUAVOBJ)/exampleobject2.c
-SRC += $(OPUAVOBJ)/examplesettings.c
 SRC += $(OPUAVOBJ)/objectpersistence.c
 SRC += $(OPUAVOBJ)/positionactual.c
 SRC += $(OPUAVOBJ)/gpsposition.c
@@ -155,15 +152,13 @@ SRC += $(OPUAVOBJ)/ahrssettings.c
 SRC += $(OPUAVOBJ)/flightbatterystate.c
 SRC += $(OPUAVOBJ)/attituderaw.c
 SRC += $(OPUAVOBJ)/homelocation.c
-SRC += $(OPUAVOBJ)/attitudesettings.c
-SRC += $(OPUAVOBJ)/vtolsettings.c
 SRC += $(OPUAVOBJ)/mixersettings.c
 SRC += $(OPUAVOBJ)/mixerstatus.c
-#SRC += $(OPUAVOBJ)/lesstabilizationsettings.c
 SRC += $(OPUAVOBJ)/positiondesired.c
 SRC += $(OPUAVOBJ)/velocitydesired.c
 SRC += $(OPUAVOBJ)/velocityactual.c
 SRC += $(OPUAVOBJ)/guidancesettings.c
+SRC += $(OPUAVOBJ)/firmwareiapobj.c
 endif
 
 ## PIOS Hardware (win32)
diff --git a/flight/OpenPilot/Modules/Stabilization/inc/stabilization.h b/flight/OpenPilot/Modules/Stabilization/inc/stabilization.h
index 33ff3e875..89a816c24 100644
--- a/flight/OpenPilot/Modules/Stabilization/inc/stabilization.h
+++ b/flight/OpenPilot/Modules/Stabilization/inc/stabilization.h
@@ -40,4 +40,4 @@ int32_t StabilizationInitialize();
 /**
   * @}
   * @}
-  */
\ No newline at end of file
+  */