diff --git a/conf/settings/basic_infrared.xml b/conf/settings/basic_infrared.xml index c19cdc299c..116fd0aec5 100644 --- a/conf/settings/basic_infrared.xml +++ b/conf/settings/basic_infrared.xml @@ -27,7 +27,7 @@ - + diff --git a/sw/airborne/subsystems/sensors/infrared.c b/sw/airborne/subsystems/sensors/infrared.c index caa00a1b5d..89e39bd693 100644 --- a/sw/airborne/subsystems/sensors/infrared.c +++ b/sw/airborne/subsystems/sensors/infrared.c @@ -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; diff --git a/sw/simulator/flightModel.ml b/sw/simulator/flightModel.ml index ef516682d4..279a5f13f9 100644 --- a/sw/simulator/flightModel.ml +++ b/sw/simulator/flightModel.ml @@ -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("",[],[])