[paparazzi-commits] [4581]

[antoine drouin]

Revision: 4581
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4581
Author:   poine
Date:     2010-02-24 12:45:01 +0000 (Wed, 24 Feb 2010)
Log Message:
-----------


Modified Paths:
--------------
    paparazzi3/trunk/sw/simulator/scilab/q6d/q6d_fdm.sci
    paparazzi3/trunk/sw/simulator/scilab/q6d/test_stop_stop.sce

Modified: paparazzi3/trunk/sw/simulator/scilab/q6d/q6d_fdm.sci
===================================================================
--- paparazzi3/trunk/sw/simulator/scilab/q6d/q6d_fdm.sci        2010-02-24 
12:22:05 UTC (rev 4580)
+++ paparazzi3/trunk/sw/simulator/scilab/q6d/q6d_fdm.sci        2010-02-24 
12:45:01 UTC (rev 4581)
@@ -138,7 +138,7 @@
   quat = X(FDM_SQI:FDM_SQZ);
   airspeed_body = quat_vect_mult(quat, airspeed_ltp);
 
-  lift_body = [0; 0; -sum(U) * fdm_Ct0 * ( 1 + 1/fdm_V0 * 
airspeed_body(AXIS_Z))];
+  lift_body = [0; 0; -sum(U) * fdm_Ct0 * ( 1 - 1/fdm_V0 * 
airspeed_body(AXIS_Z))];
   lift_ltp = quat_vect_inv_mult(quat, lift_body);
   
   weight_ltp = [0; 0; fdm_g * fdm_mass];

Modified: paparazzi3/trunk/sw/simulator/scilab/q6d/test_stop_stop.sce
===================================================================
--- paparazzi3/trunk/sw/simulator/scilab/q6d/test_stop_stop.sce 2010-02-24 
12:22:05 UTC (rev 4580)
+++ paparazzi3/trunk/sw/simulator/scilab/q6d/test_stop_stop.sce 2010-02-24 
12:45:01 UTC (rev 4581)
@@ -17,8 +17,8 @@
 
 //b0 = [ 0    0   0];
 //b1 = [-10   1  -2];
-b0 = [ 0   0   0];
-b1 = [ 1   0   5];
+b0 = [ 0   0   0 ];
+b1 = [ 1   0   -5];
 [fo_traj] = sbb_gen_traj(time, dyn, max_speed, max_accel, b0, b1);