Layer2_MMS_SW_SPARK: types for physical parameters

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt-f_cm-input.ads

@@ -54,7 +54,7 @@ package MMS.F_PT.F_CM.Input is
    function P_Dot return Speed_Type
      renames MMS.F_PT.Input.P_Dot;
    
-   function Q return Altitude_Type
+   function Q return Angle_Type
      renames MMS.F_PT.Input.Q;
    
    ---------------

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt-f_cm-output.ads

@@ -95,13 +95,10 @@ package MMS.F_PT.F_CM.Output is
    -- To F_FC --
    -------------
 
-   function P return Current_Range_Type;
-   --  From MMS.F_PT.F_CM.Input.P, conversion needed
+   function P return Distance_Type renames MMS.F_PT.F_CM.Input.P;
    
-   function P_Dot return Current_Speed_Type;
-   --  From MMS.F_PT.F_CM.Input.P_Dot, conversion needed
+   function P_Dot return Speed_Type renames MMS.F_PT.F_CM.Input.P_Dot;
    
-   function Q return Current_Altitude_Type;
-   --  From MMS.F_PT.F_CM.Input.Q, conversion needed
+   function Q return Angle_Type renames MMS.F_PT.F_CM.Input.Q;
    
 end MMS.F_PT.F_CM.Output;

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt-f_fc-behavior.ads

@@ -6,14 +6,14 @@ package MMS.F_PT.F_FC.Behavior is
    -- Inputs --
    ------------
 
-   function P return Current_Range_Type;
-   function P_Dot return Current_Speed_Type;
+   function P return Distance_Type;
+   function P_Dot return Speed_Type;
+   function Q return Angle_Type;
 
    ----------------------
    -- Estimated Values --
    ----------------------
 
-   function Q_Angle return Angle_Type;
    function Q_Dot return Angular_Speed_Type;
 
    ------------
@@ -34,13 +34,13 @@ package MMS.F_PT.F_FC.Behavior is
      (case Phase_State is
          when CLIMB   =>
             Q_Dot in MMS.F_PT.F_FC.Data.Qdot_MinCl .. MMS.F_PT.F_FC.Data.Qdot_MaxCl
-              and Q_Angle < MMS.F_PT.F_FC.Data.Q_MaxCl,
+              and Q < MMS.F_PT.F_FC.Data.Q_MaxCl,
          when CRUISE  =>
             Q_Dot in MMS.F_PT.F_FC.Data.Qdot_MinCr .. MMS.F_PT.F_FC.Data.Qdot_MaxCr
-              and Q_Angle > MMS.F_PT.F_FC.Data.Q_MinCr
+              and Q > MMS.F_PT.F_FC.Data.Q_MinCr
               and P_Dot < MMS.F_PT.F_FC.Data.Pdot_MaxCr,
          when DESCENT =>
             Q_Dot in MMS.F_PT.F_FC.Data.Qdot_MinDs .. MMS.F_PT.F_FC.Data.Qdot_MaxDs
-              and Q_Angle < MMS.F_PT.F_FC.Data.Q_MaxDs);
+              and Q < MMS.F_PT.F_FC.Data.Q_MaxDs);
 
 end MMS.F_PT.F_FC.Behavior;

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt-f_fc-data.ads

@@ -51,7 +51,7 @@ package MMS.F_PT.F_FC.Data is
    Qdot_MinCr : Angular_Speed_Type; --  in angle.s-1
    Qdot_MaxCr : Angular_Speed_Type; --  in angle.s-1
    Q_MinCr    : Angle_Type; --  in angle
-   Pdot_MaxCr : Current_Speed_Type; --  in km/h
+   Pdot_MaxCr : Speed_Type; --  in km/h
    Qdot_MinDs : Angular_Speed_Type; --  in angle.s-1
    Qdot_MaxDs : Angular_Speed_Type; --  in angle.s-1
    Q_MaxDs    : Angle_Type; --  in angle

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt-f_fc-input.ads

@@ -7,13 +7,13 @@ package MMS.F_PT.F_FC.Input is
    -- From F_CM --
    ---------------
 
-   function P return Current_Range_Type
+   function P return Distance_Type
      renames MMS.F_PT.F_CM.Output.P;
    
-   function P_Dot return Current_Speed_Type
+   function P_Dot return Speed_Type
      renames MMS.F_PT.F_CM.Output.P_Dot;
    
-   function Q return Current_Altitude_Type
+   function Q return Angle_Type
      renames MMS.F_PT.F_CM.Output.Q;
    
    function Payload_Mass return Payload_Mass_Type

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt-input.ads

@@ -52,7 +52,7 @@ package MMS.F_PT.Input is
    function P_Dot return Speed_Type
      renames MMS.Input.P_Dot;
    
-   function Q return Altitude_Type
+   function Q return Angle_Type
      renames MMS.Input.Q;
    
    ---------------

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt.ads

@@ -6,10 +6,6 @@ package MMS.F_PT is
    
    type Current_Altitude_Type is range -200 .. 1_000; -- in meters
    
-   type Angle_Type is new Float; -- in Angle bounds???
-   
-   type Angular_Speed_Type is new Float; -- in Angle.s-1 bounds???
-   
    type Estimated_Total_Mass_Type is delta 0.1 range 5.0 .. 10.0; -- in kg ???
    
    type Energy_Level_Type is range 0 .. 500; -- in kj

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-input.ads

@@ -42,6 +42,6 @@ package MMS.Input is
 
    function P_Dot return Speed_Type;
 
-   function Q return Altitude_Type;
+   function Q return Angle_Type;
 
 end MMS.Input;

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms.ads

@@ -41,11 +41,13 @@ package MMS is
    
    type Payload_Mass_Type is new Integer range 0 .. 98; -- in kg
 
-   type Distance_Type is new Float; -- in n.m
+   type Distance_Type is new Float; -- type of P, unit and bounds ???
    
-   type Speed_Type is new Float; -- in k.t
+   type Speed_Type is new Float; -- type of P_Dot, unit and bounds ???
    
-   type Altitude_Type is new Float; -- in ft
+   type Angle_Type is new Float; -- type of Q, unit and bounds ???
+   
+   type Angular_Speed_Type is new Float; -- type of Q_Dot, unit and bounds ???
    
    type Rotactor_Type is range 0 .. 9;