Commit d3c468ec authored by Claire Dross's avatar Claire Dross

Layer2_MMS_SW_SPARK: update F_FC after answers on #28

parent 512eb5bc
...@@ -24,12 +24,13 @@ package body MMS.F_PT.F_FC.Behavior.Guarantees with SPARK_Mode is ...@@ -24,12 +24,13 @@ package body MMS.F_PT.F_FC.Behavior.Guarantees with SPARK_Mode is
Propulsion_Braking_Mutual_Exclusion; Propulsion_Braking_Mutual_Exclusion;
Reference_Trajectory_Computation; Reference_Trajectory_Computation;
Gain_Scheduling;
if Engine_State = PROPULSION then if Engine_State = PROPULSION then
Gain_Scheduling;
Propulsion_Control; Propulsion_Control;
State.Braking_Torque := 0.0; State.Braking_Torque := 0.0;
elsif Engine_State = BRAKING then elsif Engine_State = BRAKING then
Gain_Scheduling;
Braking_Control; Braking_Control;
State.Propulsion_Torque := 0.0; State.Propulsion_Torque := 0.0;
else else
......
...@@ -14,7 +14,7 @@ package MMS.F_PT.F_FC.Data with SPARK_Mode is ...@@ -14,7 +14,7 @@ package MMS.F_PT.F_FC.Data with SPARK_Mode is
Flight_Domain_Mesh : constant Flight_Domain_Mesh_Type (1 .. 100, 1 .. 100); -- ??? bounds Flight_Domain_Mesh : constant Flight_Domain_Mesh_Type (1 .. 100, 1 .. 100); -- ??? bounds
function Climb_Gains function Climb_Propulsion_Gains
(S : Flight_Speed_Center; (S : Flight_Speed_Center;
A : Flight_Altitude_Center; A : Flight_Altitude_Center;
M : Payload_Mass_Center) return Gain_Triple M : Payload_Mass_Center) return Gain_Triple
...@@ -23,7 +23,7 @@ package MMS.F_PT.F_FC.Data with SPARK_Mode is ...@@ -23,7 +23,7 @@ package MMS.F_PT.F_FC.Data with SPARK_Mode is
and then A in Flight_Domain_Mesh'Range (2) and then A in Flight_Domain_Mesh'Range (2)
and then M in MMS.F_PT.Data.Payload_Mass_Grid'Range; and then M in MMS.F_PT.Data.Payload_Mass_Grid'Range;
function Cruise_Gains function Cruise_Propulsion_Gains
(S : Flight_Speed_Center; (S : Flight_Speed_Center;
A : Flight_Altitude_Center; A : Flight_Altitude_Center;
M : Payload_Mass_Center) return Gain_Triple M : Payload_Mass_Center) return Gain_Triple
...@@ -32,7 +32,34 @@ package MMS.F_PT.F_FC.Data with SPARK_Mode is ...@@ -32,7 +32,34 @@ package MMS.F_PT.F_FC.Data with SPARK_Mode is
and then A in Flight_Domain_Mesh'Range (2) and then A in Flight_Domain_Mesh'Range (2)
and then M in MMS.F_PT.Data.Payload_Mass_Grid'Range; and then M in MMS.F_PT.Data.Payload_Mass_Grid'Range;
function Descent_Gains function Descent_Propulsion_Gains
(S : Flight_Speed_Center;
A : Flight_Altitude_Center;
M : Payload_Mass_Center) return Gain_Triple
with
Pre => S in Flight_Domain_Mesh'Range (1)
and then A in Flight_Domain_Mesh'Range (2)
and then M in MMS.F_PT.Data.Payload_Mass_Grid'Range;
function Climb_Braking_Gains
(S : Flight_Speed_Center;
A : Flight_Altitude_Center;
M : Payload_Mass_Center) return Gain_Triple
with
Pre => S in Flight_Domain_Mesh'Range (1)
and then A in Flight_Domain_Mesh'Range (2)
and then M in MMS.F_PT.Data.Payload_Mass_Grid'Range;
function Cruise_Braking_Gains
(S : Flight_Speed_Center;
A : Flight_Altitude_Center;
M : Payload_Mass_Center) return Gain_Triple
with
Pre => S in Flight_Domain_Mesh'Range (1)
and then A in Flight_Domain_Mesh'Range (2)
and then M in MMS.F_PT.Data.Payload_Mass_Grid'Range;
function Descent_Braking_Gains
(S : Flight_Speed_Center; (S : Flight_Speed_Center;
A : Flight_Altitude_Center; A : Flight_Altitude_Center;
M : Payload_Mass_Center) return Gain_Triple M : Payload_Mass_Center) return Gain_Triple
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment