Merge branch 'master' of https://gitrepos.estec.esa.int/taste/regression-suites

.gitignore

@@ -123,3 +123,11 @@ Demo_Crazyflie_IMU/control_laws.zip
 Demo_Crazyflie_IMU/copter_imu.zip
 Demo_Crazyflie_IMU_Height/control_laws.zip
 Demo_Crazyflie_IMU_Height/copter_imu.zip
+*/__dv_1_3.aadl
+*/__iv_1_3.aadl
+*/deployment.pro
+*/interfaceview.pro
+Demo_ContextParams/cyclic_function.zip
+Demo_ContextParams/passive_function.zip
+Demo_SpaceWire_N2X/function1.zip
+Demo_SpaceWire_N2X/function2.zip

Demo-opengeode/build-script.sh

@@ -21,9 +21,6 @@ fi
 
 SKELS="./"
 
-# Update the data view with local paths
-taste-update-data-view || exit 1
-
 # Generate code for OpenGEODE function orchestrator
 cd "$SKELS"/orchestrator || exit 1
 opengeode --toAda orchestrator.pr system_structure.pr || exit 1

Demo_ABB/build-script.sh

@@ -14,8 +14,6 @@
 # Note: TASTE will not overwrite your changes - if you need to update some  parts
 #       you will have to merge the changes with the newly-created "build-script.new.sh" file.
 
-taste-update-data-view || exit 1
-
 rm -f lift_model.zip
 zip lift_model lift_model/*
 [ ! -z "$CLEANUP" ] && rm -rf binary

Demo_ACN/DataView.aadl

+--------------------------------------------------------
+--! File generated by asn2aadl v2.1.10: DO NOT EDIT !
+--------------------------------------------------------
+--! InputASN1FileChecksum:ea2bc8085f96189ce53191fc48545a34:DataView.asn:
+--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:../../misc/taste-common-types/taste-types.asn:
+--------------------------------------------------------
+
+package DataView
+
+public
+
+  with Data_Model;
+  with Taste;
+  with Base_Types;
+  with Deployment;
+
+DATA Simulink_Tunable_Parameter
+PROPERTIES
+   TASTE::Ada_Package_Name => "TASTE_Directives";
+   Type_Source_Name => "Simulink-Tunable-Parameter";
+   Deployment::ASN1_Module_Name => "TASTE-Directives";
+   TASTE::Forbid_in_PI => true;
+END Simulink_Tunable_Parameter;
+
+DATA Timer
+PROPERTIES
+   TASTE::Ada_Package_Name => "TASTE_Directives";
+   Type_Source_Name => "Timer";
+   Deployment::ASN1_Module_Name => "TASTE-Directives";
+   TASTE::Forbid_in_PI => true;
+END Timer;
+
+DATA Taste_directive
+PROPERTIES
+   TASTE::Ada_Package_Name => "TASTE_Directives";
+   Type_Source_Name => "Taste-directive";
+   Deployment::ASN1_Module_Name => "TASTE-Directives";
+   TASTE::Forbid_in_PI => true;
+END Taste_directive;
+
+data Stream_Element_Buffer
+    -- Root type for buffer elements
+properties
+    Data_Model::Data_Representation => Character;
+end Stream_Element_Buffer;
+DATA T_Int32
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Int32";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_Int32;
+
+DATA T_Int32_Buffer_Max
+END T_Int32_Buffer_Max;
+
+DATA IMPLEMENTATION T_Int32_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_Int32
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Int32_Buffer_Max.impl;
+
+DATA T_Int32_Buffer
+END T_Int32_Buffer;
+
+DATA IMPLEMENTATION T_Int32_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Int32
+SUBCOMPONENTS
+    Buffer : data T_Int32_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Int32_Buffer.impl;
+
+DATA T_UInt32
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-UInt32";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_UInt32;
+
+DATA T_UInt32_Buffer_Max
+END T_UInt32_Buffer_Max;
+
+DATA IMPLEMENTATION T_UInt32_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_UInt32
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_UInt32_Buffer_Max.impl;
+
+DATA T_UInt32_Buffer
+END T_UInt32_Buffer;
+
+DATA IMPLEMENTATION T_UInt32_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_UInt32
+SUBCOMPONENTS
+    Buffer : data T_UInt32_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_UInt32_Buffer.impl;
+
+DATA T_Int8
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Int8";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_Int8;
+
+DATA T_Int8_Buffer_Max
+END T_Int8_Buffer_Max;
+
+DATA IMPLEMENTATION T_Int8_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_Int8
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Int8_Buffer_Max.impl;
+
+DATA T_Int8_Buffer
+END T_Int8_Buffer;
+
+DATA IMPLEMENTATION T_Int8_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Int8
+SUBCOMPONENTS
+    Buffer : data T_Int8_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Int8_Buffer.impl;
+
+DATA T_Boolean
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 1; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Boolean";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aBOOLEAN;
+END T_Boolean;
+
+DATA T_Boolean_Buffer_Max
+END T_Boolean_Buffer_Max;
+
+DATA IMPLEMENTATION T_Boolean_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_Boolean
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Boolean_Buffer_Max.impl;
+
+DATA T_Boolean_Buffer
+END T_Boolean_Buffer;
+
+DATA IMPLEMENTATION T_Boolean_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Boolean
+SUBCOMPONENTS
+    Buffer : data T_Boolean_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Boolean_Buffer.impl;
+
+DATA T_POS
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("DataView.asn");
+    TASTE::EncodingDefinitionFile => classifier(DataView::ACN_DataView);
+    TASTE::Ada_Package_Name => "MY_MODULE";
+    Deployment::ASN1_Module_Name => "MY-MODULE";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 24; suggested aligned message buffer is...
+    Source_Data_Size => 24 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-POS";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aCHOICE;
+END T_POS;
+
+DATA T_POS_Buffer_Max
+END T_POS_Buffer_Max;
+
+DATA IMPLEMENTATION T_POS_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_POS
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (24); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_POS_Buffer_Max.impl;
+
+DATA T_POS_Buffer
+END T_POS_Buffer;
+
+DATA IMPLEMENTATION T_POS_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_POS
+SUBCOMPONENTS
+    Buffer : data T_POS_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_POS_Buffer.impl;
+
+DATA T_UInt8
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-UInt8";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_UInt8;
+
+DATA T_UInt8_Buffer_Max
+END T_UInt8_Buffer_Max;
+
+DATA IMPLEMENTATION T_UInt8_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_UInt8
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_UInt8_Buffer_Max.impl;
+
+DATA T_UInt8_Buffer
+END T_UInt8_Buffer;
+
+DATA IMPLEMENTATION T_UInt8_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_UInt8
+SUBCOMPONENTS
+    Buffer : data T_UInt8_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_UInt8_Buffer.impl;
+
+DATA ACN_DataView
+PROPERTIES
+    Source_Text => ("DataView.acn");
+    Source_Language => ACN;
+END ACN_DataView;
+
+end DataView;

Demo_ACN/build-script.sh

@@ -27,7 +27,6 @@ zip a a/*
 rm -f b.zip
 zip b b/*
 cd "$OLDPWD"
-taste-update-data-view
 [ ! -z "$CLEANUP" ] && rm -rf binary
 
 if [ -f ConcurrencyView.pro ]

Demo_Ada_GUI/DataView.aadl

+--------------------------------------------------------
+--! File generated by asn2aadl v2.1.10: DO NOT EDIT !
+--------------------------------------------------------
+--! InputASN1FileChecksum:be996e095b8fb10e3f12cbbb4e916e22:DataView.asn:
+--! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:../../misc/taste-common-types/taste-types.asn:
+--------------------------------------------------------
+
+package DataView
+
+public
+
+  with Data_Model;
+  with Taste;
+  with Base_Types;
+  with Deployment;
+
+DATA Simulink_Tunable_Parameter
+PROPERTIES
+   TASTE::Ada_Package_Name => "TASTE_Directives";
+   Type_Source_Name => "Simulink-Tunable-Parameter";
+   Deployment::ASN1_Module_Name => "TASTE-Directives";
+   TASTE::Forbid_in_PI => true;
+END Simulink_Tunable_Parameter;
+
+DATA Timer
+PROPERTIES
+   TASTE::Ada_Package_Name => "TASTE_Directives";
+   Type_Source_Name => "Timer";
+   Deployment::ASN1_Module_Name => "TASTE-Directives";
+   TASTE::Forbid_in_PI => true;
+END Timer;
+
+DATA Taste_directive
+PROPERTIES
+   TASTE::Ada_Package_Name => "TASTE_Directives";
+   Type_Source_Name => "Taste-directive";
+   Deployment::ASN1_Module_Name => "TASTE-Directives";
+   TASTE::Forbid_in_PI => true;
+END Taste_directive;
+
+data Stream_Element_Buffer
+    -- Root type for buffer elements
+properties
+    Data_Model::Data_Representation => Character;
+end Stream_Element_Buffer;
+DATA T_UInt32
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-UInt32";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_UInt32;
+
+DATA T_UInt32_Buffer_Max
+END T_UInt32_Buffer_Max;
+
+DATA IMPLEMENTATION T_UInt32_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_UInt32
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_UInt32_Buffer_Max.impl;
+
+DATA T_UInt32_Buffer
+END T_UInt32_Buffer;
+
+DATA IMPLEMENTATION T_UInt32_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_UInt32
+SUBCOMPONENTS
+    Buffer : data T_UInt32_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_UInt32_Buffer.impl;
+
+DATA T_Int8
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Int8";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aINTEGER;
+END T_Int8;
+
+DATA T_Int8_Buffer_Max
+END T_Int8_Buffer_Max;
+
+DATA IMPLEMENTATION T_Int8_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_Int8
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Int8_Buffer_Max.impl;
+
+DATA T_Int8_Buffer
+END T_Int8_Buffer;
+
+DATA IMPLEMENTATION T_Int8_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Int8
+SUBCOMPONENTS
+    Buffer : data T_Int8_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Int8_Buffer.impl;
+
+DATA Action_T
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("DataView.asn");
+    TASTE::Ada_Package_Name => "DataView";
+    Deployment::ASN1_Module_Name => "DataView";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 272; suggested aligned message buffer is...
+    Source_Data_Size => 272 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "Action-T";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aCHOICE;
+END Action_T;
+
+DATA Action_T_Buffer_Max
+END Action_T_Buffer_Max;
+
+DATA IMPLEMENTATION Action_T_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type Action_T
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (272); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END Action_T_Buffer_Max.impl;
+
+DATA Action_T_Buffer
+END Action_T_Buffer;
+
+DATA IMPLEMENTATION Action_T_Buffer.impl
+    -- Buffer to hold a marshalled data of type Action_T
+SUBCOMPONENTS
+    Buffer : data Action_T_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END Action_T_Buffer.impl;
+
+DATA T_Boolean
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("../../misc/taste-common-types/taste-types.asn");
+    TASTE::Ada_Package_Name => "TASTE_BasicTypes";
+    Deployment::ASN1_Module_Name => "TASTE-BasicTypes";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 1; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "T-Boolean";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aBOOLEAN;
+END T_Boolean;
+
+DATA T_Boolean_Buffer_Max
+END T_Boolean_Buffer_Max;
+
+DATA IMPLEMENTATION T_Boolean_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type T_Boolean
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END T_Boolean_Buffer_Max.impl;
+
+DATA T_Boolean_Buffer
+END T_Boolean_Buffer;
+
+DATA IMPLEMENTATION T_Boolean_Buffer.impl
+    -- Buffer to hold a marshalled data of type T_Boolean
+SUBCOMPONENTS
+    Buffer : data T_Boolean_Buffer_Max.impl;
+    Length : data Base_Types::Unsigned_32;
+PROPERTIES
+    Data_Model::Data_Representation => Struct;
+END T_Boolean_Buffer.impl;
+
+DATA TC_T
+PROPERTIES
+    -- name of the ASN.1 source file:
+    Source_Text => ("DataView.asn");
+    TASTE::Ada_Package_Name => "DataView";
+    Deployment::ASN1_Module_Name => "DataView";
+    Source_Language => ASN1;
+    -- Size of a buffer to cover all forms of message representation:
+    -- Real message size is 280; suggested aligned message buffer is...
+    Source_Data_Size => 280 Bytes;
+    -- name of the corresponding data type in the source file:
+    Type_Source_Name => "TC-T";
+    -- what kind of type is this?
+    TASTE::ASN1_Basic_Type =>aSEQUENCE;
+END TC_T;
+
+DATA TC_T_Buffer_Max
+END TC_T_Buffer_Max;
+
+DATA IMPLEMENTATION TC_T_Buffer_Max.impl
+    -- Buffer to hold a marshalled data of type TC_T
+PROPERTIES
+    Data_Model::Data_Representation => array;
+    Data_Model::Dimension => (280); -- Size of the buffer
+    Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
+END TC_T_Buffer_Max.impl;
+
+DATA TC_T_Buffer
+END TC_T_Buffer;
+