Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing 4 bits representing PUS version number in TC/TM secondary headers. #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added missing 4 bits representing PUS version number in TC/TM secondary headers. #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ccsds/TC-Packet.acn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ TC-PacketDataField <INTEGER:secondaryHeaderFlag> []
TC-DataWithSecondaryHeader []
{
secondaryHeader [] {
tcPacketPusVersionNumber [],
tcPacketPusVersionNumber NULL [pattern '0010'B],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should either use or delete PacketVersionNumber structure.

https://github.com/n7space/asn1-pusc-lib/blob/master/ccsds/PacketTypes.asn1#L38

I have a feeling, that it was supposed to go here but something was not working... hence the strange NULL in ASN.1...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LOL, it has bad version: https://github.com/n7space/asn1-pusc-lib/blob/master/ccsds/PacketTypes.acn#L26

:D

acknowledgementFlags [],
serviceType-ID MessageType.ServiceType-ID [],
messageSubtype-ID MessageType.MessageSubtype-ID [],
Expand Down Expand Up @@ -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 [],
Expand Down
2 changes: 1 addition & 1 deletion ccsds/TC-Packet.asn1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ccsds/TM-Packet.acn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ TM-PacketDataField <INTEGER:secondaryHeaderFlag> []
TM-DataWithSecondaryHeader []
{
secondaryHeader [] {
tmPacketPusVersionNumber [],
tmPacketPusVersionNumber NULL [pattern '0010'B],
spacecraftTimeReferenceStatus [],
serviceType-ID MessageType.ServiceType-ID [],
messageSubtype-ID MessageType.MessageSubtype-ID [],
Expand Down Expand Up @@ -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 [],
Expand Down
2 changes: 1 addition & 1 deletion ccsds/TM-Packet.asn1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down