use the new automatic conversion with unit="deg" to radians instead of RadOfDeg

This commit is contained in:
Felix Ruess
2011-12-01 16:05:24 +01:00
parent e4bf595195
commit 16524fffda
11 changed files with 36 additions and 36 deletions
+2 -2
View File
@@ -246,8 +246,8 @@
<define name="TILT_NEUTRAL" value="1500"/>
<define name="TILT_MIN" value="1060"/>
<define name="TILT_MAX" value="2250"/>
<define name="TILT_ANGLE_MIN" value="RadOfDeg(-90.)" unit="rad"/>
<define name="TILT_ANGLE_MAX" value="RadOfDeg( 0.)" unit="rad"/>
<define name="TILT_ANGLE_MIN" value="-90." unit="deg"/>
<define name="TILT_ANGLE_MAX" value=" 0." unit="deg"/>
<define name="PAN_NEUTRAL" value="0"/>
<define name="PAN_MIN" value="0"/>
<define name="PAN_MAX" value="25736"/> <!-- 360 deg (2^12) -->
+2 -2
View File
@@ -212,8 +212,8 @@
<define name="TILT_NEUTRAL" value="1500"/>
<define name="TILT_MAX" value="1000"/>
<define name="TILT_MIN" value="2300"/>
<define name="TILT_ANGLE_MIN" value="RadOfDeg(-90.)" unit="rad"/>
<define name="TILT_ANGLE_MAX" value="RadOfDeg( 10.)" unit="rad"/>
<define name="TILT_ANGLE_MIN" value="-90." unit="deg"/>
<define name="TILT_ANGLE_MAX" value=" 10." unit="deg"/>
<define name="PAN_NEUTRAL" value="0"/>
<define name="PAN_MIN" value="0"/>
<define name="PAN_MAX" value="25736"/> <!-- 360 deg (2^12) -->
+2 -2
View File
@@ -257,8 +257,8 @@
<define name="TILT_NEUTRAL" value="1500"/>
<define name="TILT_MIN" value="1060"/>
<define name="TILT_MAX" value="2250"/>
<define name="TILT_ANGLE_MIN" value="RadOfDeg(-90.)" unit="rad"/>
<define name="TILT_ANGLE_MAX" value="RadOfDeg( 0.)" unit="rad"/>
<define name="TILT_ANGLE_MIN" value="-90." unit="deg"/>
<define name="TILT_ANGLE_MAX" value=" 0." unit="deg"/>
<define name="PAN_NEUTRAL" value="0"/>
<define name="PAN_MIN" value="0"/>
<define name="PAN_MAX" value="25736"/> <!-- 360 deg (2^12) -->
+2 -2
View File
@@ -103,8 +103,8 @@
</section>
<section name="INS" prefix="INS_">
<define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(6.18794441223)" unit="rad"/>
<define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(-6.87549352646)" unit="deg"/>
<define name="ROLL_NEUTRAL_DEFAULT" value="6.18794441223" unit="deg"/>
<define name="PITCH_NEUTRAL_DEFAULT" value="-6.87549352646" unit="deg"/>
</section>
<section name="AUTO1" prefix="AUTO1_">
+5 -5
View File
@@ -143,9 +143,9 @@
<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="-0.7"/>
<define name="ROLL_MAX_SETPOINT" value="RadOfDeg(35)" unit="radians"/>
<define name="PITCH_MAX_SETPOINT" value="RadOfDeg(25)" unit="radians"/>
<define name="PITCH_MIN_SETPOINT" value="RadOfDeg(-25)" unit="radians"/>
<define name="ROLL_MAX_SETPOINT" value="35" unit="deg"/>
<define name="PITCH_MAX_SETPOINT" value="25" unit="deg"/>
<define name="PITCH_MIN_SETPOINT" value="-25" unit="deg"/>
<define name="PITCH_PGAIN" value="-20000."/>
<define name="PITCH_DGAIN" value="1.5"/>
<define name="ELEVATOR_OF_ROLL" value="2500"/>
@@ -172,8 +172,8 @@
<section name="FAILSAFE" prefix="FAILSAFE_">
<define name="DELAY_WITHOUT_GPS" value="3" unit="s"/>
<define name="DEFAULT_THROTTLE" value="0.4" unit="%"/>
<define name="DEFAULT_ROLL" value="RadOfDeg(15)" unit="rad"/>
<define name="DEFAULT_PITCH" value="RadOfDeg(0)" unit="rad"/>
<define name="DEFAULT_ROLL" value="15" unit="deg"/>
<define name="DEFAULT_PITCH" value="0" unit="deg"/>
<define name="HOME_RADIUS" value="90" unit="m"/>
</section>
+5 -5
View File
@@ -130,9 +130,9 @@
<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="-0.7"/>
<define name="ROLL_MAX_SETPOINT" value="RadOfDeg(35)" unit="radians"/>
<define name="PITCH_MAX_SETPOINT" value="RadOfDeg(25)" unit="radians"/>
<define name="PITCH_MIN_SETPOINT" value="RadOfDeg(-25)" unit="radians"/>
<define name="ROLL_MAX_SETPOINT" value="35" unit="deg"/>
<define name="PITCH_MAX_SETPOINT" value="25" unit="deg"/>
<define name="PITCH_MIN_SETPOINT" value="-25" unit="deg"/>
<define name="PITCH_PGAIN" value="-20000."/>
<define name="PITCH_DGAIN" value="1.5"/>
<define name="ELEVATOR_OF_ROLL" value="2500"/>
@@ -159,8 +159,8 @@
<section name="FAILSAFE" prefix="FAILSAFE_">
<define name="DELAY_WITHOUT_GPS" value="3" unit="s"/>
<define name="DEFAULT_THROTTLE" value="0.4" unit="%"/>
<define name="DEFAULT_ROLL" value="RadOfDeg(15)" unit="rad"/>
<define name="DEFAULT_PITCH" value="RadOfDeg(0)" unit="rad"/>
<define name="DEFAULT_ROLL" value="15" unit="deg"/>
<define name="DEFAULT_PITCH" value="0" unit="deg"/>
<define name="HOME_RADIUS" value="90" unit="m"/>
</section>
+2 -2
View File
@@ -82,8 +82,8 @@
<!-- settings for the Analog IMU -->
<section name="INS" prefix="INS_">
<define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
<define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
<define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
<define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
</section>
<!-- 3S LiPo with 1050mAh, connected to an 20A ESC -->
+3 -3
View File
@@ -306,9 +306,9 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation
<!-- maybe handy to avoid over corner with lots of wind and small airframe -->
<!-- <define name="COURSE_SLEW_INCREMENT" value="RadOfDeg(4)"/> -->
<define name="ROLL_MAX_SETPOINT" value="RadOfDeg(50)" unit="radians"/>
<define name="PITCH_MAX_SETPOINT" value="RadOfDeg(35)" unit="radians"/>
<define name="PITCH_MIN_SETPOINT" value="RadOfDeg(-30)" unit="radians"/>
<define name="ROLL_MAX_SETPOINT" value="50" unit="deg"/>
<define name="PITCH_MAX_SETPOINT" value="35" unit="deg"/>
<define name="PITCH_MIN_SETPOINT" value="-30" unit="deg"/>
<define name="ROLL_ATTITUDE_GAIN" value="-7500."/>
+3 -3
View File
@@ -170,9 +170,9 @@
<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="-1.1"/>
<define name="ROLL_MAX_SETPOINT" value="RadOfDeg(50)" unit="rad"/>
<define name="PITCH_MAX_SETPOINT" value="RadOfDeg(30)" unit="rad"/>
<define name="PITCH_MIN_SETPOINT" value="RadOfDeg(-25)" unit="rad"/>
<define name="ROLL_MAX_SETPOINT" value="50" unit="deg"/>
<define name="PITCH_MAX_SETPOINT" value="30" unit="deg"/>
<define name="PITCH_MIN_SETPOINT" value="-25" unit="deg"/>
<define name="PITCH_PGAIN" value="-7000."/>
<define name="PITCH_DGAIN" value="1.5"/>
+5 -5
View File
@@ -131,9 +131,9 @@
<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="-0.7"/>
<define name="ROLL_MAX_SETPOINT" value="RadOfDeg(35)" unit="radians"/>
<define name="PITCH_MAX_SETPOINT" value="RadOfDeg(25)" unit="radians"/>
<define name="PITCH_MIN_SETPOINT" value="RadOfDeg(-25)" unit="radians"/>
<define name="ROLL_MAX_SETPOINT" value="35" unit="deg"/>
<define name="PITCH_MAX_SETPOINT" value="25" unit="deg"/>
<define name="PITCH_MIN_SETPOINT" value="-25" unit="deg"/>
<define name="PITCH_PGAIN" value="-20000."/>
<define name="PITCH_DGAIN" value="1.5"/>
<define name="ELEVATOR_OF_ROLL" value="2500"/>
@@ -160,8 +160,8 @@
<section name="FAILSAFE" prefix="FAILSAFE_">
<define name="DELAY_WITHOUT_GPS" value="3" unit="s"/>
<define name="DEFAULT_THROTTLE" value="0.4" unit="%"/>
<define name="DEFAULT_ROLL" value="RadOfDeg(15)" unit="rad"/>
<define name="DEFAULT_PITCH" value="RadOfDeg(0)" unit="rad"/>
<define name="DEFAULT_ROLL" value="15" unit="deg"/>
<define name="DEFAULT_PITCH" value="0" unit="deg"/>
<define name="HOME_RADIUS" value="90" unit="m"/>
</section>
@@ -111,9 +111,9 @@
<section name="HORIZONTAL CONTROL" prefix="H_CTL_">
<define name="COURSE_PGAIN" value="-0.7"/>
<define name="ROLL_MAX_SETPOINT" value="RadOfDeg(35)" unit="radians"/>
<define name="PITCH_MAX_SETPOINT" value="RadOfDeg(25)" unit="radians"/>
<define name="PITCH_MIN_SETPOINT" value="RadOfDeg(-25)" unit="radians"/>
<define name="ROLL_MAX_SETPOINT" value="35" unit="deg"/>
<define name="PITCH_MAX_SETPOINT" value="25" unit="deg"/>
<define name="PITCH_MIN_SETPOINT" value="-25" unit="deg"/>
<define name="PITCH_PGAIN" value="-20000."/>
<define name="PITCH_DGAIN" value="1.5"/>
<define name="ELEVATOR_OF_ROLL" value="2500"/>
@@ -140,8 +140,8 @@
<section name="FAILSAFE" prefix="FAILSAFE_">
<define name="DELAY_WITHOUT_GPS" value="3" unit="s"/>
<define name="DEFAULT_THROTTLE" value="0.4" unit="%"/>
<define name="DEFAULT_ROLL" value="RadOfDeg(15)" unit="rad"/>
<define name="DEFAULT_PITCH" value="RadOfDeg(0)" unit="rad"/>
<define name="DEFAULT_ROLL" value="15" unit="deg"/>
<define name="DEFAULT_PITCH" value="0" unit="deg"/>
<define name="HOME_RADIUS" value="90" unit="m"/>
</section>