Commit 697a3e01 authored by TASTE User's avatar TASTE User
Browse files

add tm[1,10]

parent 97d8689b
This diff is collapsed.
......@@ -12,10 +12,9 @@ Taps DEFINITIONS ::= BEGIN
reserved NULL [pattern '0'B],
duration-exp-value []
}
TC-2-1 []
TC-2-4 []
TYPE8b-ID[encoding pos-int, size 8]
TC-2-1 []
TC-2-4 []
TCs <TYPE8b-ID: tc-type, TYPE8b-ID: tc-subtype> [] {
tc2-1 [present-when tc-type==2 tc-subtype==1],
tc2-4 [present-when tc-type==2 tc-subtype==4]
......@@ -43,6 +42,11 @@ Taps DEFINITIONS ::= BEGIN
spare-tc NULL [pattern '00000000'B], -- TBD !!!
packet-error []
}
TM-1-10 []
TMs <TYPE8b-ID: tm-type, TYPE8b-ID: tm-subtype> [] {
tm1-10 [present-when tm-type==1 tm-subtype==10]
}
TM[]{
packet-version-no NULL [pattern '000'B],
packet-type NULL [pattern '0'B], -- 1 for TC, 0 for TM
......@@ -54,12 +58,25 @@ Taps DEFINITIONS ::= BEGIN
secondary-header [] {
packet-version-number NULL [pattern '0010'B],
time-reference-status [],
--service-type-id TYPE8b-ID [],
--service-subtype-id TYPE8b-ID [],
service-type-id TYPE8b-ID [],
service-subtype-id TYPE8b-ID [],
message-type-counter [],
destination-id []
}
},
source-data <secondary-header.service-type-id, secondary-header.service-subtype-id> [],
spare-tm NULL [pattern '00000000'B], -- TBD !!!
packet-error []
}
TM-1-10-failure-codes [encoding pos-int, encode-values, size 8]
Request-ID-inst[]{
packet-version-no NULL [pattern '000'B],
packet-type NULL [pattern '1'B], -- 1 for TC, 0 for TM
has-secondary-hdr NULL [pattern '1'B], -- !!! 0 for cpdu packets
source-apid [],
sequence-flags NULL [pattern '11'B],
sequence-count []
}
END
TASTE-Dataview DEFINITIONS ::= BEGIN
......
......@@ -9,11 +9,13 @@ TC-type {APID, APUserID, TCs} ::= SEQUENCE {
packet-error INTEGER(0..65535)
}
TM-type {APID, APUserID} ::= SEQUENCE {
TM-type {APID, APUserID, TMs} ::= SEQUENCE {
source-apid APID,
sequence-count INTEGER(0..16383),
packet-length INTEGER(0..65535),
secondary-header TM-Secondary-Header{APUserID}
secondary-header TM-Secondary-Header{APUserID},
source-data TMs,
packet-error INTEGER(0..65535)
}
TC-Secondary-Header {APUserID} ::= SEQUENCE {
......@@ -58,6 +60,26 @@ Distribute-CPDU-Commands { CPDU-Cmd, INTEGER:max-Cpdu-Cmds } ::= SEQUENCE (SIZE
END
-- Generic definition for Request verification service TM
Request-Verification-Reports DEFINITIONS ::=
BEGIN
Request-ID {APID}::= SEQUENCE {
source-apid APID,
sequence-count INTEGER(0..16383)
}
Failure-Notice{Failure-Code, Failure-Data} ::= SEQUENCE {
code Failure-Code,
data Failure-Data
}
TM-1-type1 {Request-ID, Failure-Notice} ::= SEQUENCE {
req-ID Request-ID,
fail-Notice Failure-Notice
}
END
Taps DEFINITIONS ::=
BEGIN
IMPORTS Pulse-Instruction,
......@@ -66,6 +88,10 @@ IMPORTS Pulse-Instruction,
FROM Distribute-CPDU-Commands-Generic
On-Off-Device-Command
FROM Distribute-On-Off-Device-Commands-Generic
Request-ID,
Failure-Notice,
TM-1-type1
FROM Request-Verification-Reports
TC-type,
TM-type
FROM PUS-Implicit-Knowledge;
......@@ -131,8 +157,30 @@ TCs ::= CHOICE {
-- Instantiate the generic TC-type
Telecommand ::= TC-type{APID, APUserID, TCs}
-- Instantiate the request ID
Request-ID-inst ::= Request-ID {APID}
-- TM-1-10-failure-codes , ACN manage the "8 bits" constraint
TM-1-10-failure-codes ::= ENUMERATED {
reqIntegrityFailure(0),
noDestinationFound(1),
destinationNotReady(2)
}
-- TM-1-10 failure notice data, 8 bits
TM-1-10-failure-data ::= SEQUENCE {
tm-1-10-failure-data-inst INTEGER (0..255)
}
Failure-Notice-tm-1-10 ::= Failure-Notice {TM-1-10-failure-codes, TM-1-10-failure-data}
TM-1-10 ::= TM-1-type1 {Request-ID-inst, Failure-Notice-tm-1-10}
-- Instantiate the project list of TM
TMs ::= CHOICE {
tm1-10 TM-1-10
}
-- Instantiate the Telemetry type
TM ::= TM-type{APID, APUserID}
TM ::= TM-type{APID, APUserID, TMs}
END
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment