From 05483e2a74801d0c5a2ddf11405dd1bb6b5e7252 Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Sun, 16 Sep 2012 15:40:47 -0400 Subject: [PATCH] simposix: adapt simposix to addition of relay tuning --- flight/SimPosix/Makefile | 6 ++++++ flight/SimPosix/UAVObjects.inc | 2 ++ 2 files changed, 8 insertions(+) diff --git a/flight/SimPosix/Makefile b/flight/SimPosix/Makefile index 84a9bb060..622d7f53c 100644 --- a/flight/SimPosix/Makefile +++ b/flight/SimPosix/Makefile @@ -71,6 +71,8 @@ PIOSINC = $(PIOS)/inc OPMODULEDIR = ../Modules FLIGHTLIB = ../Libraries FLIGHTLIBINC = ../Libraries/inc +MATHLIB = ../Libraries/math +MATHLIBINC = ../Libraries/math PIOSPOSIX = $(PIOS)/posix PIOSCOMMON = $(PIOS)/posix PIOSBOARDS = $(PIOS)/Boards @@ -132,6 +134,9 @@ SRC += $(FLIGHTLIB)/WorldMagModel.c SRC += $(FLIGHTLIB)/insgps13state.c SRC += $(FLIGHTLIB)/taskmonitor.c +SRC += $(MATHLIB)/sin_lookup.c +SRC += $(MATHLIB)/pid.c + ## PIOS Hardware (STM32F4xx) include $(PIOS)/posix/library.mk @@ -190,6 +195,7 @@ EXTRAINCDIRS += $(OPUAVOBJ) EXTRAINCDIRS += $(OPUAVOBJINC) EXTRAINCDIRS += $(UAVOBJSYNTHDIR) EXTRAINCDIRS += $(FLIGHTLIBINC) +EXTRAINCDIRS += $(MATHLIBINC) #EXTRAINCDIRS += $(PIOSSTM32F4XX) EXTRAINCDIRS += $(PIOSCOMMON) EXTRAINCDIRS += $(PIOSBOARDS) diff --git a/flight/SimPosix/UAVObjects.inc b/flight/SimPosix/UAVObjects.inc index 8953c7462..b2400f16b 100644 --- a/flight/SimPosix/UAVObjects.inc +++ b/flight/SimPosix/UAVObjects.inc @@ -63,6 +63,8 @@ UAVOBJSRCFILENAMES += positionactual UAVOBJSRCFILENAMES += positiondesired UAVOBJSRCFILENAMES += ratedesired UAVOBJSRCFILENAMES += revocalibration +UAVOBJSRCFILENAMES += relaytuning +UAVOBJSRCFILENAMES += relaytuningsettings UAVOBJSRCFILENAMES += sonaraltitude UAVOBJSRCFILENAMES += stabilizationdesired UAVOBJSRCFILENAMES += stabilizationsettings