[airborne] error if trying to USE_SERVOS_7AND8 and USE_I2C1 at the sa…

…me time
paparazzi · Jun 18, 2012 · 10fc91f · 10fc91f
1 parent c4e1c1f
commit 10fc91f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml b/conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
@@ -25,6 +25,7 @@
 
     <subsystem name="actuators"     type="pwm_supervision">
       <define name="SERVO_HZ" value="400"/>
+      <define name="USE_SERVOS_7AND8"/>
     </subsystem>
 
     <subsystem name="telemetry"     type="transparent"/>

diff --git a/sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h b/sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
@@ -27,7 +27,11 @@
 #define ACTUATORS_PWM_ARCH_H
 
 #if USE_SERVOS_7AND8
+#if defined(BOARD_LISA_M) && USE_I2C1
+#error "You cannot use Servos 7and8 and I2C1 at the same time"
+#else
 #define ACTUATORS_PWM_NB 8
+#endif
 #else
 #define ACTUATORS_PWM_NB 6
 #endif