Skip to content
GitLab
Commit f98b632e authored by Daniel Tonoiu's avatar Daniel Tonoiu
Browse files

implement the On-board storage st[15] and the Parameter management st[20] services

parent e6875230
Hide whitespace changes
Inline Side-by-side
DataView.aadl
View file @ f98b632e
This source diff could not be displayed because it is too large. You can view the blob instead.
DataView.acn
View file @ f98b632e
......@@ -88,7 +88,9 @@ Taps DEFINITIONS ::= BEGIN
time-management <pus-subtype> [present-when pus-type == 9],
time-scheduling <pus-subtype> [present-when pus-type == 11],
on-board-monitoring <pus-subtype> [present-when pus-type == 12],
event-action <pus-subtype> [present-when pus-type == 19]
storage-and-retrieval <pus-subtype> [present-when pus-type == 15],
event-action <pus-subtype> [present-when pus-type == 19],
param-management <pus-subtype> [present-when pus-type == 20]
}
PUS-ev-action <INTEGER: pus-type, INTEGER: pus-subtype> [] {
......@@ -142,6 +144,15 @@ Taps DEFINITIONS ::= BEGIN
pus-12-15-enable-func [present-when pus-subtype == 15],
pus-12-16-disable-func [present-when pus-subtype == 16]
}
PUS-15 <INTEGER: pus-subtype> [] {
pus-15-1-enable-storing [present-when pus-subtype == 1],
pus-15-2-disable-storing [present-when pus-subtype == 2],
pus-15-3-add-report-type [present-when pus-subtype == 3],
pus-15-4-del-report-type [present-when pus-subtype == 4],
pus-15-14-change-open-time [present-when pus-subtype == 14],
pus-15-15-resume-open-retrieval [present-when pus-subtype == 15],
pus-15-16-suspend-open-retrieval [present-when pus-subtype == 16]
}
PUS-19 <INTEGER: pus-subtype> [] {
pus-19-1-add-defs [present-when pus-subtype == 1],
pus-19-3-del-defs [present-when pus-subtype == 3],
......@@ -150,7 +161,14 @@ Taps DEFINITIONS ::= BEGIN
pus-19-8-enable-funct [present-when pus-subtype == 8],
pus-19-9-disable-funct [present-when pus-subtype == 9]
}
PUS-20 <INTEGER: pus-subtype> [] {
pus-20-1-report-params [present-when pus-subtype == 1],
pus-20-3-set-params [present-when pus-subtype == 3]
}
PTC-1-PFC-8[encoding pos-int, size 8]
PTC-3-PFC-14[encoding pos-int, size 32]
TM-1-1 []
TM-1-2 []
TM-1-3 []
......@@ -179,7 +197,8 @@ Taps DEFINITIONS ::= BEGIN
tm6-6 [present-when tm-type==6 tm-subtype==6],
tm11-13 [present-when tm-type==11 tm-subtype==13],
tm12-12 [present-when tm-type==12 tm-subtype==12],
tm12-14 [present-when tm-type==12 tm-subtype==14]
tm12-14 [present-when tm-type==12 tm-subtype==14],
tm20-2 [present-when tm-type==20 tm-subtype==2]
}
TM[]{
packet-version-no NULL [pattern '000'B],
......
DataView.asn
View file @ f98b632e
......@@ -364,6 +364,53 @@ BEGIN
END
--************************************************************************************************************************************************ ST[15]
-- Generic definitions for the On-board storage and retrieval service ST[20] service
On-Board-Storage-Structures DEFINITIONS ::=
BEGIN
-- the packet store definition
Packet-Store{Spacecraft-Time, TM-List} ::= SEQUENCE {
open-retrival-start-time Spacecraft-Time,
open-retrival-status ENUMERATED {suspended, in-progress},
packet-store-status ENUMERATED {enabled, disabled},
tm-packets TM-List
}
-- the list of TM packets
TM-List{INTEGER: max-TM-size, TM-packet} ::= SEQUENCE ( SIZE(0 .. max-TM-size) ) OF TM-packet
-- change the open retrieval start time tag of packet stores - TC[15,14]
Change-OR-Time {SC-Time, Packet-Store-IDs} ::= SEQUENCE {
start-time-tag SC-Time,
stores-ID Packet-Store-IDs
}
-- the packet stores ID list
Packet-Store-IDs {INTEGER: max-Stores, Store-ID} ::= SEQUENCE ( SIZE(0 .. max-Stores) ) OF Store-ID
-- list of application process storage control definitions (APSCD)
Storage-Control-Configuration{INTEGER: max-SC-defs, AP-Storage-Control-Def} ::= SEQUENCE ( SIZE(0 .. max-SC-defs) ) OF AP-Storage-Control-Def
-- the application process storage-control definition
AP-Storage-Control-Def{Packet-Store-ID, APID, Service-Type-SCD-List} ::= SEQUENCE {
stores-ID Packet-Store-ID,
controlled-APID APID,
service-SCD-list Service-Type-SCD-List
}
-- the service type storage-control definitions list
Service-Type-SCD-List{INTEGER: max-Service-defs, Service-Type-SCD} ::= SEQUENCE ( SIZE(0 .. max-Service-defs) ) OF Service-Type-SCD
-- the service type storage-control definition
Service-Type-SCD{Service-ID, Report-Type-SCD-List} ::= SEQUENCE {
service-type-ID Service-ID,
report-SCD-list Report-Type-SCD-List
}
-- the report type storage-control definitions list
Report-Type-SCD-List{INTEGER: max-Report-defs, Report-Type-ID} ::= SEQUENCE ( SIZE(0 .. max-Report-defs) ) OF Report-Type-ID
-- add report types to the application process storage-control configuration - TC[15,3]
Add-Rep-Types{Packet-Store-ID, Service-Type-SCD-List} ::= SEQUENCE {
stores-ID Packet-Store-ID,
service-SCD-list Service-Type-SCD-List
}
END
--************************************************************************************************************************************************* ST[19]
-- Generic definitions for the Event-Action ST[19] service
......@@ -399,6 +446,30 @@ BEGIN
Delete-Ev-Act-Defs ::= SEQUENCE {}
END
--************************************************************************************************************************************************ ST[20]
-- Generic definitions for the Parameter management service ST[20] service
Parameter-Management-Structures DEFINITIONS ::=
BEGIN
-- the parameter definition: ID, address, packet type code, packet format code
Parameter-Definition {Parameter-ID, Address} ::= SEQUENCE {
param-id Parameter-ID,
param-addr Address,
param-PTC INTEGER(1..12),
param-PFC INTEGER(0..64)
}
-- the list of parameter definitions
Param-Def-List {INTEGER: defs-No, Parameter-Definition} ::= SEQUENCE ( SIZE(defs-No) ) OF Parameter-Definition
-- the request to report the values of the monitored parameters. - TC[20,1]
Report-Params {INTEGER: max-Params-No, Parameter-ID} ::= SEQUENCE ( SIZE(1 .. max-Params-No) ) OF Parameter-ID
-- declare a parameters value report - TM[20,2], TC[20,3]
Param-Value-List{INTEGER: max-defs-No, Param-Value-Notification} ::= SEQUENCE ( SIZE(1 .. max-defs-No) ) OF Param-Value-Notification
-- the parameter value notification
Param-Value-Notification {Param-ID, Param-Value} ::= SEQUENCE {
id Param-ID,
value Param-Value
}
END
--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Taps DEFINITIONS ::=
BEGIN
......@@ -429,9 +500,16 @@ FROM Time-Based-Sched-Structures
PMON-exp-value-check-status, PMON-limit-check-status, Report-Def-Status-TC,
Enable-Param-Monitor-Func, Disable-Param-Monitor-Func
FROM Parameter-Monitoring-Structures
Packet-Store, TM-List, Change-OR-Time, Packet-Store-IDs, Storage-Control-Configuration,
AP-Storage-Control-Def, Service-Type-SCD-List, Service-Type-SCD, Report-Type-SCD-List,
Add-Rep-Types
FROM On-Board-Storage-Structures
Event-Action-Definition, Enable-Ev-Action-Funct, Disable-Ev-Action-Funct, Control-Ev-Action-Def,
Ev-Def-System-ID, Ev-Action-Def-List, Delete-Ev-Act-Defs
FROM Event-Action-Structures
Parameter-Definition, Param-Def-List, Report-Params, Param-Value-List,
Param-Value-Notification
FROM Parameter-Management-Structures
T-UInt8, T-UInt32
FROM TASTE-BasicTypes;
......@@ -497,7 +575,8 @@ On-board-params-IDs::= ENUMERATED { s1-vcc(5), s1-stat(6) }
hk-param-duplicated(5), ev-act-list-full(6), ev-act-def-enabled(7), ev-act-ID-notFound(8), sch-act-list-full(9),
sch-act-too-late(10), load-raw-mem-failure(11), dump-mem-write-only(12), length-exceeds-packet-max-size(13),
dump-mem-outside-range(14), start-addr-not-aligned(15), data-length-not-aligned(16), length-exceeds-mem-size(17),
failed-mem-scrabbing(18), abort-dumping(19)
failed-mem-scrabbing(18), abort-dumping(19), invalid-time(20), open-retrieval-in-progress(21), service-SCD-list-full(22),
report-SCD-list-full(23), storage-already-enabled(24), reportID-not-found(25)
}
Progress-Exec-failure-codes ::= ENUMERATED {
noFailure(0),
......@@ -712,18 +791,17 @@ maxEventNoInst Events-No-Inst ::= maxEventsNo
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ST[06] inst
-- instantiate the Memory management service ST[06] service data structures
-- instantiate the on board memory data structure
On-Board-Memory-inst ::= On-Board-Memory{Memory-ID-inst, Memory-Size-inst, Address-inst}
Memory-ID-inst ::= ENUMERATED { m-1, m-2 }
Memory-Size-inst ::= INTEGER(1 .. 4294967296)
On-Board-Memory-inst ::= On-Board-Memory{Memory-ID-inst, Memory-Size-inst, Address-inst}
Address-inst ::= INTEGER(1 .. 4294967295)
-- instantiate the list of the on-board memories
On-Board-Memory-List-inst ::= On-Board-Memory-List{on-Board-Memories-No, On-Board-Memory-inst}
-- the no of on-board memories
on-Board-Memories-No INTEGER(1..255) ::= 2
-- address the on-board memories
On-Board-Memories-Index ::= INTEGER(1..on-Board-Memories-No)
-- instantiate the list of the on-board memories
On-Board-Memory-List-inst ::= On-Board-Memory-List{on-Board-Memories-No, On-Board-Memory-inst}
-- declare the first on-board memory
memory-01 On-Board-Memory-inst ::= {id m-1, addr-Scheme absolute-addr, mem-align-constr 4, memory-size 2048, start-address 1024, allowed-op read-and-write, scrubbing TRUE, write-protection FALSE}
-- declare the first on-board memory
......@@ -731,19 +809,19 @@ maxEventNoInst Events-No-Inst ::= maxEventsNo
-- add the memories to the list
memory-List On-Board-Memory-List-inst ::= {memory-01, memory-02}
-- instantiate the load raw memory data instruction
Load-Raw-Data-Instr-inst ::= Load-Raw-Data-Instr{Address-inst, max-No-Of-Octets}
Address-inst ::= INTEGER(1 .. 4294967295)
max-No-Of-Octets INTEGER(1 .. 255) ::= 20
-- hold the instruction data length
Data-To-Load-Length ::= INTEGER(1..max-No-Of-Octets)
-- instantiate the load raw memory data instruction list
Load-Raw-Data-List-inst ::= Load-Raw-Data-List {max-Instr-No, Load-Raw-Data-Instr-inst}
max-Load-Instr-No INTEGER(1 .. 255) ::= 6
-- load instruction index
Load-Instr-Index ::= INTEGER (1..max-Load-Instr-No)
-- instantiate the load raw memory data tc[6,2]
Load-Raw-Memory ::= Load-Raw-Data{Memory-ID-inst, Load-Raw-Data-List-inst}
-- instantiate the load raw memory data instruction list
Load-Raw-Data-List-inst ::= Load-Raw-Data-List {max-Instr-No, Load-Raw-Data-Instr-inst}
max-Load-Instr-No INTEGER(1 .. 255) ::= 6
-- instantiate the load raw memory data instruction
Load-Raw-Data-Instr-inst ::= Load-Raw-Data-Instr{Address-inst, max-No-Of-Octets}
max-No-Of-Octets INTEGER(1 .. 255) ::= 20
-- instantiate the dump raw memory data tc[6,5]
Dump-Raw-Memory ::= Dump-Raw-Data{Memory-ID-inst, Dump-Raw-Data-List-inst }
......@@ -919,6 +997,80 @@ PUS-12 ::= CHOICE {
pus-12-16-disable-func Disable-Param-Monitor-Func
}
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ST[15] inst
-- instantiate the On-board storage and retrieval service ST[15] service data structures
-- instantiate the packet store using the data time structure from ST[09]
Packet-Store-inst ::= Packet-Store{CDS-Spacecraft-Time-inst, TM-List-inst}
-- instantiate the TM packet list
TM-List-inst ::= TM-List{ max-TM-size, TM}
-- the maximum size of the TM list
max-TM-size INTEGER(1 .. 255) ::= 3
-- packet store TM list index
Store-TM-index ::= INTEGER (1..max-TM-size)
-- enable the storage function of packet stores - TC[15,1]
Enable-Storing ::= Packet-Store-IDs{max-Stores-No, Store-ID-inst}
-- disable the storage function of packet stores - TC[15,2]
Disable-Storing ::= Packet-Store-IDs{max-Stores-No, Store-ID-inst}
-- instantiate the request to change the open retrieval start time tag of packet stores - TC[15,14]
Change-OR-Start-Time ::= Change-OR-Time{CDS-Spacecraft-Time-inst, Packet-Store-IDs-inst}
-- instantiate the packet stores ID list
Packet-Store-IDs-inst ::= Packet-Store-IDs{max-Stores-No, Store-ID-inst}
-- the maximum no. of packet stores
max-Stores-No INTEGER(1 .. 255) ::= 1
-- the packet stores IDs
Store-ID-inst ::= ENUMERATED {ps-1}
-- packet store index
Packet-Store-Index ::= INTEGER (1..max-Stores-No)
-- the request to resume the open retrieval of packet stores - TC[15,15]
Resume-Open-Retrieval ::= Packet-Store-IDs-inst
-- the request to suspend the open retrieval of packet stores - TC[15,16]
Suspend-Open-Retrieval ::= Packet-Store-IDs-inst
-- instantiate the list of application process storage control definitions (APSCD)
Storage-Control-Config-Inst ::= Storage-Control-Configuration{max-SC-defs, AP-Storage-Control-Def-Inst}
-- the maximum no. of application process storage control definitions
max-SC-defs INTEGER(1 .. 255) ::= 1
-- instantiate the application process storage-control definition
AP-Storage-Control-Def-Inst ::= AP-Storage-Control-Def{Store-ID-inst, APID, Service-Type-SCD-List-inst}
--instantiate the service type storage-control definitions list
Service-Type-SCD-List-inst ::= Service-Type-SCD-List{ max-Service-defs, Service-Type-SCD-inst}
-- the maximum no. of service type storage-control definitions
max-Service-defs INTEGER(1 .. 255) ::= 3
-- the service type storage-control definitions list index
Service-Type-Index ::= INTEGER (1..max-Service-defs )
-- instantiate the service type storage-control definition
Service-Type-SCD-inst ::= Service-Type-SCD{Service-ID-inst, Report-Type-SCD-List-inst}
-- the identifier of the service type to control
Service-ID-inst ::= ENUMERATED {request-verification, param-management, other}
-- instantiate the report type storage-control definitions list
Report-Type-SCD-List-inst ::= Report-Type-SCD-List{max-Report-defs, Report-Type-ID-inst}
-- the maximum no. of report type storage control definitions
max-Report-defs INTEGER(1 .. 255) ::= 2
-- the report type storage-control definitions list index
Report-Type-Index ::= INTEGER (1..max-Report-defs )
-- the message sub-type identifier of a report type
Report-Type-ID-inst ::= ENUMERATED { tm1-1, tm1-4, tm20-2, other}
-- instantiate the request to add report types to the application process storage-control configuration - TC[15,3]
Add-Report-Types ::= Add-Rep-Types{Store-ID-inst, Service-Type-SCD-List-inst}
-- instantiate the request to delete report types from the application process storage-control configuration - TC[15,4]
Delete-Report-Types ::= Add-Rep-Types{Store-ID-inst, Service-Type-SCD-List-inst}
-- select a service request
PUS-15 ::= CHOICE {
pus-15-1-enable-storing Enable-Storing,
pus-15-2-disable-storing Disable-Storing,
pus-15-3-add-report-type Add-Report-Types,
pus-15-4-del-report-type Delete-Report-Types,
pus-15-14-change-open-time Change-OR-Start-Time,
pus-15-15-resume-open-retrieval Resume-Open-Retrieval,
pus-15-16-suspend-open-retrieval Suspend-Open-Retrieval
}
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ST[19] inst
-- instantiate the Event-Action ST[19] service data structures
......@@ -956,6 +1108,44 @@ PUS-12 ::= CHOICE {
pus-19-8-enable-funct Enable-Ev-Action-Funct,
pus-19-9-disable-funct Disable-Ev-Action-Funct
}
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ST[20] inst
-- instantiate the Parameter management service ST[20] service data structures
-- instantiate the parameter definition
Parameter-Definition-inst ::= Parameter-Definition{ST20-Parameters-IDs, Address-inst}
-- list of parameter identifiers for which the ST[20] manages their definition
ST20-Parameters-IDs ::= ENUMERATED {param-ID-1, param-ID-2}
-- define the ST[20] parameters
test-Mode Parameter-Definition-inst ::= {param-id param-ID-1, param-addr 1024, param-PTC 1, param-PFC 8}
no-Of-Tests Parameter-Definition-inst ::= {param-id param-ID-2, param-addr 1032, param-PTC 3, param-PFC 14}
-- instantiate the list of parameter definitions
Param-Def-List-Inst ::= Param-Def-List{param-Defs-No, Parameter-Definition-inst}
-- the maximum no. of parameter definitions
param-Defs-No INTEGER(1 .. 255) ::= 2
-- report parameters instruction index
Report-Instr-Index ::= INTEGER (1..param-Defs-No)
-- define a list of parameter definitions
param-Defs-List Param-Def-List-Inst ::= {test-Mode, no-Of-Tests}
-- instantiate the request to report the values of the monitored parameters - TC[20,1]
Report-Parameters ::= Report-Params{param-Defs-No, ST20-Parameters-IDs}
-- instantiate the parameters value report - TM[20,2]
TM-20-2 ::= Param-Value-List{param-Defs-No, Param-Value-Notification-inst}
-- instantiate the parameter value notification
Param-Value-Notification-inst ::= Param-Value-Notification{ST20-Parameters-IDs, ST20-Param-Value}
-- define the managed parameters
ST20-Param-Value ::= CHOICE {
test-Mode PTC-1-PFC-8,
no-Of-Tests PTC-3-PFC-14
}
PTC-1-PFC-8 ::= BOOLEAN
PTC-3-PFC-14 ::= INTEGER(0..4294967295)
-- set parameter values - TC[20,3]
Set-Parameter-Values ::= Param-Value-List {param-Defs-No, Param-Value-Notification-inst}
-- select a service request
PUS-20 ::= CHOICE {
pus-20-1-report-params Report-Parameters,
pus-20-3-set-params Set-Parameter-Values
}
--------------------------------------------------------------------------------------------------------------------------------------------------
-- choose between one of the PUS services
PUS ::= CHOICE {
......@@ -965,7 +1155,9 @@ PUS-12 ::= CHOICE {
time-management PUS-9,
time-scheduling PUS-11,
on-board-monitoring PUS-12,
event-action PUS-19
storage-and-retrieval PUS-15,
event-action PUS-19,
param-management PUS-20
}
......@@ -993,7 +1185,8 @@ TMs ::= CHOICE {
tm6-6 TM-6-6,
tm11-13 TM-11-13,
tm12-12 TM-12-12,
tm12-14 TM-12-14
tm12-14 TM-12-14,
tm20-2 TM-20-2
}
-- Instantiate the Telemetry type
TM ::= TM-type{APID, APUserID, CDS-Spacecraft-Time-inst, TMs}
......@@ -1422,6 +1615,46 @@ END
......
DeploymentView.aadl
View file @ f98b632e
......@@ -72,6 +72,15 @@ WITH interfaceview::IV::memory_management_st06::execution_st06;
WITH interfaceview::IV::memory_management_st06::memory_01;
WITH interfaceview::IV::memory_management_st06::memory_02;
WITH interfaceview::IV::memory_management_st06::common_mem_management;
WITH interfaceview::IV::parameter_management_st20::acceptance_st20;
WITH interfaceview::IV::parameter_management_st20::tm_st20;
WITH interfaceview::IV::parameter_management_st20::data_pool_st20;
WITH interfaceview::IV::parameter_management_st20::parameter_management;
WITH interfaceview::IV::on_board_storage_st15::acceptance_st15;
WITH interfaceview::IV::on_board_storage_st15::packet_selection;
WITH interfaceview::IV::on_board_storage_st15::storage_retrieval;
WITH interfaceview::IV::on_board_storage_st15::execution_st15;
WITH interfaceview::IV::on_board_storage_st15::tm_st15;
WITH ocarina_processors_x86;
WITH deploymentview::DV::Node1;
WITH Taste;
......@@ -233,6 +242,33 @@ SUBCOMPONENTS
IV_common_mem_management : SYSTEM interfaceview::IV::memory_management_st06::common_mem_management::common_mem_management.others {
Taste::FunctionName => "common_mem_management";
};
IV_acceptance_st20 : SYSTEM interfaceview::IV::parameter_management_st20::acceptance_st20::acceptance_st20.others {
Taste::FunctionName => "acceptance_st20";
};
IV_tm_st20 : SYSTEM interfaceview::IV::parameter_management_st20::tm_st20::tm_st20.others {
Taste::FunctionName => "tm_st20";
};
IV_data_pool_st20 : SYSTEM interfaceview::IV::parameter_management_st20::data_pool_st20::data_pool_st20.others {
Taste::FunctionName => "data_pool_st20";
};
IV_parameter_management : SYSTEM interfaceview::IV::parameter_management_st20::parameter_management::parameter_management.others {
Taste::FunctionName => "parameter_management";
};
IV_acceptance_st15 : SYSTEM interfaceview::IV::on_board_storage_st15::acceptance_st15::acceptance_st15.others {
Taste::FunctionName => "acceptance_st15";
};
IV_packet_selection : SYSTEM interfaceview::IV::on_board_storage_st15::packet_selection::packet_selection.others {
Taste::FunctionName => "packet_selection";
};
IV_storage_retrieval : SYSTEM interfaceview::IV::on_board_storage_st15::storage_retrieval::storage_retrieval.others {
Taste::FunctionName => "storage_retrieval";
};
IV_execution_st15 : SYSTEM interfaceview::IV::on_board_storage_st15::execution_st15::execution_st15.others {
Taste::FunctionName => "execution_st15";
};
IV_tm_st15 : SYSTEM interfaceview::IV::on_board_storage_st15::tm_st15::tm_st15.others {
Taste::FunctionName => "tm_st15";
};
taps : PROCESS deploymentview::DV::Node1::taps.others {
Taste::coordinates => "85474 64572 179410 99940";
Deployment::Port_Number => 0;
......@@ -291,6 +327,15 @@ PROPERTIES
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_memory_01;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_memory_02;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_common_mem_management;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_st20;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_st20;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_data_pool_st20;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_parameter_management;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_st15;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_packet_selection;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_storage_retrieval;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_st15;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_st15;
Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO taps;
END Node1.others;
......@@ -309,6 +354,6 @@ PROPERTIES
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.0";
Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("/home/taste/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
Taste::HWLibraries => ("../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV;
InterfaceView.aadl
View file @ f98b632e
......@@ -800,19 +800,19 @@ WITH interfaceview::IV::payload::acceptance_cpdu1;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_tm
SUBPROGRAM PI_tm_report
FEATURES
TM : IN PARAMETER DataView::TM {
tm : IN PARAMETER DataView::TM {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_tm;
END PI_tm_report;
SUBPROGRAM IMPLEMENTATION PI_tm.others
SUBPROGRAM IMPLEMENTATION PI_tm_report.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_tm.others;
END PI_tm_report.others;
SUBPROGRAM PI_tm_time
FEATURES
......@@ -860,34 +860,34 @@ END RI_test_Payload.others;
SYSTEM ground_GUI
FEATURES
PI_tm : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::ground_system::ground_GUI::PI_tm.others {
Taste::coordinates => "62296 205143";
PI_tm_report : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::ground_system::ground_GUI::PI_tm_report.others {
Taste::coordinates => "62296 206423";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "tm";
Taste::InterfaceName => "tm_report";
};
PI_tm_time : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::ground_system::ground_GUI::PI_tm_time.others {
Taste::coordinates => "62296 207043";
Taste::coordinates => "62296 208323";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "tm_time";
};
RI_test : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::obsw_routing::PI_test.others {
Taste::coordinates => "66292 204009";
Taste::coordinates => "66292 205289";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "test";
Taste::labelInheritance => "true";
};
RI_tc_gui : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::ground_system::processTC::PI_tc_gui.others {
Taste::coordinates => "67392 206590";
Taste::coordinates => "67392 207870";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "tc_gui";
Taste::labelInheritance => "true";
};
RI_test_Payload : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::payload::acceptance_cpdu1::PI_test_Payload.others {
Taste::coordinates => "67392 204833";
Taste::coordinates => "67392 206113";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "test_Payload";
Taste::labelInheritance => "true";
......@@ -936,14 +936,14 @@ END RI_tc.others;
SYSTEM processTC
FEATURES
PI_tc_gui : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::ground_system::processTC::PI_tc_gui.others {
Taste::coordinates => "73550 205905";
Taste::coordinates => "73550 207185";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "tc_gui";
};
RI_tc : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sc_routing::PI_tc.others {
Taste::coordinates => "78692 206366";
Taste::coordinates => "78692 207646";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "tc";
Taste::labelInheritance => "true";
......@@ -969,19 +969,19 @@ WITH interfaceview::IV::payload::acceptance_cpdu1;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_tm
SUBPROGRAM PI_tm_report
FEATURES
TM : IN PARAMETER DataView::TM {
tm : IN PARAMETER DataView::TM {
Taste::encoding => NATIVE;
};
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_tm;
END PI_tm_report;
SUBPROGRAM IMPLEMENTATION PI_tm.others
SUBPROGRAM IMPLEMENTATION PI_tm_report.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_tm.others;
END PI_tm_report.others;
SUBPROGRAM PI_tm_time
FEATURES
......@@ -1029,34 +1029,34 @@ END RI_test_Payload.others;
SYSTEM ground_system
FEATURES
PI_tm : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::ground_system::ground_GUI::PI_tm.others {
Taste::coordinates => "59588 205121";
PI_tm_report : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::ground_system::ground_GUI::PI_tm_report.others {
Taste::coordinates => "59588 206913";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "tm";
Taste::InterfaceName => "tm_report";
};
PI_tm_time : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::ground_system::ground_GUI::PI_tm_time.others {
Taste::coordinates => "59588 207070";
Taste::coordinates => "59588 208350";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "tm_time";
};
RI_test : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::obsw_routing::PI_test.others {
Taste::coordinates => "65920 201010";
Taste::coordinates => "65920 202290";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "test";
Taste::labelInheritance => "true";
};
RI_tc : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::sc_routing::PI_tc.others {
Taste::coordinates => "80651 206354";
Taste::coordinates => "80651 207634";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "tc";
Taste::labelInheritance => "true";
};
RI_test_Payload : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::payload::acceptance_cpdu1::PI_test_Payload.others {
Taste::coordinates => "71796 201010";
Taste::coordinates => "71796 202290";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "test_Payload";
Taste::labelInheritance => "true";
......@@ -1069,29 +1069,29 @@ END ground_system;
SYSTEM IMPLEMENTATION ground_system.others
SUBCOMPONENTS
ground_GUI : SYSTEM interfaceview::IV::ground_system::ground_GUI::ground_GUI.others {
Taste::coordinates => "62296 204009 67392 207704";
Taste::coordinates => "62296 205289 67392 208984";
};
processTC : SYSTEM interfaceview::IV::ground_system::processTC::processTC.others {
Taste::coordinates => "73550 202745 78692 207459";
Taste::coordinates => "73550 204025 78692 208739";
};
CONNECTIONS
ground_GUI_PI_tm_ground_system_PI_tm : SUBPROGRAM ACCESS ground_GUI.PI_tm -> PI_tm {
Taste::coordinates => "59588 205121 60942 205121 60942 205143 62296 205143";
ground_GUI_PI_tm_report_ground_system_PI_tm_report : SUBPROGRAM ACCESS ground_GUI.PI_tm_report -> PI_tm_report {
Taste::coordinates => "59588 206913 60942 206913 60942 206423 62296 206423";
};
ground_GUI_PI_tm_time_ground_system_PI_tm_time : SUBPROGRAM ACCESS ground_GUI.PI_tm_time -> PI_tm_time {
Taste::coordinates => "59588 207070 60942 207070 60942 207043 62296 207043";
Taste::coordinates => "59588 208350 60942 208350 60942 208323 62296 208323";
};
ground_system_RI_test_ground_GUI_RI_test : SUBPROGRAM ACCESS RI_test -> ground_GUI.RI_test {
Taste::coordinates => "66292 204009 66292 202509 65920 202509 65920 201010";
Taste::coordinates => "66292 205289 66292 203789 65920 203789 65920 202290";
};
processTC_PI_tc_gui_ground_GUI_RI_tc_gui : SUBPROGRAM ACCESS processTC.PI_tc_gui -> ground_GUI.RI_tc_gui {
Taste::coordinates => "67392 206590 70471 206590 70471 205905 73550 205905";
Taste::coordinates => "67392 207870 70471 207870 70471 207185 73550 207185";
};
ground_system_RI_test_Payload_ground_GUI_RI_test_Payload : SUBPROGRAM ACCESS RI_test_Payload -> ground_GUI.RI_test_Payload {
Taste::coordinates => "67392 204833 69498 204833 69498 204820 71796 204820 71796 20