From c104772e2fd9cd09dea3a9e386800c53168c8f34 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 28 Jan 2022 16:45:50 +0900 Subject: [PATCH] change tlm id pos in tlm space packet header --- TlmCmd/Ccsds/tlm_space_packet.c | 6 +++--- TlmCmd/Ccsds/tlm_space_packet.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TlmCmd/Ccsds/tlm_space_packet.c b/TlmCmd/Ccsds/tlm_space_packet.c index ada69372f..1aa7bee1d 100644 --- a/TlmCmd/Ccsds/tlm_space_packet.c +++ b/TlmCmd/Ccsds/tlm_space_packet.c @@ -15,9 +15,9 @@ static const SP_ParamExtractionInfo TSP_pei_2nd_hdr_ver_ = { 6, 0xff, 0, 1}; // 11111111b static const SP_ParamExtractionInfo TSP_pei_board_time_ = { 7, 0xff, 0, 4}; // 11111111b -static const SP_ParamExtractionInfo TSP_pei_global_time_ = {11, 0xff, 0, 8}; // 11111111b -static const SP_ParamExtractionInfo TSP_pei_ob_sn_time_ = {19, 0xff, 0, 4}; // 11111111b -static const SP_ParamExtractionInfo TSP_pei_tlm_id_ = {23, 0xff, 0, 1}; // 11111111b +static const SP_ParamExtractionInfo TSP_pei_tlm_id_ = {11, 0xff, 0, 1}; // 11111111b +static const SP_ParamExtractionInfo TSP_pei_global_time_ = {12, 0xff, 0, 8}; // 11111111b +static const SP_ParamExtractionInfo TSP_pei_ob_sn_time_ = {20, 0xff, 0, 4}; // 11111111b static const SP_ParamExtractionInfo TSP_pei_dest_flags_ = {24, 0xff, 0, 1}; // 11111111b static const SP_ParamExtractionInfo TSP_pei_dr_ptn_ = {25, 0x0f, 0, 1}; // 11111111b diff --git a/TlmCmd/Ccsds/tlm_space_packet.h b/TlmCmd/Ccsds/tlm_space_packet.h index 4ec556c41..7337136a6 100644 --- a/TlmCmd/Ccsds/tlm_space_packet.h +++ b/TlmCmd/Ccsds/tlm_space_packet.h @@ -23,10 +23,10 @@ * |---------+-------+-------+------------------| * | 6 | 0 | 8 | Sec. HDR Ver | * | 7 | 0 | 32 | Board Time | - * | 11 | 0 | 64 | Global Time | - * | 19 | 0 | 32 | On-Board | + * | 11 | 0 | 8 | Tlm ID | + * | 12 | 0 | 64 | Global Time | + * | 20 | 0 | 32 | On-Board | * | | | | Subnetwork Time | - * | 23 | 0 | 8 | Tlm ID | * | 24 | 0 | 8 | Dest Flags | * | 25 | 0 | 8 | DR Partition | * |---------+-------+-------+------------------|