changed IR_PITCH_NEUTRAL_DEFAULT and IR_ROLL_NEUTRAL_DEFAULT to radians

This commit is contained in:
Felix Ruess
2011-11-29 00:26:34 +01:00
parent 4be15501fa
commit 567a7e2563
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -27,7 +27,7 @@
</dl_settings>
<dl_settings NAME="Infrared">
<dl_setting MAX="15" MIN="-15" STEP="1" VAR="infrared.roll_neutral" shortname="roll neutral" module="subsystems/sensors/infrared" param="IR_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg" alt_unit_coef="57.3"/>
<dl_setting MAX="0.5" MIN="-0.5" STEP="1" VAR="infrared.roll_neutral" shortname="roll neutral" module="subsystems/sensors/infrared" param="IR_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg" alt_unit_coef="57.3"/>
<dl_setting MAX="0.5" MIN="-0.3" STEP="0.01" VAR="infrared.pitch_neutral" shortname="pitch neutral" module="subsystems/sensors/infrared" param="IR_PITCH_NEUTRAL_DEFAULT" unit="rad"/>
</dl_settings>
</dl_settings>
+2 -2
View File
@@ -38,8 +38,8 @@ struct Infrared infrared;
/** \brief Initialisation of \a ir structure
*/
void infrared_struct_init(void) {
infrared.roll_neutral = RadOfDeg(IR_ROLL_NEUTRAL_DEFAULT);
infrared.pitch_neutral = RadOfDeg(IR_PITCH_NEUTRAL_DEFAULT);
infrared.roll_neutral = IR_ROLL_NEUTRAL_DEFAULT;
infrared.pitch_neutral = IR_PITCH_NEUTRAL_DEFAULT;
infrared.correction_left = IR_CORRECTION_LEFT;
infrared.correction_right = IR_CORRECTION_RIGHT;
+2 -2
View File
@@ -143,8 +143,8 @@ module Make(A:Data.MISSION) = struct
let maximum_airspeed = try float_value misc_section "MAXIMUM_AIRSPEED" with _ -> nominal_airspeed *. 1.5
let max_power = try float_value misc_section "MAXIMUM_POWER" with _ -> 5. *. maximum_airspeed *. weight
let roll_neutral_default = try rad_of_deg (float_value infrared_section "ROLL_NEUTRAL_DEFAULT") with _ -> 0.
let pitch_neutral_default = try rad_of_deg (float_value infrared_section "PITCH_NEUTRAL_DEFAULT") with _ -> 0.
let roll_neutral_default = try float_value infrared_section "ROLL_NEUTRAL_DEFAULT" with _ -> 0.
let pitch_neutral_default = try float_value infrared_section "PITCH_NEUTRAL_DEFAULT" with _ -> 0.
let vert_ctrl_section = try section "VERTICAL CONTROL" with _ -> Xml.Element("",[],[])