Commit d6869e99 authored by Maxime Perrotin's avatar Maxime Perrotin

Fix ACN model of Demo_BA

parent 9ef3658a
...@@ -254,7 +254,17 @@ T-PUS-timestamp [] ...@@ -254,7 +254,17 @@ T-PUS-timestamp []
T-PUS-tc-sp[] T-PUS-tc-sp[]
{ {
primaryHeader [], primaryHeader [],
secondaryHeader [], secondaryHeader [] {
packetPusVersion NULL [pattern '0001'B], -- fixed = 0001. This should be 0010 for PUS C
ackExecutionCompletion [true-value '1'B],
ackExecutionProgress [true-value '1'B],
ackExecutionStart [true-value '1'B],
ackAcceptance [true-value '1'B],
serviceType TASTE-BasicTypes.T-UInt8[],
messageSubtype TASTE-BasicTypes.T-UInt8[],
source-id []
},
userDataField <secondaryHeader.serviceType, secondaryHeader.messageSubtype>[], userDataField <secondaryHeader.serviceType, secondaryHeader.messageSubtype>[],
crc [] crc []
} }
...@@ -262,7 +272,15 @@ T-PUS-tc-sp[] ...@@ -262,7 +272,15 @@ T-PUS-tc-sp[]
T-PUS-tm-sp[] T-PUS-tm-sp[]
{ {
primaryHeader [], primaryHeader [],
secondaryHeader [], secondaryHeader [] {
packetPusVersion NULL [pattern '0001'B], -- fixed = 0001. This should be 0010 for PUS C
timeStatus NULL [pattern '0000'B],
serviceType TASTE-BasicTypes.T-UInt8[],
messageSubtype TASTE-BasicTypes.T-UInt8[],
messageTypeCounter [],
destination-id [],
time []
},
userDataField <secondaryHeader.serviceType, secondaryHeader.messageSubtype>[], userDataField <secondaryHeader.serviceType, secondaryHeader.messageSubtype>[],
crc [] crc []
} }
...@@ -271,19 +289,7 @@ T-PUS-tm-sp[] ...@@ -271,19 +289,7 @@ T-PUS-tm-sp[]
-- TC-Data-Field-Header and related types -- TC-Data-Field-Header and related types
------------------------------------------ ------------------------------------------
T-PUS-tc-scdryHeader [] T-PUS-tc-scdryHeader [] -- Never used standalone, so no additional fields
{
packetPusVersion NULL [pattern '0001'B], -- fixed = 0001. This should be 0010 for PUS C
ackExecutionCompletion [true-value '1'B],
ackExecutionProgress [true-value '1'B],
ackExecutionStart [true-value '1'B],
ackAcceptance [true-value '1'B],
serviceType TASTE-BasicTypes.T-UInt8[],
messageSubtype TASTE-BasicTypes.T-UInt8[],
source-id []
}
T-PUS-tc-sourceId [size 16, encoding pos-int, encode-values] T-PUS-tc-sourceId [size 16, encoding pos-int, encode-values]
...@@ -314,16 +320,7 @@ T-PUS-tc-set-mode [] ...@@ -314,16 +320,7 @@ T-PUS-tc-set-mode []
-- TM-Data-Field-Header and related types -- TM-Data-Field-Header and related types
------------------------------------------ ------------------------------------------
T-PUS-tm-scdryHeader [] T-PUS-tm-scdryHeader [] -- Never used standalone, so no additional fields
{
packetPusVersion NULL [pattern '0001'B], -- fixed = 0001. This should be 0010 for PUS C
timeStatus NULL [pattern '0000'B],
serviceType TASTE-BasicTypes.T-UInt8[],
messageSubtype TASTE-BasicTypes.T-UInt8[],
messageTypeCounter [],
destination-id [],
time []
}
T-PUS-tm-destId [size 16, encoding pos-int, encode-values] T-PUS-tm-destId [size 16, encoding pos-int, encode-values]
......
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