diff --git a/Demo_Multi_Instances/deployment.pro b/Demo_Multi_Instances/deployment.pro index 521cf42d499eefe0de133568d958be80332a6336..a776626f43c59fea5e6f67245056d31a48ab3afb 100644 --- a/Demo_Multi_Instances/deployment.pro +++ b/Demo_Multi_Instances/deployment.pro @@ -39,7 +39,7 @@ isImportDeclaration('deploymentview::DV','PUBLIC','Deployment',''). isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::coordinates','"0 0 297000 210000"',''). isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::version','"1.3"',''). isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::interfaceView','"InterfaceView.aadl"',''). -isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::HWLibraries','("../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl")',''). +isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::HWLibraries','("../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl")',''). isComponentType('deploymentview::DV','PUBLIC','deploymentview','SYSTEM','NIL',''). isComponentImplementation('deploymentview::DV','PUBLIC','deploymentview','others','SYSTEM','NIL','others',''). isImportDeclaration('deploymentview::DV','PUBLIC','interfaceview::IV',''). diff --git a/Demo_Multi_Instances/function1/dataview-uniq.asn b/Demo_Multi_Instances/function1/dataview-uniq.asn index 4009db4e12dfa2c016eed10bac2c4556882cfa21..ee30cbfd0fda5c0f9daab9744a7797c5027b44f8 100644 --- a/Demo_Multi_Instances/function1/dataview-uniq.asn +++ b/Demo_Multi_Instances/function1/dataview-uniq.asn @@ -1,47 +1,3 @@ -TASTE-MONITORING DEFINITIONS AUTOMATIC TAGS ::= -BEGIN - -TASTE-Peek ::= SEQUENCE { - base-address INTEGER (0..4294967295), -- 32bits type - offset INTEGER (-2147483648..2147483647), - base-type ENUMERATED { int-32, int-64, real-single, real-double, octet-string }, - nb-of-elements INTEGER (1..10), -- nb-of-elements EXCEPT for octet-string (1 element) - sample-time INTEGER (0..15) -- in seconds -} - -TASTE-Peek-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Peek - -TASTE-Peek-id ::= INTEGER (0..4294967295) - -TASTE-Peek-id-list ::= SEQUENCE (SIZE (1..10)) OF TASTE-Peek-id - -TASTE-Monitoring-value ::= CHOICE { - int-32 INTEGER (-2147483648 .. 2147483647) , - int-64 INTEGER (-9223372036854775807 .. 9223372036854775807), - real-single REAL (-100000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000.0), - real-double REAL (-100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0), - octet-string OCTET STRING (SIZE (0..10)) -} - --- Result: memory value -TASTE-Monitoring ::= SEQUENCE { - id TASTE-Peek-id, - values SEQUENCE (SIZE (1..10)) OF TASTE-Monitoring-value -} - -TASTE-Monitoring-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Monitoring - -TASTE-Poke-list ::= TASTE-Monitoring-list - -empty-peek-list TASTE-Peek-list ::= {} -empty-poke-list TASTE-Poke-list ::= {} - --- Type to hold a maximum number of peek values (defined in a context parameter, thus patchable) -TASTE-Peek-limit ::= INTEGER (0..1000) -END - - - TASTE-Dataview DEFINITIONS ::= BEGIN IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes; diff --git a/Demo_Multi_Instances/function2/dataview-uniq.asn b/Demo_Multi_Instances/function2/dataview-uniq.asn index 4009db4e12dfa2c016eed10bac2c4556882cfa21..ee30cbfd0fda5c0f9daab9744a7797c5027b44f8 100644 --- a/Demo_Multi_Instances/function2/dataview-uniq.asn +++ b/Demo_Multi_Instances/function2/dataview-uniq.asn @@ -1,47 +1,3 @@ -TASTE-MONITORING DEFINITIONS AUTOMATIC TAGS ::= -BEGIN - -TASTE-Peek ::= SEQUENCE { - base-address INTEGER (0..4294967295), -- 32bits type - offset INTEGER (-2147483648..2147483647), - base-type ENUMERATED { int-32, int-64, real-single, real-double, octet-string }, - nb-of-elements INTEGER (1..10), -- nb-of-elements EXCEPT for octet-string (1 element) - sample-time INTEGER (0..15) -- in seconds -} - -TASTE-Peek-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Peek - -TASTE-Peek-id ::= INTEGER (0..4294967295) - -TASTE-Peek-id-list ::= SEQUENCE (SIZE (1..10)) OF TASTE-Peek-id - -TASTE-Monitoring-value ::= CHOICE { - int-32 INTEGER (-2147483648 .. 2147483647) , - int-64 INTEGER (-9223372036854775807 .. 9223372036854775807), - real-single REAL (-100000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000.0), - real-double REAL (-100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0), - octet-string OCTET STRING (SIZE (0..10)) -} - --- Result: memory value -TASTE-Monitoring ::= SEQUENCE { - id TASTE-Peek-id, - values SEQUENCE (SIZE (1..10)) OF TASTE-Monitoring-value -} - -TASTE-Monitoring-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Monitoring - -TASTE-Poke-list ::= TASTE-Monitoring-list - -empty-peek-list TASTE-Peek-list ::= {} -empty-poke-list TASTE-Poke-list ::= {} - --- Type to hold a maximum number of peek values (defined in a context parameter, thus patchable) -TASTE-Peek-limit ::= INTEGER (0..1000) -END - - - TASTE-Dataview DEFINITIONS ::= BEGIN IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes; diff --git a/Demo_Multi_Instances/function3/dataview-uniq.asn b/Demo_Multi_Instances/function3/dataview-uniq.asn index 4009db4e12dfa2c016eed10bac2c4556882cfa21..ee30cbfd0fda5c0f9daab9744a7797c5027b44f8 100644 --- a/Demo_Multi_Instances/function3/dataview-uniq.asn +++ b/Demo_Multi_Instances/function3/dataview-uniq.asn @@ -1,47 +1,3 @@ -TASTE-MONITORING DEFINITIONS AUTOMATIC TAGS ::= -BEGIN - -TASTE-Peek ::= SEQUENCE { - base-address INTEGER (0..4294967295), -- 32bits type - offset INTEGER (-2147483648..2147483647), - base-type ENUMERATED { int-32, int-64, real-single, real-double, octet-string }, - nb-of-elements INTEGER (1..10), -- nb-of-elements EXCEPT for octet-string (1 element) - sample-time INTEGER (0..15) -- in seconds -} - -TASTE-Peek-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Peek - -TASTE-Peek-id ::= INTEGER (0..4294967295) - -TASTE-Peek-id-list ::= SEQUENCE (SIZE (1..10)) OF TASTE-Peek-id - -TASTE-Monitoring-value ::= CHOICE { - int-32 INTEGER (-2147483648 .. 2147483647) , - int-64 INTEGER (-9223372036854775807 .. 9223372036854775807), - real-single REAL (-100000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000.0), - real-double REAL (-100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0), - octet-string OCTET STRING (SIZE (0..10)) -} - --- Result: memory value -TASTE-Monitoring ::= SEQUENCE { - id TASTE-Peek-id, - values SEQUENCE (SIZE (1..10)) OF TASTE-Monitoring-value -} - -TASTE-Monitoring-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Monitoring - -TASTE-Poke-list ::= TASTE-Monitoring-list - -empty-peek-list TASTE-Peek-list ::= {} -empty-poke-list TASTE-Poke-list ::= {} - --- Type to hold a maximum number of peek values (defined in a context parameter, thus patchable) -TASTE-Peek-limit ::= INTEGER (0..1000) -END - - - TASTE-Dataview DEFINITIONS ::= BEGIN IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes; diff --git a/Demo_Multi_Instances/generic_a/dataview-uniq.asn b/Demo_Multi_Instances/generic_a/dataview-uniq.asn index 4009db4e12dfa2c016eed10bac2c4556882cfa21..ee30cbfd0fda5c0f9daab9744a7797c5027b44f8 100644 --- a/Demo_Multi_Instances/generic_a/dataview-uniq.asn +++ b/Demo_Multi_Instances/generic_a/dataview-uniq.asn @@ -1,47 +1,3 @@ -TASTE-MONITORING DEFINITIONS AUTOMATIC TAGS ::= -BEGIN - -TASTE-Peek ::= SEQUENCE { - base-address INTEGER (0..4294967295), -- 32bits type - offset INTEGER (-2147483648..2147483647), - base-type ENUMERATED { int-32, int-64, real-single, real-double, octet-string }, - nb-of-elements INTEGER (1..10), -- nb-of-elements EXCEPT for octet-string (1 element) - sample-time INTEGER (0..15) -- in seconds -} - -TASTE-Peek-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Peek - -TASTE-Peek-id ::= INTEGER (0..4294967295) - -TASTE-Peek-id-list ::= SEQUENCE (SIZE (1..10)) OF TASTE-Peek-id - -TASTE-Monitoring-value ::= CHOICE { - int-32 INTEGER (-2147483648 .. 2147483647) , - int-64 INTEGER (-9223372036854775807 .. 9223372036854775807), - real-single REAL (-100000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000.0), - real-double REAL (-100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0 .. 100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0), - octet-string OCTET STRING (SIZE (0..10)) -} - --- Result: memory value -TASTE-Monitoring ::= SEQUENCE { - id TASTE-Peek-id, - values SEQUENCE (SIZE (1..10)) OF TASTE-Monitoring-value -} - -TASTE-Monitoring-list ::= SEQUENCE (SIZE (0..5)) OF TASTE-Monitoring - -TASTE-Poke-list ::= TASTE-Monitoring-list - -empty-peek-list TASTE-Peek-list ::= {} -empty-poke-list TASTE-Poke-list ::= {} - --- Type to hold a maximum number of peek values (defined in a context parameter, thus patchable) -TASTE-Peek-limit ::= INTEGER (0..1000) -END - - - TASTE-Dataview DEFINITIONS ::= BEGIN IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes;