From f30b8d6469db02287454c72411c301cf09f0e24a Mon Sep 17 00:00:00 2001
From: Gautier Hattenberger <gautier.hattenberger@enac.fr>
Date: Fri, 19 Oct 2012 21:32:09 +0200
Subject: [PATCH] [actuators] fix some bugs

---
 conf/airframes/examples/lisa_asctec.xml                        | 2 +-
 conf/airframes/examples/setup_lisam2.xml                       | 2 +-
 sw/airborne/arch/sim/subsystems/actuators/actuators_pwm_arch.h | 1 -
 sw/simulator/nps/nps_autopilot_rotorcraft.c                    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/conf/airframes/examples/lisa_asctec.xml b/conf/airframes/examples/lisa_asctec.xml
index 0d38e840c1e..c65616a7a6c 100644
--- a/conf/airframes/examples/lisa_asctec.xml
+++ b/conf/airframes/examples/lisa_asctec.xml
@@ -214,7 +214,7 @@
   <firmware name="lisa_test_progs">
     <target name="test_led"   board="lisa_l_1.1"/>
     <target name="test_uart"   board="lisa_l_1.1"/>
-    <target name="test_servos"   board="lisa_l_1.1"/>
+    <!--target name="test_servos"   board="lisa_l_1.1"/-->
     <target name="test_telemetry"   board="lisa_l_1.1"/>
     <target name="test_baro"        board="lisa_l_1.1"/>
     <target name="test_imu_b2"      board="lisa_l_1.1"/>
diff --git a/conf/airframes/examples/setup_lisam2.xml b/conf/airframes/examples/setup_lisam2.xml
index 0d228f0fd9f..a300d55697b 100644
--- a/conf/airframes/examples/setup_lisam2.xml
+++ b/conf/airframes/examples/setup_lisam2.xml
@@ -11,7 +11,7 @@
     <target name="test_led"	                board="lisa_m_2.0"/>
     <target name="test_sys_time"            board="lisa_m_2.0"/>
     <target name="test_uart"                board="lisa_m_2.0"/>
-    <target name="test_servos"              board="lisa_m_2.0"/>
+    <!--target name="test_servos"              board="lisa_m_2.0"/-->
     <target name="test_telemetry"           board="lisa_m_2.0"/>
     <target name="test_baro"                board="lisa_m_2.0"/>
     <target name="test_rc_spektrum"         board="lisa_m_2.0"/>
diff --git a/sw/airborne/arch/sim/subsystems/actuators/actuators_pwm_arch.h b/sw/airborne/arch/sim/subsystems/actuators/actuators_pwm_arch.h
index 45566777afc..02c159b6b0a 100644
--- a/sw/airborne/arch/sim/subsystems/actuators/actuators_pwm_arch.h
+++ b/sw/airborne/arch/sim/subsystems/actuators/actuators_pwm_arch.h
@@ -29,7 +29,6 @@
 #define SERVOS_TICS_OF_USEC(_v) (_v)
 
 #define ActuatorPwmSet(_i, _v) {}
-#define ActuatorsPwmInit() {}
 #define ActuatorsPwmCommit() {}
 
 extern void actuators_pwm_arch_init(void);
diff --git a/sw/simulator/nps/nps_autopilot_rotorcraft.c b/sw/simulator/nps/nps_autopilot_rotorcraft.c
index 81fab9ac3fa..3ec8b45a160 100644
--- a/sw/simulator/nps/nps_autopilot_rotorcraft.c
+++ b/sw/simulator/nps/nps_autopilot_rotorcraft.c
@@ -32,7 +32,7 @@
 #include "mcu_periph/sys_time.h"
 #include "state.h"
 
-#include "actuators/motor_mixing.h"
+#include "subsystems/actuators/motor_mixing.h"
 
 
 struct NpsAutopilot autopilot;