Take into account Rotactors and use the same type for energy sources

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

@@ -41,7 +41,13 @@ package MMS.F_PT.F_CM.Input is
    
    function USB_Key return Navigation_Parameters_Type
      renames MMS.F_PT.Input.USB_Key;
-
+   
+   function Rotactor_1 return Rotactor_Type
+     renames MMS.F_PT.Input.Rotactor_1;
+   
+   function Rotactor_2 return Rotactor_Type
+     renames MMS.F_PT.Input.Rotactor_2;
+   
    function P return Distance_Type
      renames MMS.F_PT.Input.P;
    

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

@@ -12,8 +12,8 @@ package MMS.F_PT.F_CM.Output is
          Mode       => MMS.F_PT.F_CM.Input.Mode_Switch,
          Bay        => MMS.F_PT.F_CM.Input.Bay_Switch,
          Start      => MMS.F_PT.F_CM.Input.Start_Push_Button,
-         Rotactor_1 => 1, --  ???
-         Rotactor_2 => 1)); --  ???
+         Rotactor_1 => MMS.F_PT.F_CM.Input.Rotactor_1,
+         Rotactor_2 => MMS.F_PT.F_CM.Input.Rotactor_2));
       
    function CP_Displays return CP_Displays_Type is
      (CP_Displays_Type'
@@ -26,8 +26,8 @@ package MMS.F_PT.F_CM.Output is
    
    function Propulsion_Energy return Propulsion_Energy_Type is
      (Propulsion_Energy_Type'
-        (Primary_Source_Capacity   => 1, -- ???
-         Secondary_Source_Capacity => 1)); -- ???
+        (Primary_Source_Capacity   => MMS.F_PT.F_CM.Input.Primary_Source,
+         Secondary_Source_Capacity => MMS.F_PT.F_CM.Input.Secondary_Source));
    
    function Mission_Cancelled return Boolean
      renames MMS.F_PT.F_CM.Input.Mission_Cancelled;

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-f_pt-input.ads

@@ -39,7 +39,13 @@ package MMS.F_PT.Input is
    
    function USB_Key return Navigation_Parameters_Type
      renames MMS.Input.USB_Key;
-
+   
+   function Rotactor_1 return Rotactor_Type
+     renames MMS.Input.Rotactor_1;
+   
+   function Rotactor_2 return Rotactor_Type
+     renames MMS.Input.Rotactor_2;
+   
    function P return Distance_Type
      renames MMS.Input.P;
    

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms-input.ads

@@ -30,6 +30,10 @@ package MMS.Input is
 
    function USB_Key return Navigation_Parameters_Type;
 
+   function Rotactor_1 return Rotactor_Type;
+
+   function Rotactor_2 return Rotactor_Type;
+
    -------------------------
    -- Physical Parameters --
    -------------------------

UseCaseDevelopment/Layer2_MMS_SW_SPARK/mms.ads

@@ -68,12 +68,10 @@ package MMS is
       Primary_Source   : Source_Type;
       Secondary_Source : Source_Type;
    end record;
-   
-   type Source_Capacity_Type is range 1 .. 99_999;
-   
+      
    type Propulsion_Energy_Type is record
-      Primary_Source_Capacity   : Source_Capacity_Type;
-      Secondary_Source_Capacity : Source_Capacity_Type;
+      Primary_Source_Capacity   : Source_Type;
+      Secondary_Source_Capacity : Source_Type;
    end record;
    
    type Torque_Type is delta 0.0001 range -10.0E6 .. 10.0E6; -- ???