From a4e0ee5fdf3cc5e625b62f21d5efc03488e87e5c Mon Sep 17 00:00:00 2001 From: peabody124 Date: Wed, 29 Sep 2010 18:51:36 +0000 Subject: [PATCH] Flight/Actuator: Move Les' actuator to the active one git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1800 ebee16cc-31ac-478f-84a7-5cbb03baadba --- flight/OpenPilot/Makefile | 6 +----- .../Modules/Actuator/{matrixmixer/Actuator => }/actuator.c | 0 .../Actuator/{matrixmixer/Actuator => }/inc/actuator.h | 0 3 files changed, 1 insertion(+), 5 deletions(-) rename flight/OpenPilot/Modules/Actuator/{matrixmixer/Actuator => }/actuator.c (100%) rename flight/OpenPilot/Modules/Actuator/{matrixmixer/Actuator => }/inc/actuator.h (100%) diff --git a/flight/OpenPilot/Makefile b/flight/OpenPilot/Makefile index 58d964b50..a592d4864 100644 --- a/flight/OpenPilot/Makefile +++ b/flight/OpenPilot/Makefile @@ -57,11 +57,7 @@ FLASH_TOOL = OPENOCD USE_THUMB_MODE = YES # List of modules to include -MODULES = Telemetry GPS ManualControl Altitude AHRSComms Stabilization/simple/Stabilization Watchdog -#matrix based actuator mixer -#MODULES += Actuator/matrix/Actuator -#original actuator with separate mixers for fixed wing, heli and VTOL -MODULES += Actuator +MODULES = Actuator Telemetry GPS ManualControl Altitude AHRSComms Stabilization/simple/Stabilization Watchdog #MODULES = Telemetry Example #MODULES = Telemetry MK/MKSerial diff --git a/flight/OpenPilot/Modules/Actuator/matrixmixer/Actuator/actuator.c b/flight/OpenPilot/Modules/Actuator/actuator.c similarity index 100% rename from flight/OpenPilot/Modules/Actuator/matrixmixer/Actuator/actuator.c rename to flight/OpenPilot/Modules/Actuator/actuator.c diff --git a/flight/OpenPilot/Modules/Actuator/matrixmixer/Actuator/inc/actuator.h b/flight/OpenPilot/Modules/Actuator/inc/actuator.h similarity index 100% rename from flight/OpenPilot/Modules/Actuator/matrixmixer/Actuator/inc/actuator.h rename to flight/OpenPilot/Modules/Actuator/inc/actuator.h