[Csp-commits] svn:csp r1557 - in trunk/CSP/CSPSim: . Data/XML/vehicles/aircraft/m2k Tools/FlightControlSystem/m2k

[<sv...@ww...>]

Author: mkrose
Date: 2005-06-06 21:51:21 -0700 (Mon, 06 Jun 2005)
New Revision: 1557

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml
   trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/outputs.py
   trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/pitch.py
Log:
Fix reversed limits on m2k elevator deflection.  Tweak cm_0,
cm_a, and cd_a to give somewhat less unrealistic behavior.
Still totally ad-hoc.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1557

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-06-07 03:45:27 UTC (rev 1556)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-06-07 04:51:21 UTC (rev 1557)
@@ -11,6 +11,10 @@
 
  * Increase the ABS cycle rate to improve braking performance.
 
+ * Fix reversed limits on m2k elevator deflection.  Tweak cm_0,
+   cm_a, and cd_a to give somewhat less unrealistic behavior.
+   Still totally ad-hoc.
+
 2005-06-05: onsight
  * Finally remove screen size globals.  Add screen size hints
    to terrain classes.  Also add an debug config flag to disable

Modified: trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml	2005-06-07 03:45:27 UTC (rev 1556)
+++ trunk/CSP/CSPSim/Data/XML/vehicles/aircraft/m2k/fm.xml	2005-06-07 04:51:21 UTC (rev 1557)
@@ -17,7 +17,7 @@
 
     <!-- Drag Parameters -->
     <Float name="cd0">0.06</Float>
-    <Float name="cd_a">0.07</Float>
+    <Float name="cd_a">0.18</Float>
     <Float name="cd_de">0.0703</Float>
     <Float name="cd_db">0.0876</Float>
     <Table2 name="cd_m_a">
@@ -84,8 +84,8 @@
     <!--Float name="cl_dh">0.62</Float-->
 
     <!-- Pitch Moment Parameters -->
-    <Float name="cm0">0.2</Float>
-    <Float name="cm_a">-1.0</Float>
+    <Float name="cm0">0.06</Float>
+    <Float name="cm_a">-0.6</Float>
     <!--Float name="cm_a">-3.5</Float-->
     <Float name="cm_adot">-3.61</Float>
     <Float name="cm_q">-53</Float><!-- <0  -->

Modified: trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/outputs.py
===================================================================
--- trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/outputs.py	2005-06-07 03:45:27 UTC (rev 1556)
+++ trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/outputs.py	2005-06-07 04:51:21 UTC (rev 1557)
@@ -40,8 +40,8 @@
 
 class elevron_deflection_left(OutputChannel):
 	channel = "ControlSurfaces.LeftElevronDeflection"
-	clamp_lo = radians(-16)
-	clamp_hi = radians(25)
+	clamp_lo = radians(-25)
+	clamp_hi = radians(16)
 	input = "de_left_f"
 	gain = DegreesToRadians
 	rate_limit_dec = radians(-80)
@@ -49,8 +49,8 @@
 
 class elevron_deflection_right(OutputChannel):
 	channel = "ControlSurfaces.RightElevronDeflection"
-	clamp_lo = radians(-16)
-	clamp_hi = radians(25)
+	clamp_lo = radians(-25)
+	clamp_hi = radians(16)
 	input = "de_right_f"
 	gain = DegreesToRadians
 	rate_limit_dec = radians(-80)
@@ -58,8 +58,8 @@
 
 class aileron_deflection(OutputChannel):
 	channel = "ControlSurfaces.AileronDeflection"
-	clamp_lo = radians(-16)
-	clamp_hi = radians(25)
+	clamp_lo = radians(-25)
+	clamp_hi = radians(16)
 	input = "da_f"
 	gain = DegreesToRadians
 	rate_limit_dec = radians(-80)
@@ -67,8 +67,8 @@
 
 class elevator_deflection(OutputChannel):
 	channel = "ControlSurfaces.ElevatorDeflection"
-	clamp_lo = radians(-16)
-	clamp_hi = radians(25)
+	clamp_lo = radians(-25)
+	clamp_hi = radians(16)
 	input = "de_f"
 	gain = DegreesToRadians
 	rate_limit_dec = radians(-60)

Modified: trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/pitch.py
===================================================================
--- trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/pitch.py	2005-06-07 03:45:27 UTC (rev 1556)
+++ trunk/CSP/CSPSim/Tools/FlightControlSystem/m2k/pitch.py	2005-06-07 04:51:21 UTC (rev 1557)
@@ -12,16 +12,16 @@
 	input_b = "da_program"
 	gain_a = -1.0
 	gain_b = 1.0
-	clamp_lo = -16
-	clamp_hi = 25
+	clamp_lo = -25
+	clamp_hi = 16
 
 class de_left(Adder):
 	input_a = "elevator_pitch_deflection_command"
 	input_b = "da_program"
 	gain_a = -1.0
 	gain_b = -1.0
-	clamp_lo = -16
-	clamp_hi = 25
+	clamp_lo = -25
+	clamp_hi = 16
 
 class de_f(Adder):
 	input_a = "de_left_f"
@@ -101,12 +101,12 @@
 	input_a = "reduced_elevator_deviation"
 	input_b = "elevator_deviation_integrator"
 	gain_a = 8.0
-	clamp_lo = -25
-	clamp_hi = 16
+	clamp_lo = -16
+	clamp_hi = 25
 
 class elevator_deviation_integrator(Integrator):
 	input = "reduced_elevator_deviation"
 	gain = 5.0
-	clamp_lo = -25.0
+	clamp_lo = -16.0
 	clamp_hi = 25.0