Commit 4bdc66bd authored by Daniel Tonoiu's avatar Daniel Tonoiu
Browse files

HK service: HK data model, add/del/query/fetch/ HK definitions, change...

HK service: HK data model, add/del/query/fetch/ HK definitions, change collection interval, enable/disable HK periodic status
parent 7136a34c
This diff is collapsed.
...@@ -17,7 +17,14 @@ Taps DEFINITIONS ::= BEGIN ...@@ -17,7 +17,14 @@ Taps DEFINITIONS ::= BEGIN
TC-2-4 [] TC-2-4 []
TCs <TYPE8b-ID: tc-type, TYPE8b-ID: tc-subtype> [] { TCs <TYPE8b-ID: tc-type, TYPE8b-ID: tc-subtype> [] {
tc2-1 [present-when tc-type==2 tc-subtype==1], tc2-1 [present-when tc-type==2 tc-subtype==1],
tc2-4 [present-when tc-type==2 tc-subtype==4] tc2-4 [present-when tc-type==2 tc-subtype==4],
tc3-1 [present-when tc-type==3 tc-subtype==1],
tc3-3 [present-when tc-type==3 tc-subtype==3],
tc3-5 [present-when tc-type==3 tc-subtype==5],
tc3-6 [present-when tc-type==3 tc-subtype==6],
tc3-9 [present-when tc-type==3 tc-subtype==9],
tc3-27 [present-when tc-type==3 tc-subtype==27],
tc3-31 [present-when tc-type==3 tc-subtype==31]
} }
Telecommand[]{ Telecommand[]{
...@@ -61,7 +68,9 @@ Taps DEFINITIONS ::= BEGIN ...@@ -61,7 +68,9 @@ Taps DEFINITIONS ::= BEGIN
tm1-6 [present-when tm-type==1 tm-subtype==6], tm1-6 [present-when tm-type==1 tm-subtype==6],
tm1-7 [present-when tm-type==1 tm-subtype==7], tm1-7 [present-when tm-type==1 tm-subtype==7],
tm1-8 [present-when tm-type==1 tm-subtype==8], tm1-8 [present-when tm-type==1 tm-subtype==8],
tm1-10 [present-when tm-type==1 tm-subtype==10] tm1-10 [present-when tm-type==1 tm-subtype==10],
tm3-10 [present-when tm-type==3 tm-subtype==10],
tm3-25 [present-when tm-type==3 tm-subtype==25]
} }
TM[]{ TM[]{
packet-version-no NULL [pattern '000'B], packet-version-no NULL [pattern '000'B],
......
...@@ -80,6 +80,46 @@ TM-1-type1 {Request-ID, Failure-Notice} ::= SEQUENCE { ...@@ -80,6 +80,46 @@ TM-1-type1 {Request-ID, Failure-Notice} ::= SEQUENCE {
} }
END END
-- Generic definition of HK service
HK-Service-Structures DEFINITIONS ::=
BEGIN
Super-HK-Sets{INTEGER: nfa-max, Super-HK-Parameter-Set} ::= SEQUENCE (SIZE (0..nfa-max)) OF Super-HK-Parameter-Set
Simply-HK-IDs{INTEGER: n1-max, Simply-HK-Parameter-ID} ::= SEQUENCE (SIZE (1..n1-max)) OF Simply-HK-Parameter-ID
-- the super commutated HK parameter set IDs
Super-HK-Parameter-Set{INTEGER: n2-max, Super-HK-Parameter-ID} ::= SEQUENCE (SIZE (1..n2-max)) OF Super-HK-Parameter-ID
-- TC[3,1] create HK parameter report structure
Build-HK-Structure{HK-structure-ID, Collection-Interval, INTEGER: n1-max, Simply-HK-Parameter-ID, INTEGER: nfa-max, Super-HK-Parameter-Set} ::= SEQUENCE {
hk-struct-id HK-structure-ID,
collection-int Collection-Interval,
hk-parameter-ids Simply-HK-IDs{n1-max, Simply-HK-Parameter-ID},
super-hk-sets Super-HK-Sets{nfa-max, Super-HK-Parameter-Set}
}
-- wrap up the HK report definition
HK-Report-Structure {HK-structure-ID, Collection-Interval, INTEGER: n1-max, Simply-HK-Parameter-ID, INTEGER: nfa-max, Super-HK-Parameter-Set} ::= SEQUENCE {
hk-struct-id HK-structure-ID,
periodic-status BOOLEAN OPTIONAL,
collection-int Collection-Interval,
hk-parameter-ids Simply-HK-IDs{n1-max, Simply-HK-Parameter-ID},
super-hk-sets Super-HK-Sets{nfa-max, Super-HK-Parameter-Set}
}
-- Manage HK structure: enable/disable periodic generation & delete, report HK structures
Manage-HK-Structures{INTEGER: max-Instr-No, HK-structure-ID} ::= SEQUENCE (SIZE (1..max-Instr-No)) OF HK-structure-ID
-- Change the collection interval of HK parameter report structures
HK-CollectionInterval{HK-Structure-ID, Collection-Interval} ::= SEQUENCE {
hk-struct-id HK-Structure-ID,
collection-int Collection-Interval
}
Change-HK-CollectionInterval{INTEGER: max-Instr-No, HK-CollectionInterval} ::= SEQUENCE (SIZE (1..max-Instr-No)) OF HK-CollectionInterval
-- TM[3,25] housekeeping parameter report
HK-Parameter-Report{HK-Structure-ID, Parameter-Value, INTEGER: no-Of-ParamValues} ::= SEQUENCE {
hk-report-structure-id HK-Structure-ID,
paramValue SEQUENCE (SIZE (1..no-Of-ParamValues)) OF Parameter-Value
}
END
Taps DEFINITIONS ::= Taps DEFINITIONS ::=
BEGIN BEGIN
IMPORTS Pulse-Instruction, IMPORTS Pulse-Instruction,
...@@ -94,7 +134,15 @@ FROM Distribute-On-Off-Device-Commands-Generic ...@@ -94,7 +134,15 @@ FROM Distribute-On-Off-Device-Commands-Generic
FROM Request-Verification-Reports FROM Request-Verification-Reports
TC-type, TC-type,
TM-type TM-type
FROM PUS-Implicit-Knowledge; FROM PUS-Implicit-Knowledge
Super-HK-Parameter-Set,
Build-HK-Structure,
HK-Report-Structure,
Manage-HK-Structures,
Change-HK-CollectionInterval,
HK-CollectionInterval,
HK-Parameter-Report
FROM HK-Service-Structures;
-- for acn TC packet secondary header type & subtype -- for acn TC packet secondary header type & subtype
TYPE8b-ID ::= INTEGER (0..255) TYPE8b-ID ::= INTEGER (0..255)
...@@ -152,14 +200,92 @@ Index-CPDU-Cmd ::= INTEGER (1..max-CPDU-Cmds) ...@@ -152,14 +200,92 @@ Index-CPDU-Cmd ::= INTEGER (1..max-CPDU-Cmds)
CPDU-Cmd ::= CPDU-Command {CPDU-Ids, Pulse-Instr-Instance, max-Instr-No} CPDU-Cmd ::= CPDU-Command {CPDU-Ids, Pulse-Instr-Instance, max-Instr-No}
(WITH COMPONENTS {..., cpdu-id PRESENT}) (WITH COMPONENTS {..., cpdu-id PRESENT})
-- Instantiate the TC-2-4 -- Instantiate the TC-2-4
TC-2-4 ::= Distribute-CPDU-Commands {CPDU-Cmd, max-CPDU-Cmds} TC-2-4 ::= Distribute-CPDU-Commands {CPDU-Cmd, max-CPDU-Cmds}
---------------------------------------------------------------------------------------------------------------------------------------------
-- instantiate HK service data structures
-- collection interval parameter, units of MSI - minimum sampling interval
max-CollectionInterval INTEGER (1..256) ::= 100
msi INTEGER(1..256) ::= 1 -- the minimum sampling interval
Collection-Interval-Inst ::= INTEGER(msi..max-CollectionInterval)
-- N1 - the number of simply commutated HK parameters
n1-simply-HK INTEGER(0..255) ::= 2
-- N2 - the number of super commutated HK parameters
n2-super-HK INTEGER(0..255) ::= 2
-- the maximum no. of HK parameter report structures: (N1 * N2) -1 ; N1 or N2 can be zero but not both of them; the no of sets can also vary
maxNo-HK-structures INTEGER(0..255) ::= 8
HK-def-Counter ::= INTEGER (1..maxNo-HK-structures)
-- nfa-max: the maximum no. of HK supercommutated parameters sets
nfa-max-inst INTEGER(0..255) ::= n2-super-HK -- a super commutated HK parameter must be unique in a HK structure definition
--nfa-max-inst ::= INTEGER(msi..max-CollectionInterval )
-- the HK parameter report structure ID
--HK-structure-ID-inst ::= INTEGER(0..255)
HK-structure-ID-inst ::= ENUMERATED { x0y1(0), x0y2(1), x1y0(2), x1y1(3), x1y2(4), x2y0(5), x2y1(6), x2y2(7)}
-- the HK simply commutated HK parameters IDs enumeration
Simply-HK-Parameters-IDs-inst ::= ENUMERATED {cpdu1-ID(1), cpdu2-ID(2)}
-- the HK simply commutated HK parameters IDs enumeration
Super-HK-Parameters-IDs-inst ::= ENUMERATED{s1-ID(3), s2-ID(4)}
-- Instantiate the super commutated HK parameter set IDs
Super-HK-Parameter-Set-Inst ::= Super-HK-Parameter-Set{n2-super-HK, Super-HK-Parameters-IDs-inst}
-- Instantiate the TC-3-1 create HK parameter report structures
TC-3-1 ::= Build-HK-Structure{HK-structure-ID-inst, Collection-Interval-Inst, n1-simply-HK, Simply-HK-Parameters-IDs-inst , nfa-max-inst, Super-HK-Parameter-Set-Inst }
-- Instantiate the HK Report definition
HK-Report-Structure-inst ::= HK-Report-Structure{HK-structure-ID-inst, Collection-Interval-Inst, n1-simply-HK, Simply-HK-Parameters-IDs-inst , nfa-max-inst, Super-HK-Parameter-Set-Inst}
-- Instantiate the TC-3-3 to delete housekeeping parameter report structures
TC-3-3 ::= Manage-HK-Structures{maxNo-HK-structures, HK-structure-ID-inst}
-- Instantiate the TC-3-5 to enable the periodic generation of housekeeping parameter reports
TC-3-5 ::= Manage-HK-Structures{maxNo-HK-structures, HK-structure-ID-inst}
-- Instantiate the TC-3-6 to disable the periodic generation of housekeeping parameter reports
TC-3-6 ::= Manage-HK-Structures{maxNo-HK-structures, HK-structure-ID-inst}
-- Instantiate the TC-3-9 to report housekeeping parameter report structures
TC-3-9 ::= Manage-HK-Structures{maxNo-HK-structures, HK-structure-ID-inst}
-- Instantiate the TC-3-27 to generate a one shot report for housekeeping parameter report structures
TC-3-27 ::= Manage-HK-Structures{maxNo-HK-structures, HK-structure-ID-inst}
-- Instantiate the TC-3-31 to modify the collection interval of housekeeping parameter report structures
HK-CollectionInterval-Inst ::= HK-CollectionInterval{HK-structure-ID-inst, Collection-Interval-Inst}
TC-3-31 ::= Change-HK-CollectionInterval{maxNo-HK-structures, HK-CollectionInterval-Inst}
-- instantiate the TM[3,10] housekeeping parameter report structure report
TM-3-10 ::= HK-Report-Structure{HK-structure-ID-inst, Collection-Interval-Inst, n1-simply-HK, Simply-HK-Parameters-IDs-inst , nfa-max-inst, Super-HK-Parameter-Set-Inst } (WITH COMPONENTS {..., periodic-status PRESENT})
-- instantiate TM[3,25] housekeeping parameter report
Parameter-Value-inst ::= ENUMERATED { on, off, s1v1, s1v2, s1v3, s2v1, s2v2, s2v3}
no-Of-ParamValues INTEGER ::= 8
TM-3-25 ::= HK-Parameter-Report{HK-structure-ID-inst , Parameter-Value-inst, no-Of-ParamValues }
CPDU-status ::= ENUMERATED {
off(0),
on(1)
}
-- sensor1 output values
Sensor1-Output ::= ENUMERATED {
s1v1(0),
s1v2(1),
s1v3(2)
}
-- sensor2 output values
Sensor2-Output ::= ENUMERATED {
s2v1(0),
s2v2(1),
s2v3(2)
}
-------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------
-- Instantiate the project list of TC -- Instantiate the project list of TC
TCs ::= CHOICE { TCs ::= CHOICE {
tc2-1 TC-2-1, tc2-1 TC-2-1,
tc2-4 TC-2-4 tc2-4 TC-2-4,
tc3-1 TC-3-1,
tc3-3 TC-3-3,
tc3-5 TC-3-5,
tc3-6 TC-3-6,
tc3-9 TC-3-9,
tc3-27 TC-3-27,
tc3-31 TC-3-31
} }
-- Instantiate the generic TC-type -- Instantiate the generic TC-type
...@@ -168,7 +294,10 @@ Telecommand ::= TC-type{APID, SEQ-COUNT, APUserID, TCs} ...@@ -168,7 +294,10 @@ Telecommand ::= TC-type{APID, SEQ-COUNT, APUserID, TCs}
-- Execution reporting data types -- Execution reporting data types
Start-Exec-failure-codes ::= ENUMERATED { Start-Exec-failure-codes ::= ENUMERATED {
noFailure(0), noFailure(0),
startExecFailed(1) startExecFailed(1),
hk-def-already-present(2),
hk-def-not-present(3),
hk-def-enabled(4)
} }
Progress-Exec-failure-codes ::= ENUMERATED { Progress-Exec-failure-codes ::= ENUMERATED {
noFailure(0), noFailure(0),
...@@ -258,7 +387,9 @@ TMs ::= CHOICE { ...@@ -258,7 +387,9 @@ TMs ::= CHOICE {
tm1-6 TM-1-6, tm1-6 TM-1-6,
tm1-7 TM-1-7, tm1-7 TM-1-7,
tm1-8 TM-1-8, tm1-8 TM-1-8,
tm1-10 TM-1-10 tm1-10 TM-1-10,
tm3-10 TM-3-10,
tm3-25 TM-3-25
} }
-- Instantiate the Telemetry type -- Instantiate the Telemetry type
TM ::= TM-type{APID, APUserID, TMs} TM ::= TM-type{APID, APUserID, TMs}
...@@ -267,7 +398,10 @@ END ...@@ -267,7 +398,10 @@ END
TASTE-Dataview DEFINITIONS ::= TASTE-Dataview DEFINITIONS ::=
BEGIN BEGIN
IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes; IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean
FROM TASTE-BasicTypes
CPDU-status
FROM Taps;
Secondary-Header {APID} ::= SEQUENCE { Secondary-Header {APID} ::= SEQUENCE {
source-id APID source-id APID
...@@ -288,7 +422,9 @@ Test-failureCodes ::= ENUMERATED {crcFailure, destinationNotFound, destinationNo ...@@ -288,7 +422,9 @@ Test-failureCodes ::= ENUMERATED {crcFailure, destinationNotFound, destinationNo
Test-Taps-Parameters ::= CHOICE { Test-Taps-Parameters ::= CHOICE {
testST01Routing ST01RoutingTestParams, testST01Routing ST01RoutingTestParams,
testST01Acceptance ST01AcceptanceTestParams, testST01Acceptance ST01AcceptanceTestParams,
testST01Execution ST01ExecutionTestParams testST01Execution ST01ExecutionTestParams,
testCPDU1status CPDU-status,
testCPDU2status CPDU-status
} }
ST01AcceptanceTestParams ::= SEQUENCE{ ST01AcceptanceTestParams ::= SEQUENCE{
...@@ -364,6 +500,40 @@ END ...@@ -364,6 +500,40 @@ END
......
...@@ -36,10 +36,13 @@ WITH interfaceview::IV::cpdu1_AP::cpdu1_cmds; ...@@ -36,10 +36,13 @@ WITH interfaceview::IV::cpdu1_AP::cpdu1_cmds;
WITH interfaceview::IV::cpdu1_AP::execution_cpdu1; WITH interfaceview::IV::cpdu1_AP::execution_cpdu1;
WITH interfaceview::IV::cpdu1_AP::tm_cpdu1; WITH interfaceview::IV::cpdu1_AP::tm_cpdu1;
WITH interfaceview::IV::cpdu1_AP::cpdu1; WITH interfaceview::IV::cpdu1_AP::cpdu1;
WITH interfaceview::IV::hk_report_AP::acceptance_hp; WITH interfaceview::IV::hk_report_AP::acceptance_hk;
WITH interfaceview::IV::hk_report_AP::hk_service; WITH interfaceview::IV::hk_report_AP::hk_service;
WITH interfaceview::IV::hk_report_AP::execution_hp; WITH interfaceview::IV::hk_report_AP::execution_hk;
WITH interfaceview::IV::hk_report_AP::tm_hp; WITH interfaceview::IV::hk_report_AP::tm_hk;
WITH interfaceview::IV::hk_report_AP::hk_definitions;
WITH interfaceview::IV::sensor1;
WITH interfaceview::IV::cpdu2;
WITH ocarina_processors_x86; WITH ocarina_processors_x86;
WITH deploymentview::DV::Node1; WITH deploymentview::DV::Node1;
WITH Taste; WITH Taste;
...@@ -93,20 +96,29 @@ SUBCOMPONENTS ...@@ -93,20 +96,29 @@ SUBCOMPONENTS
IV_cpdu1 : SYSTEM interfaceview::IV::cpdu1_AP::cpdu1::cpdu1.others { IV_cpdu1 : SYSTEM interfaceview::IV::cpdu1_AP::cpdu1::cpdu1.others {
Taste::FunctionName => "cpdu1"; Taste::FunctionName => "cpdu1";
}; };
IV_acceptance_hp : SYSTEM interfaceview::IV::hk_report_AP::acceptance_hp::acceptance_hp.others { IV_acceptance_hk : SYSTEM interfaceview::IV::hk_report_AP::acceptance_hk::acceptance_hk.others {
Taste::FunctionName => "acceptance_hp"; Taste::FunctionName => "acceptance_hk";
}; };
IV_hk_service : SYSTEM interfaceview::IV::hk_report_AP::hk_service::hk_service.others { IV_hk_service : SYSTEM interfaceview::IV::hk_report_AP::hk_service::hk_service.others {
Taste::FunctionName => "hk_service"; Taste::FunctionName => "hk_service";
}; };
IV_execution_hp : SYSTEM interfaceview::IV::hk_report_AP::execution_hp::execution_hp.others { IV_execution_hk : SYSTEM interfaceview::IV::hk_report_AP::execution_hk::execution_hk.others {
Taste::FunctionName => "execution_hp"; Taste::FunctionName => "execution_hk";
}; };
IV_tm_hp : SYSTEM interfaceview::IV::hk_report_AP::tm_hp::tm_hp.others { IV_tm_hk : SYSTEM interfaceview::IV::hk_report_AP::tm_hk::tm_hk.others {
Taste::FunctionName => "tm_hp"; Taste::FunctionName => "tm_hk";
};
IV_hk_definitions : SYSTEM interfaceview::IV::hk_report_AP::hk_definitions::hk_definitions.others {
Taste::FunctionName => "hk_definitions";
};
IV_sensor1 : SYSTEM interfaceview::IV::sensor1::sensor1.others {
Taste::FunctionName => "sensor1";
};
IV_cpdu2 : SYSTEM interfaceview::IV::cpdu2::cpdu2.others {
Taste::FunctionName => "cpdu2";
}; };
taps : PROCESS deploymentview::DV::Node1::taps.others { taps : PROCESS deploymentview::DV::Node1::taps.others {
Taste::coordinates => "80770 67036 174706 102404"; Taste::coordinates => "85474 64572 179410 99940";
Deployment::Port_Number => 0; Deployment::Port_Number => 0;
}; };
x86_linux : PROCESSOR ocarina_processors_x86::x86.linux { x86_linux : PROCESSOR ocarina_processors_x86::x86.linux {
...@@ -127,10 +139,13 @@ PROPERTIES ...@@ -127,10 +139,13 @@ PROPERTIES
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_cpdu1; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_cpdu1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_cpdu1; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_cpdu1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu1; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_hp; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_hk;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_service; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_service;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_hp; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_hk;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_hp; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_hk;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_definitions;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sensor1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu2;
Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO taps; Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO taps;
END Node1.others; END Node1.others;
......
This diff is collapsed.
39887974ab1f9b767961c0abd26459ab InterfaceView.aadl 8c0215caf6e72f70b1f844529c6e199a InterfaceView.aadl
...@@ -80,20 +80,29 @@ SUBCOMPONENTS ...@@ -80,20 +80,29 @@ SUBCOMPONENTS
IV_cpdu1 : SYSTEM interfaceview::IV::cpdu1_AP::cpdu1.others { IV_cpdu1 : SYSTEM interfaceview::IV::cpdu1_AP::cpdu1.others {
Taste::FunctionName => "cpdu1"; Taste::FunctionName => "cpdu1";
}; };
IV_acceptance_hp : SYSTEM interfaceview::IV::hk_report_AP::acceptance_hp.others { IV_acceptance_hk : SYSTEM interfaceview::IV::hk_report_AP::acceptance_hk.others {
Taste::FunctionName => "acceptance_hp"; Taste::FunctionName => "acceptance_hk";
}; };
IV_hk_service : SYSTEM interfaceview::IV::hk_report_AP::hk_service.others { IV_hk_service : SYSTEM interfaceview::IV::hk_report_AP::hk_service.others {
Taste::FunctionName => "hk_service"; Taste::FunctionName => "hk_service";
}; };
IV_execution_hp : SYSTEM interfaceview::IV::hk_report_AP::execution_hp.others { IV_execution_hk : SYSTEM interfaceview::IV::hk_report_AP::execution_hk.others {
Taste::FunctionName => "execution_hp"; Taste::FunctionName => "execution_hk";
}; };
IV_tm_hp : SYSTEM interfaceview::IV::hk_report_AP::tm_hp.others { IV_tm_hk : SYSTEM interfaceview::IV::hk_report_AP::tm_hk.others {
Taste::FunctionName => "tm_hp"; Taste::FunctionName => "tm_hk";
};
IV_hk_definitions : SYSTEM interfaceview::IV::hk_report_AP::hk_definitions.others {
Taste::FunctionName => "hk_definitions";
};
IV_sensor1 : SYSTEM interfaceview::IV::sensor1.others {
Taste::FunctionName => "sensor1";
};
IV_cpdu2 : SYSTEM interfaceview::IV::cpdu2.others {
Taste::FunctionName => "cpdu2";
}; };
taps : PROCESS deploymentview::DV::Node1::taps.others { taps : PROCESS deploymentview::DV::Node1::taps.others {
Taste::coordinates => "80770 67036 174706 102404"; Taste::coordinates => "85474 64572 179410 99940";
Deployment::Port_Number => 0; Deployment::Port_Number => 0;
}; };
x86_linux : PROCESSOR ocarina_processors_x86::x86.linux { x86_linux : PROCESSOR ocarina_processors_x86::x86.linux {
...@@ -114,10 +123,13 @@ PROPERTIES ...@@ -114,10 +123,13 @@ PROPERTIES
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_cpdu1; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_cpdu1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_cpdu1; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_cpdu1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu1; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_hp; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_acceptance_hk;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_service; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_service;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_hp; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_execution_hk;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_hp; Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_tm_hk;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_hk_definitions;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_sensor1;
Taste::APLC_Binding => (reference (taps)) APPLIES TO IV_cpdu2;
Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO taps; Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO taps;
END Node1.others; END Node1.others;
......
This diff is collapsed.
...@@ -73,10 +73,138 @@ CPDU_Cmd ::= SEQUENCE { ...@@ -73,10 +73,138 @@ CPDU_Cmd ::= SEQUENCE {
-- ./dataview-uniq.asn -- ./dataview-uniq.asn
TC_2_4 ::= SEQUENCE (SIZE (1 .. 2)) OF CPDU_Cmd TC_2_4 ::= SEQUENCE (SIZE (1 .. 2)) OF CPDU_Cmd
-- ./dataview-uniq.asn
Collection_Interval_Inst ::= INTEGER (1 .. 100)
-- ./dataview-uniq.asn
HK_def_Counter ::= INTEGER (1 .. 8)
-- ./dataview-uniq.asn
HK_structure_ID_inst ::= ENUMERATED {
x0y1(0),
x0y2(1),
x1y0(2),
x1y1(3),
x1y2(4),
x2y0(5),
x2y1(6),
x2y2(7)
}
-- ./dataview-uniq.asn
Simply_HK_Parameters_IDs_inst ::= ENUMERATED {
cpdu1_ID(1),
cpdu2_ID(2)
}
-- ./dataview-uniq.asn
Super_HK_Parameters_IDs_inst ::= ENUMERATED {
s1_ID(3),
s2_ID(4)
}
-- ./dataview-uniq.asn
Super_HK_Parameter_Set_Inst ::= SEQUENCE (SIZE (1 .. 2)) OF Super_HK_Parameters_IDs_inst
-- ./dataview-uniq.asn
TC_3_1 ::= SEQUENCE {
hk_struct_id HK_structure_ID_inst,
collection_int Collection_Interval_Inst,
hk_parameter_ids TC_3_1_hk_parameter_ids,
super_hk_sets TC_3_1_super_hk_sets
}
-- ./dataview-uniq.asn
HK_Report_Structure_inst ::= SEQUENCE {
hk_struct_id HK_structure_ID_inst,
periodic_status BOOLEAN OPTIONAL,
collection_int Collection_Interval_Inst,
hk_parameter_ids HK_Report_Structure_inst_hk_parameter_ids,
super_hk_sets HK_Report_Structure_inst_super_hk_sets
}
-- ./dataview-uniq.asn
TC_3_3 ::= SEQUENCE (SIZE (1 .. 8)) OF HK_structure_ID_inst
-- ./dataview-uniq.asn
TC_3_5 ::= SEQUENCE (SIZE (1 .. 8)) OF HK_structure_ID_inst
-- ./dataview-uniq.asn
TC_3_6 ::= SEQUENCE (SIZE (1 .. 8)) OF HK_structure_ID_inst
-- ./dataview-uniq.asn
TC_3_9 ::= SEQUENCE (SIZE (1 .. 8)) OF HK_structure_ID_inst
-- ./dataview-uniq.asn
TC_3_27 ::= SEQUENCE (SIZE (1 .. 8)) OF HK_structure_ID_inst
-- ./dataview-uniq.asn
HK_CollectionInterval_Inst ::= SEQUENCE {
hk_struct_id HK_structure_ID_inst,
collection_int Collection_Interval_Inst
}
-- ./dataview-uniq.asn
TC_3_31 ::= SEQUENCE (SIZE (1 .. 8)) OF HK_CollectionInterval_Inst
-- ./dataview-uniq.asn
TM_3_10 ::= SEQUENCE {
hk_struct_id HK_structure_ID_inst,
periodic_status BOOLEAN OPTIONAL,
collection_int Collection_Interval_Inst,
hk_parameter_ids TM_3_10_hk_parameter_ids,
super_hk_sets TM_3_10_super_hk_sets
}
-- ./dataview-uniq.asn
Parameter_Value_inst ::= ENUMERATED {
on(0),
off(1),
s1v1(2),
s1v2(3),
s1v3(4),
s2v1(5),
s2v2(6),
s2v3(7)
}
-- ./dataview-uniq.asn
TM_3_25 ::= SEQUENCE {
hk_report_structure_id HK_structure_ID_inst,
paramValue TM_3_25_paramValue
}
-- ./dataview-uniq.asn
CPDU_status ::= ENUMERATED {
off(0),
on(1)
}
-- ./dataview-uniq.asn
Sensor1_Output ::= ENUMERATED {
s1v1(0),
s1v2(1),
s1v3(2)
}
-- ./dataview-uniq.asn
Sensor2_Output ::= ENUMERATED {
s2v1(0),
s2v2(1),
s2v3(2)
}
-- ./dataview-uniq.asn -- ./dataview-uniq.asn
TCs ::= CHOICE { TCs ::= CHOICE {
tc2_1 TC_2_1, tc2_1 TC_2_1,
tc2_4 TC_2_4 tc2_4 TC_2_4,
tc3_1 TC_3_1,
tc3_3 TC_3_3,
tc3_5 TC_3_5,
tc3_6 TC_3_6,
tc3_9 TC_3_9,
tc3_27 TC_3_27,
tc3_31 TC_3_31
} }
-- ./dataview-uniq.asn -- ./dataview-uniq.asn
...@@ -92,7 +220,10 @@ Telecommand ::= SEQUENCE { ...@@ -92,7 +220,10 @@ Telecommand ::= SEQUENCE {
-- ./dataview-uniq.asn -- ./dataview-uniq.asn
Start_Exec_failure_codes ::= ENUMERATED { Start_Exec_failure_codes ::= ENUMERATED {
noFailure(0), noFailure(0),
startExecFailed(1) startExecFailed(1),
hk_def_already_present(2),
hk_def_not_present(3),
hk_def_enabled(4)
} }
-- ./dataview-uniq.asn -- ./dataview-uniq.asn
...@@ -262,7 +393,9 @@ TMs ::= CHOICE { ...@@ -262,7 +393,9 @@ TMs ::= CHOICE {
tm1_6 TM_1_6, tm1_6 TM_1_6,
tm1_7 TM_1_7, tm1_7 TM_1_7,
tm1_8 TM_1_8, tm1_8 TM_1_8,
tm1_10 TM_1_10 tm1_10 TM_1_10,
tm3_10 TM_3_10,
tm3_25 TM_3_25