Commit c089c75b authored by Maxime Perrotin's avatar Maxime Perrotin

more fixed on ACN model of Daemo_BA

parent c3d25e83
......@@ -265,7 +265,14 @@ T-PUS-tc-sp[]
source-id []
},
userDataField <secondaryHeader.serviceType, secondaryHeader.messageSubtype>[],
userDataField [] {
tc-3-5-enable-hk [present-when secondaryHeader.serviceType == 3 secondaryHeader.messageSubtype == 5 ],
tc-3-6-disable-hk [present-when secondaryHeader.serviceType == 3 secondaryHeader.messageSubtype == 6 ],
tc-20-1-request-parameter [present-when secondaryHeader.serviceType == 20 secondaryHeader.messageSubtype == 1 ],
tc-20-3-set-parameter [present-when secondaryHeader.serviceType == 20 secondaryHeader.messageSubtype == 3 ],
tc-128-1-get-mode [present-when secondaryHeader.serviceType == 128 secondaryHeader.messageSubtype == 1 ],
tc-128-3-set-mode [present-when secondaryHeader.serviceType == 128 secondaryHeader.messageSubtype == 3 ]
},
crc []
}
......@@ -281,7 +288,17 @@ T-PUS-tm-sp[]
destination-id [],
time []
},
userDataField <secondaryHeader.serviceType, secondaryHeader.messageSubtype>[],
userDataField [] {
tm-1-1-acc-success [present-when secondaryHeader.serviceType == 1 secondaryHeader.messageSubtype == 1 ],
tm-1-2-acc-failure [present-when secondaryHeader.serviceType == 1 secondaryHeader.messageSubtype == 2 ],
tm-1-7-exec-success [present-when secondaryHeader.serviceType == 1 secondaryHeader.messageSubtype == 7 ],
tm-1-8-exec-failure [present-when secondaryHeader.serviceType == 1 secondaryHeader.messageSubtype == 8 ],
tm-3-25-hk-report [present-when secondaryHeader.serviceType == 3 secondaryHeader.messageSubtype == 25],
tm-20-2-parameter-report [present-when secondaryHeader.serviceType == 20 secondaryHeader.messageSubtype == 2 ],
tm-20-4-parameter-set-ack [present-when secondaryHeader.serviceType == 20 secondaryHeader.messageSubtype == 4 ],
tm-128-2-mode-report [present-when secondaryHeader.serviceType == 128 secondaryHeader.messageSubtype == 2 ],
tm-128-4-mode-set-ack [present-when secondaryHeader.serviceType == 128 secondaryHeader.messageSubtype == 4 ]
},
crc []
}
......@@ -297,15 +314,7 @@ T-PUS-tc-sourceId [size 16, encoding pos-int, encode-values]
-- Telecommand user data field
-------------------------------
T-PUS-tc-userDataField<TASTE-BasicTypes.T-UInt8:pusType, TASTE-BasicTypes.T-UInt8:pusSubType> []
{
tc-3-5-enable-hk [present-when pusType== 3 pusSubType== 5 ],
tc-3-6-disable-hk [present-when pusType== 3 pusSubType== 6 ],
tc-20-1-request-parameter [present-when pusType== 20 pusSubType== 1 ],
tc-20-3-set-parameter [present-when pusType== 20 pusSubType== 3 ],
tc-128-1-get-mode [present-when pusType== 128 pusSubType== 1 ],
tc-128-3-set-mode [present-when pusType== 128 pusSubType== 3 ]
}
T-PUS-tc-userDataField []
T-PUS-tc-request-parameter[]
T-PUS-tc-set-parameter[]
......@@ -329,19 +338,7 @@ T-PUS-tm-destId [size 16, encoding pos-int, encode-values]
-- Telemetry user data field
-------------------------------
T-PUS-tm-userDataField<TASTE-BasicTypes.T-UInt8:pusType, TASTE-BasicTypes.T-UInt8:pusSubType> []
{
tm-1-1-acc-success [present-when pusType== 1 pusSubType== 1 ],
tm-1-2-acc-failure [present-when pusType== 1 pusSubType== 2 ],
tm-1-7-exec-success [present-when pusType== 1 pusSubType== 7 ],
tm-1-8-exec-failure [present-when pusType== 1 pusSubType== 8 ],
tm-3-25-hk-report [present-when pusType== 3 pusSubType== 25],
tm-20-2-parameter-report [present-when pusType== 20 pusSubType== 2 ],
tm-20-4-parameter-set-ack [present-when pusType== 20 pusSubType== 4 ],
tm-128-2-mode-report [present-when pusType== 128 pusSubType== 2 ],
tm-128-4-mode-set-ack [present-when pusType== 128 pusSubType== 4 ]
}
T-PUS-tm-userDataField []
T-PUS-tc-enable-hk []
T-PUS-tc-disable-hk []
......
Markdown is supported
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