Fixed config course (#1725)

* Fixed config course * removed target * added dependency on stdio for printf * Removed failing NPS target heli genius DD
paparazzi · Jun 15, 2016 · 2764bc3 · 2764bc3
1 parent 63c6884
commit 2764bc3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/conf/airframes/TUDELFT/tudelft_course2016_bebop_avoider.xml b/conf/airframes/TUDELFT/tudelft_course2016_bebop_avoider.xml
@@ -6,11 +6,6 @@
   <firmware name="rotorcraft">
     <target name="ap" board="bebop"/> <!-- The type of Autopilot board hardware one uses -->
 
-    <target name="nps" board="pc">
-      <module name="fdm" type="jsbsim"/>
-      <module name="udp"/>
-    </target>
-
     <!--define name="USE_SONAR" value="TRUE"/-->
 
 	<!-- Subsystem section -->
@@ -51,6 +46,7 @@
     </module>
     -->
     <module name="cv_colorfilter">
+        <define name="COLORFILTER_CAMERA" value="front_camera"/>
     </module>
     <module name="orange_avoider"/>
   </modules>

diff --git a/conf/airframes/TUDELFT/tudelft_heliGeniusDD.xml b/conf/airframes/TUDELFT/tudelft_heliGeniusDD.xml
@@ -15,10 +15,6 @@
       <configure name="AHRS_PROPAGATE_FREQUENCY" value="500"/>
     </target>
     <define name="AHRS_GRAVITY_HEURISTIC_FACTOR" value="0"/>
-    <target name="nps" board="pc">
-      <subsystem name="fdm" type="jsbsim"/>
-      <subsystem name="radio_control" type="ppm"/>
-    </target>
 
     <subsystem name="actuators" type="pwm">
       <define name="TIM5_SERVO_HZ" value="2000"/>

diff --git a/sw/airborne/modules/orange_avoider/orange_avoider.c b/sw/airborne/modules/orange_avoider/orange_avoider.c
@@ -15,6 +15,7 @@
 #include "firmwares/rotorcraft/navigation.h"
 #include "state.h"
 #include <time.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 uint8_t safeToGoForwards = false;
@@ -39,7 +40,7 @@ void orange_avoider_periodic()
   // Check the amount of orange. If this is above a threshold
   // you want to turn a certain amount of degrees
   safeToGoForwards = color_count < tresholdColorCount;
-  printf("Checking if this funciton is called %d treshold: %d now: %d \n", color_count, tresholdColorCount,
+  printf("Checking if this function is called %d threshold: %d now: %d \n", color_count, tresholdColorCount,
          safeToGoForwards);
 }