fix merging

Signed-off-by: wsribunm <worawissribunma@gmail.com>

Author: wsribunma

cyecca/models/fixedwing.py

@@ -32,6 +32,9 @@ def derive_model(coeff_data):
     Jy = ca.SX.sym("Jy")  # Moment of Inertia in y direction
     Jz = ca.SX.sym("Jz")  # Moment of Inertia in z direction
     J = ca.diag(ca.vertcat(Jx, Jy, Jz))  # Moment of Inertia Array
+    Cm_p = ca.SX.sym("Cm_p")  # moment coefficient for roll
+    Cm_q = ca.SX.sym("Cm_q")  # moment coefficient for pitch
+    Cm_r = ca.SX.sym("Cm_r")  # moment coefficent for yaw
     cbar = ca.SX.sym("cbar")  # mean chord (m)
     span = ca.SX.sym("span")  # wing span (m)
 
@@ -75,6 +78,9 @@ def derive_model(coeff_data):
         Jx,
         Jy,
         Jz,
+        Cm_p,
+        Cm_q,
+        Cm_r,
         cbar,
         span,
         Cm0,
@@ -167,6 +173,7 @@ def derive_model(coeff_data):
 
     # input
     throttle_cmd = ca.SX.sym("throttle_cmd")
+    ail_cmd = ca.SX.sym("ail_cmd")
     elev_cmd = ca.SX.sym("elev_cmd")
     rud_cmd = ca.SX.sym("rud_cmd")
 
@@ -223,6 +230,7 @@ def derive_model(coeff_data):
     ##############################################################################################
 
     # Force and Moment Model
+    cl = cl0 + cla * (-1 * alpha)  # Lift Coefficient
 
     # ##############################################################################################
     # ## From Look Up table