[rotorcraft guidance] minor cleanup when using guidance_h ref

paparazzi · May 22, 2012 · 9782d0a · 9782d0a
1 parent 831372a
commit 9782d0a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/conf/airframes/examples/quadrotor_lisa_m_2_pwm.xml b/conf/airframes/examples/quadrotor_lisa_m_2_pwm.xml
@@ -178,7 +178,6 @@
   </section>
 
   <section name="GUIDANCE_H" prefix="GUIDANCE_H_">
-    <define name="USE_REF" value="1"/>
     <define name="MAX_BANK" value="20" unit="deg"/>
     <define name="PGAIN" value="100"/>
     <define name="DGAIN" value="100"/>

diff --git a/conf/airframes/examples/quadrotor_lisa_m_mkk.xml b/conf/airframes/examples/quadrotor_lisa_m_mkk.xml
@@ -161,7 +161,6 @@
   </section>
 
   <section name="GUIDANCE_H" prefix="GUIDANCE_H_">
-    <define name="USE_REF" value="1"/>
     <define name="MAX_BANK" value="20" unit="deg"/>
     <define name="PGAIN" value="100"/>
     <define name="DGAIN" value="100"/>

diff --git a/conf/airframes/fraser_lisa_m_rotorcraft.xml b/conf/airframes/fraser_lisa_m_rotorcraft.xml
@@ -196,7 +196,7 @@
   </section>
 
   <section name="GUIDANCE_H" prefix="GUIDANCE_H_">
-    <define name="USE_REF" value="1"/>
+    <!--define name="USE_REF" value="1"/-->
     <define name="MAX_BANK" value="20" unit="deg"/>
     <define name="PGAIN" value="100"/>
     <define name="DGAIN" value="100"/>

diff --git a/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c b/sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
@@ -214,7 +214,11 @@ void guidance_h_run(bool_t  in_flight) {
       else {
         INT32_VECT2_NED_OF_ENU(guidance_h_pos_sp, navigation_carrot);
 
+#if GUIDANCE_H_USE_REF
         guidance_h_update_reference(TRUE);
+#else
+        guidance_h_update_reference(FALSE);
+#endif
 
         guidance_h_psi_sp = nav_heading;
         guidance_h_traj_run(in_flight);
@@ -230,7 +234,6 @@ void guidance_h_run(bool_t  in_flight) {
 
 static inline void guidance_h_update_reference(bool_t use_ref) {
   /* convert our reference to generic representation */
-#if GUIDANCE_H_USE_REF
   if (use_ref) {
     b2_gh_update_ref_from_pos_sp(guidance_h_pos_sp);
     INT32_VECT2_RSHIFT(guidance_h_pos_ref,   b2_gh_pos_ref,   (B2_GH_POS_REF_FRAC - INT32_POS_FRAC));
@@ -241,12 +244,6 @@ static inline void guidance_h_update_reference(bool_t use_ref) {
     INT_VECT2_ZERO(guidance_h_speed_ref);
     INT_VECT2_ZERO(guidance_h_accel_ref);
   }
-#else
-  if (use_ref) {;} // we don't have a reference... just to avoid the unused arg warning in that case
-  VECT2_COPY(guidance_h_pos_ref, guidance_h_pos_sp);
-  INT_VECT2_ZERO(guidance_h_speed_ref);
-  INT_VECT2_ZERO(guidance_h_accel_ref);
-#endif
 }