From c1ab49e9349ece7f584e9c68e9bd12ed52a3cc83 Mon Sep 17 00:00:00 2001 From: Wojciech Cierpucha Date: Fri, 17 Mar 2023 19:53:14 +0100 Subject: [PATCH] Added missing 4 bits representing PUS version number in TC/TM secondary headers. --- ccsds/TC-Packet.acn | 4 ++-- ccsds/TC-Packet.asn1 | 2 +- ccsds/TM-Packet.acn | 4 ++-- ccsds/TM-Packet.asn1 | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ccsds/TC-Packet.acn b/ccsds/TC-Packet.acn index 0f09df4..df85774 100644 --- a/ccsds/TC-Packet.acn +++ b/ccsds/TC-Packet.acn @@ -45,7 +45,7 @@ TC-PacketDataField [] TC-DataWithSecondaryHeader [] { secondaryHeader [] { - tcPacketPusVersionNumber [], + tcPacketPusVersionNumber NULL [pattern '0010'B], acknowledgementFlags [], serviceType-ID MessageType.ServiceType-ID [], messageSubtype-ID MessageType.MessageSubtype-ID [], @@ -73,7 +73,7 @@ TC-Packet-ID [] TC-PacketSecondaryHeader [] { - tcPacketPusVersionNumber [], + tcPacketPusVersionNumber NULL [pattern '0010'B], acknowledgementFlags [], --! serviceType-ID MessageType.ServiceType-ID [], --! messageSubtype-ID MessageType.MessageSubtype-ID [], diff --git a/ccsds/TC-Packet.asn1 b/ccsds/TC-Packet.asn1 index f0ca8dd..ad3a4fb 100644 --- a/ccsds/TC-Packet.asn1 +++ b/ccsds/TC-Packet.asn1 @@ -47,7 +47,7 @@ TC-Packet-ID ::= Packet-ID {TC-PacketType} TC-PacketSecondaryHeader ::= SEQUENCE { - tcPacketPusVersionNumber NULL, +--! tcPacketPusVersionNumber, moved to ACN acknowledgementFlags AcknowledgementFlags, --! serviceType-ID ServiceType-ID, moved to ACN --! messageSubtype-ID MessageSubtype-ID, moved to ACN diff --git a/ccsds/TM-Packet.acn b/ccsds/TM-Packet.acn index edb39de..ba33501 100644 --- a/ccsds/TM-Packet.acn +++ b/ccsds/TM-Packet.acn @@ -45,7 +45,7 @@ TM-PacketDataField [] TM-DataWithSecondaryHeader [] { secondaryHeader [] { - tmPacketPusVersionNumber [], + tmPacketPusVersionNumber NULL [pattern '0010'B], spacecraftTimeReferenceStatus [], serviceType-ID MessageType.ServiceType-ID [], messageSubtype-ID MessageType.MessageSubtype-ID [], @@ -75,7 +75,7 @@ TM-Packet-ID [] TM-PacketSecondaryHeader [] { - tmPacketPusVersionNumber [], + tmPacketPusVersionNumber NULL [pattern '0010'B], spacecraftTimeReferenceStatus [], --! serviceType-ID MessageType.ServiceType-ID [], --! messageSubtype-ID MessageType.MessageSubtype-ID [], diff --git a/ccsds/TM-Packet.asn1 b/ccsds/TM-Packet.asn1 index 278b02d..edd876a 100644 --- a/ccsds/TM-Packet.asn1 +++ b/ccsds/TM-Packet.asn1 @@ -51,7 +51,7 @@ TM-Packet-ID ::= Packet-ID {TM-PacketType} TM-PacketSecondaryHeader ::= SEQUENCE { - tmPacketPusVersionNumber NULL, +--! tmPacketPusVersionNumber NULL, moved to ACN spacecraftTimeReferenceStatus SpacecraftTimeReferenceStatus, --! serviceType-ID ServiceType-ID, moved to ACN --! messageSubtype-ID MessageSubtype-ID, moved to ACN