From 642046b5fd832f5c5357813effdf69d8a1b9a9d7 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Thu, 16 Nov 2023 18:05:08 +0900 Subject: [PATCH 01/20] move mobc ccsds to core --- .../tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/aos_transfer_frame.c | 0 .../tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/aos_transfer_frame.h | 0 .../ccsds/mobc}/multiplexing_protocol_data_unit.c | 0 .../ccsds/mobc}/multiplexing_protocol_data_unit.h | 0 .../src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_segment.c | 0 .../src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_segment.h | 0 .../tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_transfer_frame.c | 0 .../tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_transfer_frame.h | 0 .../src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tcp_to_m_pdu.c | 0 .../src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tcp_to_m_pdu.h | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/aos_transfer_frame.c (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/aos_transfer_frame.h (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/multiplexing_protocol_data_unit.c (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/multiplexing_protocol_data_unit.h (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_segment.c (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_segment.h (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_transfer_frame.c (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tc_transfer_frame.h (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tcp_to_m_pdu.c (100%) rename {examples/mobc/src/src_user/tlm_cmd/ccsds => tlm_cmd/ccsds/mobc}/tcp_to_m_pdu.h (100%) diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/aos_transfer_frame.c b/tlm_cmd/ccsds/mobc/aos_transfer_frame.c similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/aos_transfer_frame.c rename to tlm_cmd/ccsds/mobc/aos_transfer_frame.c diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/aos_transfer_frame.h b/tlm_cmd/ccsds/mobc/aos_transfer_frame.h similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/aos_transfer_frame.h rename to tlm_cmd/ccsds/mobc/aos_transfer_frame.h diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/multiplexing_protocol_data_unit.c b/tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.c similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/multiplexing_protocol_data_unit.c rename to tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.c diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/multiplexing_protocol_data_unit.h b/tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.h similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/multiplexing_protocol_data_unit.h rename to tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.h diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/tc_segment.c b/tlm_cmd/ccsds/mobc/tc_segment.c similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/tc_segment.c rename to tlm_cmd/ccsds/mobc/tc_segment.c diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/tc_segment.h b/tlm_cmd/ccsds/mobc/tc_segment.h similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/tc_segment.h rename to tlm_cmd/ccsds/mobc/tc_segment.h diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/tc_transfer_frame.c b/tlm_cmd/ccsds/mobc/tc_transfer_frame.c similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/tc_transfer_frame.c rename to tlm_cmd/ccsds/mobc/tc_transfer_frame.c diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/tc_transfer_frame.h b/tlm_cmd/ccsds/mobc/tc_transfer_frame.h similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/tc_transfer_frame.h rename to tlm_cmd/ccsds/mobc/tc_transfer_frame.h diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/tcp_to_m_pdu.c b/tlm_cmd/ccsds/mobc/tcp_to_m_pdu.c similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/tcp_to_m_pdu.c rename to tlm_cmd/ccsds/mobc/tcp_to_m_pdu.c diff --git a/examples/mobc/src/src_user/tlm_cmd/ccsds/tcp_to_m_pdu.h b/tlm_cmd/ccsds/mobc/tcp_to_m_pdu.h similarity index 100% rename from examples/mobc/src/src_user/tlm_cmd/ccsds/tcp_to_m_pdu.h rename to tlm_cmd/ccsds/mobc/tcp_to_m_pdu.h From f16afb8e9e61ff53a7948b524f5ff6d4d809d709 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Thu, 16 Nov 2023 18:14:49 +0900 Subject: [PATCH 02/20] Create README.md --- tlm_cmd/ccsds/mobc/README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tlm_cmd/ccsds/mobc/README.md diff --git a/tlm_cmd/ccsds/mobc/README.md b/tlm_cmd/ccsds/mobc/README.md new file mode 100644 index 000000000..f13b5b3f0 --- /dev/null +++ b/tlm_cmd/ccsds/mobc/README.md @@ -0,0 +1,10 @@ +# CCSDS / MOBC + +本ディレクトリに配置されているコードは，地上局と通信する無線機 (STX や SRX) に接続される OBC (MOBC など) が，CCSDS Space Communications Protocols における，TC Space Data Link Protocol と AOS Space Data Link Protocol に関連するコードである． + +CSDS Space Communications Protocols は，様々な設計パラメタがあるが，ここでのコードは，ある特定の設計パラメタにおける実装であることに注意すること． +したがって，現時点では汎用性の低いコードが配置されている． +（今後，適切にリファクタリンスする予定．） + +また，本コードをコンパイル対象に加えると，少なくない RAM を static に確保してしまうため，デフォルトではコンパイル対象には含まれない． +コンパイル対象に含める場合は， FIXME: で設定すること． From a7691bf3480b6cce87f1975d50888468b3a54d9a Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 17 Nov 2023 02:04:12 +0900 Subject: [PATCH 03/20] fix include --- .../src/src_user/applications/component_service/csrv_gs.h | 4 ++-- examples/mobc/src/src_user/component_driver/com/gs.c | 2 +- examples/mobc/src/src_user/component_driver/com/gs.h | 2 +- examples/mobc/src/src_user/component_driver/com/gs_validate.c | 2 +- examples/mobc/src/src_user/component_driver/com/gs_validate.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_gs.h b/examples/mobc/src/src_user/applications/component_service/csrv_gs.h index 594e2900a..78e57b4b4 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_gs.h +++ b/examples/mobc/src/src_user/applications/component_service/csrv_gs.h @@ -8,8 +8,8 @@ #include #include "../../component_driver/com/gs.h" -#include "../../tlm_cmd/ccsds/tcp_to_m_pdu.h" -#include "../../tlm_cmd/ccsds/aos_transfer_frame.h" +#include +#include #include /** diff --git a/examples/mobc/src/src_user/component_driver/com/gs.c b/examples/mobc/src/src_user/component_driver/com/gs.c index f5bac2c06..3f26cdabd 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs.c +++ b/examples/mobc/src/src_user/component_driver/com/gs.c @@ -10,7 +10,7 @@ #include #include "../../hal/ccsds_user.h" -#include "../../tlm_cmd/ccsds/tc_transfer_frame.h" +#include #include #include #include diff --git a/examples/mobc/src/src_user/component_driver/com/gs.h b/examples/mobc/src/src_user/component_driver/com/gs.h index b35a0e2b1..aeb227196 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs.h +++ b/examples/mobc/src/src_user/component_driver/com/gs.h @@ -10,7 +10,7 @@ #include #include #include "../../hal/ccsds_user.h" -#include "../../tlm_cmd/ccsds/aos_transfer_frame.h" +#include #include "gs_validate.h" #define GS_RX_HEADER_NUM (3) diff --git a/examples/mobc/src/src_user/component_driver/com/gs_validate.c b/examples/mobc/src/src_user/component_driver/com/gs_validate.c index 8a3e4201a..537292032 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs_validate.c +++ b/examples/mobc/src/src_user/component_driver/com/gs_validate.c @@ -5,7 +5,7 @@ */ #include "gs_validate.h" -#include "../../tlm_cmd/ccsds/tc_segment.h" +#include #include #define GS_RECEIVE_WINDOW (256) diff --git a/examples/mobc/src/src_user/component_driver/com/gs_validate.h b/examples/mobc/src/src_user/component_driver/com/gs_validate.h index d397bcfb6..59de575b1 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs_validate.h +++ b/examples/mobc/src/src_user/component_driver/com/gs_validate.h @@ -14,7 +14,7 @@ #include -#include "../../tlm_cmd/ccsds/tc_transfer_frame.h" +#include /** * @enum GS_VALIDATE_ERR From 4c7cbf6dd5d19279ebd460ed372408164c15d3a8 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 17 Nov 2023 02:08:06 +0900 Subject: [PATCH 04/20] Update CMakeLists.txt --- examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt b/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt index 0fbae1a07..cc0d7962a 100644 --- a/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt +++ b/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt @@ -14,11 +14,6 @@ set(C2A_SRCS normal_block_command_definition/nbc_start_hk_tlm.c normal_block_command_definition/nbc_respond_eh_for_test.c normal_block_command_definition/nbc_test_bcl.c - ccsds/aos_transfer_frame.c - ccsds/multiplexing_protocol_data_unit.c - ccsds/tc_transfer_frame.c - ccsds/tcp_to_m_pdu.c - ccsds/tc_segment.c ) if(C2A_BUILD_AS_CXX) From 42ae8196ea2bee4d8acf1f4ee224c71ebb780219 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 17 Nov 2023 13:09:07 +0900 Subject: [PATCH 05/20] Update README.md --- tlm_cmd/ccsds/mobc/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tlm_cmd/ccsds/mobc/README.md b/tlm_cmd/ccsds/mobc/README.md index f13b5b3f0..b280a5f51 100644 --- a/tlm_cmd/ccsds/mobc/README.md +++ b/tlm_cmd/ccsds/mobc/README.md @@ -1,10 +1,10 @@ # CCSDS / MOBC -本ディレクトリに配置されているコードは，地上局と通信する無線機 (STX や SRX) に接続される OBC (MOBC など) が，CCSDS Space Communications Protocols における，TC Space Data Link Protocol と AOS Space Data Link Protocol に関連するコードである． +本ディレクトリに配置されているコードは，地上局と通信する無線機 (STX や SRX) に接続される OBC (MOBC など) 向けの，CCSDS Space Communications Protocols における，TC Space Data Link Protocol と AOS Space Data Link Protocol に関連するコードである． CSDS Space Communications Protocols は，様々な設計パラメタがあるが，ここでのコードは，ある特定の設計パラメタにおける実装であることに注意すること． したがって，現時点では汎用性の低いコードが配置されている． -（今後，適切にリファクタリンスする予定．） +（今後，適切にリファクタリングする予定．） また，本コードをコンパイル対象に加えると，少なくない RAM を static に確保してしまうため，デフォルトではコンパイル対象には含まれない． コンパイル対象に含める場合は， FIXME: で設定すること． From c2db7f53d9ebf747156a38cd7db0b0e4f0ca1b6f Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Wed, 22 Nov 2023 18:48:17 +0900 Subject: [PATCH 06/20] move to protocol name folder --- .../{mobc => aos_space_data_link_protocol}/aos_transfer_frame.c | 0 .../{mobc => aos_space_data_link_protocol}/aos_transfer_frame.h | 0 .../multiplexing_protocol_data_unit.c | 0 .../multiplexing_protocol_data_unit.h | 0 .../ccsds/{mobc => aos_space_data_link_protocol}/tcp_to_m_pdu.c | 0 .../ccsds/{mobc => aos_space_data_link_protocol}/tcp_to_m_pdu.h | 0 tlm_cmd/ccsds/{mobc => tc_space_data_link_protocol}/tc_segment.c | 0 tlm_cmd/ccsds/{mobc => tc_space_data_link_protocol}/tc_segment.h | 0 .../{mobc => tc_space_data_link_protocol}/tc_transfer_frame.c | 0 .../{mobc => tc_space_data_link_protocol}/tc_transfer_frame.h | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename tlm_cmd/ccsds/{mobc => aos_space_data_link_protocol}/aos_transfer_frame.c (100%) rename tlm_cmd/ccsds/{mobc => aos_space_data_link_protocol}/aos_transfer_frame.h (100%) rename tlm_cmd/ccsds/{mobc => aos_space_data_link_protocol}/multiplexing_protocol_data_unit.c (100%) rename tlm_cmd/ccsds/{mobc => aos_space_data_link_protocol}/multiplexing_protocol_data_unit.h (100%) rename tlm_cmd/ccsds/{mobc => aos_space_data_link_protocol}/tcp_to_m_pdu.c (100%) rename tlm_cmd/ccsds/{mobc => aos_space_data_link_protocol}/tcp_to_m_pdu.h (100%) rename tlm_cmd/ccsds/{mobc => tc_space_data_link_protocol}/tc_segment.c (100%) rename tlm_cmd/ccsds/{mobc => tc_space_data_link_protocol}/tc_segment.h (100%) rename tlm_cmd/ccsds/{mobc => tc_space_data_link_protocol}/tc_transfer_frame.c (100%) rename tlm_cmd/ccsds/{mobc => tc_space_data_link_protocol}/tc_transfer_frame.h (100%) diff --git a/tlm_cmd/ccsds/mobc/aos_transfer_frame.c b/tlm_cmd/ccsds/aos_space_data_link_protocol/aos_transfer_frame.c similarity index 100% rename from tlm_cmd/ccsds/mobc/aos_transfer_frame.c rename to tlm_cmd/ccsds/aos_space_data_link_protocol/aos_transfer_frame.c diff --git a/tlm_cmd/ccsds/mobc/aos_transfer_frame.h b/tlm_cmd/ccsds/aos_space_data_link_protocol/aos_transfer_frame.h similarity index 100% rename from tlm_cmd/ccsds/mobc/aos_transfer_frame.h rename to tlm_cmd/ccsds/aos_space_data_link_protocol/aos_transfer_frame.h diff --git a/tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.c b/tlm_cmd/ccsds/aos_space_data_link_protocol/multiplexing_protocol_data_unit.c similarity index 100% rename from tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.c rename to tlm_cmd/ccsds/aos_space_data_link_protocol/multiplexing_protocol_data_unit.c diff --git a/tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.h b/tlm_cmd/ccsds/aos_space_data_link_protocol/multiplexing_protocol_data_unit.h similarity index 100% rename from tlm_cmd/ccsds/mobc/multiplexing_protocol_data_unit.h rename to tlm_cmd/ccsds/aos_space_data_link_protocol/multiplexing_protocol_data_unit.h diff --git a/tlm_cmd/ccsds/mobc/tcp_to_m_pdu.c b/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c similarity index 100% rename from tlm_cmd/ccsds/mobc/tcp_to_m_pdu.c rename to tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c diff --git a/tlm_cmd/ccsds/mobc/tcp_to_m_pdu.h b/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.h similarity index 100% rename from tlm_cmd/ccsds/mobc/tcp_to_m_pdu.h rename to tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.h diff --git a/tlm_cmd/ccsds/mobc/tc_segment.c b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.c similarity index 100% rename from tlm_cmd/ccsds/mobc/tc_segment.c rename to tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.c diff --git a/tlm_cmd/ccsds/mobc/tc_segment.h b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.h similarity index 100% rename from tlm_cmd/ccsds/mobc/tc_segment.h rename to tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.h diff --git a/tlm_cmd/ccsds/mobc/tc_transfer_frame.c b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c similarity index 100% rename from tlm_cmd/ccsds/mobc/tc_transfer_frame.c rename to tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c diff --git a/tlm_cmd/ccsds/mobc/tc_transfer_frame.h b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.h similarity index 100% rename from tlm_cmd/ccsds/mobc/tc_transfer_frame.h rename to tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.h From d30410fc7b602a43fbfa87a3e63d2aea28080e3c Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Wed, 22 Nov 2023 18:55:48 +0900 Subject: [PATCH 07/20] fix include --- .../src/src_user/applications/component_service/csrv_gs.h | 4 ++-- examples/mobc/src/src_user/component_driver/com/gs.c | 2 +- examples/mobc/src/src_user/component_driver/com/gs.h | 2 +- examples/mobc/src/src_user/component_driver/com/gs_validate.c | 2 +- examples/mobc/src/src_user/component_driver/com/gs_validate.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/mobc/src/src_user/applications/component_service/csrv_gs.h b/examples/mobc/src/src_user/applications/component_service/csrv_gs.h index 78e57b4b4..e23135c1d 100644 --- a/examples/mobc/src/src_user/applications/component_service/csrv_gs.h +++ b/examples/mobc/src/src_user/applications/component_service/csrv_gs.h @@ -8,8 +8,8 @@ #include #include "../../component_driver/com/gs.h" -#include -#include +#include +#include #include /** diff --git a/examples/mobc/src/src_user/component_driver/com/gs.c b/examples/mobc/src/src_user/component_driver/com/gs.c index 3f26cdabd..cd2f600b7 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs.c +++ b/examples/mobc/src/src_user/component_driver/com/gs.c @@ -10,7 +10,7 @@ #include #include "../../hal/ccsds_user.h" -#include +#include #include #include #include diff --git a/examples/mobc/src/src_user/component_driver/com/gs.h b/examples/mobc/src/src_user/component_driver/com/gs.h index aeb227196..c19d92565 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs.h +++ b/examples/mobc/src/src_user/component_driver/com/gs.h @@ -10,7 +10,7 @@ #include #include #include "../../hal/ccsds_user.h" -#include +#include #include "gs_validate.h" #define GS_RX_HEADER_NUM (3) diff --git a/examples/mobc/src/src_user/component_driver/com/gs_validate.c b/examples/mobc/src/src_user/component_driver/com/gs_validate.c index 537292032..b14d4e804 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs_validate.c +++ b/examples/mobc/src/src_user/component_driver/com/gs_validate.c @@ -5,7 +5,7 @@ */ #include "gs_validate.h" -#include +#include #include #define GS_RECEIVE_WINDOW (256) diff --git a/examples/mobc/src/src_user/component_driver/com/gs_validate.h b/examples/mobc/src/src_user/component_driver/com/gs_validate.h index 59de575b1..2a664fff8 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs_validate.h +++ b/examples/mobc/src/src_user/component_driver/com/gs_validate.h @@ -14,7 +14,7 @@ #include -#include +#include /** * @enum GS_VALIDATE_ERR From df48ef75d8da4bc4bd493237e427f84b4edaef68 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Wed, 22 Nov 2023 19:06:19 +0900 Subject: [PATCH 08/20] fix include --- tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c | 2 +- tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.h | 4 ++-- tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.h | 2 +- tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c b/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c index 92ce180e8..83e7e79e7 100644 --- a/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c +++ b/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c @@ -7,7 +7,7 @@ #include "tcp_to_m_pdu.h" // FIXME: CTP ではなく TSP を使ってしまっている．できれば抽象化するべき -#include +#include "../space_packet_protocol/tlm_space_packet.h" void T2M_initialize(TcpToMPdu* tcp_to_m_pdu) { diff --git a/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.h b/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.h index c0da712de..fc568710d 100644 --- a/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.h +++ b/tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.h @@ -10,9 +10,9 @@ #include // for size_t -#include #include "multiplexing_protocol_data_unit.h" -#include +#include "../../packet_list.h" +#include "../../../system/time_manager/time_manager.h" /** * @enum T2M_ACK diff --git a/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.h b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.h index f1861e889..7c57fa6f8 100644 --- a/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.h +++ b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.h @@ -20,7 +20,7 @@ #define TC_SEGMENT_H_ #include -#include +#include "../space_packet_protocol/cmd_space_packet.h" #include #define TCS_HEADER_SIZE (1) diff --git a/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c index 4c90be69b..a4646933c 100644 --- a/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c +++ b/tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c @@ -6,7 +6,7 @@ #include "tc_transfer_frame.h" #include -#include +#include "../../../library/crc.h" TCTF_VER TCTF_get_ver(const TcTransferFrame* tctf) { From 3e6dd4c2b22619037ac4333d5e5523ec7927bc23 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Wed, 22 Nov 2023 19:54:47 +0900 Subject: [PATCH 09/20] add ccsds doc --- docs/README.md | 1 + docs/core/ccsds.md | 24 ++++++++++++++++++++++++ tlm_cmd/ccsds/mobc/README.md | 10 ---------- 3 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 docs/core/ccsds.md delete mode 100644 tlm_cmd/ccsds/mobc/README.md diff --git a/docs/README.md b/docs/README.md index 777af589c..c624ce479 100644 --- a/docs/README.md +++ b/docs/README.md @@ -37,6 +37,7 @@ C2A に関する説明の棲み分けは，次のようになっています． 1. Core Layer 1. Overview 1. [Communication](./core/communication.md) + 1. [CCSDS](./core/ccsds.md) 1. [Tips](./core/tips.md) 1. Component Driver 1. [Overview](./component_driver/overview.md) diff --git a/docs/core/ccsds.md b/docs/core/ccsds.md new file mode 100644 index 000000000..869f4c506 --- /dev/null +++ b/docs/core/ccsds.md @@ -0,0 +1,24 @@ +# CCSDS + +## 概要 +C2A Core に実装された CCSDS (Consultative Committee for Space Data Systems) によって規定される宇宙データシステムの標準規格 Space Communications Protocols についてまとめる． +CCSDS 技術仕様文書は [ブルーブック（Blue Books）：全85文書](https://stage.tksc.jaxa.jp/ccsds/docs/doc_blue.html) を参照すること． + + +## Space Packet Protocol +[`tlm_cmd/ccsds/space_packet_protocol`](/tlm_cmd/ccsds/space_packet_protocol/) に配置される． + +[Core/Communication.md#c2a-標準-space-packet-定義](./communication.md#c2a-標準-space-packet-定義) などを参照のこと． + + +## AOS Space Data Link Protocol / TC Space Data Link Protocol +[`tlm_cmd/ccsds/aos_space_data_link_protocol`](/tlm_cmd/ccsds/aos_space_data_link_protocol/), [`tlm_cmd/ccsds/tc_space_data_link_protocol`](/tlm_cmd/ccsds/tc_space_data_link_protocol/) に配置される． + +基本的には，地上局と通信する無線機 (STX や SRX) に接続される OBC (MOBC など) 向けのコードとなる． + +AOS Space Data Link Protocol や TC Space Data Link Protocol は，様々な設計パラメタがあるが，ここでのコードは，ある特定の設計パラメタにおける実装であることに注意すること． +したがって，現時点では汎用性の低いコードが配置されている． +（今後，適切にリファクタリングする予定．） + +また，本コードをコンパイル対象に加えると，少なくない RAM を static に確保してしまうため，デフォルトではコンパイル対象には含まれない． +コンパイル対象に含める場合は， FIXME: で設定すること． diff --git a/tlm_cmd/ccsds/mobc/README.md b/tlm_cmd/ccsds/mobc/README.md deleted file mode 100644 index b280a5f51..000000000 --- a/tlm_cmd/ccsds/mobc/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# CCSDS / MOBC - -本ディレクトリに配置されているコードは，地上局と通信する無線機 (STX や SRX) に接続される OBC (MOBC など) 向けの，CCSDS Space Communications Protocols における，TC Space Data Link Protocol と AOS Space Data Link Protocol に関連するコードである． - -CSDS Space Communications Protocols は，様々な設計パラメタがあるが，ここでのコードは，ある特定の設計パラメタにおける実装であることに注意すること． -したがって，現時点では汎用性の低いコードが配置されている． -（今後，適切にリファクタリングする予定．） - -また，本コードをコンパイル対象に加えると，少なくない RAM を static に確保してしまうため，デフォルトではコンパイル対象には含まれない． -コンパイル対象に含める場合は， FIXME: で設定すること． From 719f4204ed0afeffa42d40438a06fe7325166de1 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 24 Nov 2023 14:11:31 +0900 Subject: [PATCH 10/20] add ccsds cmakelists --- CMakeLists.txt | 17 +++++++++++++++++ .../aos_space_data_link_protocol/CMakeLists.txt | 17 +++++++++++++++++ .../tc_space_data_link_protocol/CMakeLists.txt | 16 ++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt create mode 100644 tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f0c5ea1c6..8a7c39420 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,11 @@ option(C2A_USE_ALL_CORE_APPS "Use C2A-core all Applications" ON) option(C2A_USE_ALL_CORE_TEST_APPS "Use C2A-core all Test Applications" ON) option(C2A_USE_ALL_CORE_LIB "Use C2A-core all library" ON) +## C2A CCSDS select +# See alse; /docs/core/ccsds.md +option(C2A_USE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL "Use C2A-core CCSDS AOS SPACE DATA LINK PROTOCOL" OFF) +option(C2A_USE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL "Use C2A-core CCSDS TC SPACE DATA LINK PROTOCOL" OFF) + option(C2A_USE_SIMPLE_LIBC "Use C2A-core hosted simple libc (c2a-core/library/libc) implementation" OFF) set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) @@ -99,4 +104,16 @@ if(C2A_USE_ALL_CORE_LIB) target_sources(${PROJECT_NAME} PUBLIC $) endif() +if(C2A_USE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL) + add_subdirectory(tlm_cmd/ccsds/aos_space_data_link_protocol) + target_sources(${PROJECT_NAME} PUBLIC $) +endif() + +if(C2A_USE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) + add_subdirectory(tlm_cmd/ccsds/tc_space_data_link_protocol) + target_sources(${PROJECT_NAME} PUBLIC $) +endif() + + + include(common.cmake) diff --git a/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt b/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt new file mode 100644 index 000000000..147f84b22 --- /dev/null +++ b/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.13) + +project(C2A_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL) + +set(C2A_SRCS + tlm_cmd/ccsds/aos_space_data_link_protocol/aos_transfer_frame.c + tlm_cmd/ccsds/aos_space_data_link_protocol/multiplexing_protocol_data_unit.c + tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c +) + +if(C2A_BUILD_AS_CXX) + set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ +endif() + +add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS}) + +include(${C2A_CORE_DIR}/common.cmake) diff --git a/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt b/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt new file mode 100644 index 000000000..06c6b90ca --- /dev/null +++ b/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt @@ -0,0 +1,16 @@ +cmake_minimum_required(VERSION 3.13) + +project(C2A_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) + +set(C2A_SRCS + tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.c + tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c +) + +if(C2A_BUILD_AS_CXX) + set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ +endif() + +add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS}) + +include(${C2A_CORE_DIR}/common.cmake) From 5a0c1c15f787e820739b01c93a605bf2154ec800 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 24 Nov 2023 14:13:51 +0900 Subject: [PATCH 11/20] add ccsds use flag in mobc cmake --- examples/mobc/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt index 77f97b445..982d77066 100644 --- a/examples/mobc/CMakeLists.txt +++ b/examples/mobc/CMakeLists.txt @@ -20,6 +20,10 @@ option(C2A_BUILD_WITH_SILS_MOCKUP "Build C2A with SILS mockup for check undefine option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) +# core に同封されている CCSDS の実装を使う +set(C2A_USE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL ON) +set(C2A_USE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL ON) + if(C2A_BUILD_WITH_SILS_MOCKUP) set(C2A_BUILD_AS_CXX OFF) endif() From c49b75a6e06569832e6f52d043d5005d3b97fd92 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 24 Nov 2023 14:15:49 +0900 Subject: [PATCH 12/20] fix small --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a7c39420..89505117c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,6 +114,4 @@ if(C2A_USE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) target_sources(${PROJECT_NAME} PUBLIC $) endif() - - include(common.cmake) From 4ad649839d01ced2f595c7ffa170a2417bba08ce Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 24 Nov 2023 14:17:28 +0900 Subject: [PATCH 13/20] fix cmake --- tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt | 6 +++--- tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt b/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt index 147f84b22..236f139c2 100644 --- a/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt +++ b/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.13) project(C2A_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL) set(C2A_SRCS - tlm_cmd/ccsds/aos_space_data_link_protocol/aos_transfer_frame.c - tlm_cmd/ccsds/aos_space_data_link_protocol/multiplexing_protocol_data_unit.c - tlm_cmd/ccsds/aos_space_data_link_protocol/tcp_to_m_pdu.c + aos_transfer_frame.c + multiplexing_protocol_data_unit.c + tcp_to_m_pdu.c ) if(C2A_BUILD_AS_CXX) diff --git a/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt b/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt index 06c6b90ca..09fc22e87 100644 --- a/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt +++ b/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.13) project(C2A_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) set(C2A_SRCS - tlm_cmd/ccsds/tc_space_data_link_protocol/tc_segment.c - tlm_cmd/ccsds/tc_space_data_link_protocol/tc_transfer_frame.c + tc_segment.c + tc_transfer_frame.c ) if(C2A_BUILD_AS_CXX) From ac09ee53620c519b6e849ff495859d3ff11da42d Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 24 Nov 2023 23:35:07 +0900 Subject: [PATCH 14/20] fix cmakelists --- CMakeLists.txt | 12 ++++++------ examples/mobc/CMakeLists.txt | 4 ++-- .../aos_space_data_link_protocol/CMakeLists.txt | 2 +- .../ccsds/tc_space_data_link_protocol/CMakeLists.txt | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 89505117c..95580c75d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,8 @@ option(C2A_USE_ALL_CORE_LIB "Use C2A-core all library" ON) ## C2A CCSDS select # See alse; /docs/core/ccsds.md -option(C2A_USE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL "Use C2A-core CCSDS AOS SPACE DATA LINK PROTOCOL" OFF) -option(C2A_USE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL "Use C2A-core CCSDS TC SPACE DATA LINK PROTOCOL" OFF) +option(C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL "Use C2A-core CCSDS AOS SPACE DATA LINK PROTOCOL implementation" OFF) +option(C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL "Use C2A-core CCSDS TC SPACE DATA LINK PROTOCOL implementation" OFF) option(C2A_USE_SIMPLE_LIBC "Use C2A-core hosted simple libc (c2a-core/library/libc) implementation" OFF) @@ -104,14 +104,14 @@ if(C2A_USE_ALL_CORE_LIB) target_sources(${PROJECT_NAME} PUBLIC $) endif() -if(C2A_USE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL) +if(C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL) add_subdirectory(tlm_cmd/ccsds/aos_space_data_link_protocol) - target_sources(${PROJECT_NAME} PUBLIC $) + target_sources(${PROJECT_NAME} PUBLIC $) endif() -if(C2A_USE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) +if(C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) add_subdirectory(tlm_cmd/ccsds/tc_space_data_link_protocol) - target_sources(${PROJECT_NAME} PUBLIC $) + target_sources(${PROJECT_NAME} PUBLIC $) endif() include(common.cmake) diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt index 982d77066..6e791b4ef 100644 --- a/examples/mobc/CMakeLists.txt +++ b/examples/mobc/CMakeLists.txt @@ -21,8 +21,8 @@ option(C2A_BUILD_WITH_SILS_MOCKUP "Build C2A with SILS mockup for check undefine option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) # core に同封されている CCSDS の実装を使う -set(C2A_USE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL ON) -set(C2A_USE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL ON) +set(C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL ON) +set(C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL ON) if(C2A_BUILD_WITH_SILS_MOCKUP) set(C2A_BUILD_AS_CXX OFF) diff --git a/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt b/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt index 236f139c2..a9b512b74 100644 --- a/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt +++ b/tlm_cmd/ccsds/aos_space_data_link_protocol/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.13) -project(C2A_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL) +project(C2A_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL) set(C2A_SRCS aos_transfer_frame.c diff --git a/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt b/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt index 09fc22e87..cb6894dcb 100644 --- a/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt +++ b/tlm_cmd/ccsds/tc_space_data_link_protocol/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.13) -project(C2A_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) +project(C2A_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL) set(C2A_SRCS tc_segment.c From d606473d0275800691bb6fcab2cf84018772fd71 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Mon, 27 Nov 2023 11:48:09 +0900 Subject: [PATCH 15/20] fix typo --- examples/mobc/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt index 6e791b4ef..0583bd82d 100644 --- a/examples/mobc/CMakeLists.txt +++ b/examples/mobc/CMakeLists.txt @@ -20,7 +20,7 @@ option(C2A_BUILD_WITH_SILS_MOCKUP "Build C2A with SILS mockup for check undefine option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) -# core に同封されている CCSDS の実装を使う +# core に同梱されている CCSDS の実装を使う set(C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL ON) set(C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL ON) From bb4c86339d3f37071c95cbfe1b4a7ce529527c92 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Mon, 27 Nov 2023 11:53:56 +0900 Subject: [PATCH 16/20] Update check_coding_rule.json --- examples/subobc/check_coding_rule.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/subobc/check_coding_rule.json b/examples/subobc/check_coding_rule.json index 5c9e1e795..5f191bb54 100644 --- a/examples/subobc/check_coding_rule.json +++ b/examples/subobc/check_coding_rule.json @@ -31,7 +31,12 @@ "CommonCmdPacket", "SpacePacket", "TlmSpacePacket", - "CmdSpacePacket" + "CmdSpacePacket", + "AosTransferFrame", + "MultiplexingProtocolDataUnit", + "TcpToMPdu", + "TcSegment", + "TcTransferFrame" ], "comment_additional_type" : [ "FIXME: TCP はもう存在しないはずなので，どこかで消す", From 6a4946cca64bb306116e50b8867ac28e58516434 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Mon, 27 Nov 2023 12:04:50 +0900 Subject: [PATCH 17/20] Update CHANGELOG.md --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8db6d652f..2d54bf0c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## v4.1.0 (Unreleased) +### Enhancements + +- [#214](https://github.com/arkedge/c2a-core/pull/214): CCSDS の主 MOBC 向け Data Link Layer のコードを Core 管理にする + ### Fixed - [#193](https://github.com/arkedge/c2a-core/pull/193): VCDU を AOS transfer frame に rename する @@ -30,6 +34,13 @@ - `#include ` -> `#include ` - `#include ` -> `#include ` - `#include ` -> `#include ` +- [#214](https://github.com/arkedge/c2a-core/pull/214): 影響範囲は MOBC のみ + 1. `src_user/tlm_cmd/ccsds/` 内部の Data Link Layer に関連するコードを消すし， `CMakeLists.txt` も修正する． + 1. c2a user のトップレベルの `CMakeLists.txt` にて， `C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL`, `C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL` をともに `ON` に設定する． + - `examples/mobc/CMakeLists.txt` を参考にできる． + 1. コンパイルが通らないところを直す．想定されるものは以下． + - `src_core/tlm_cmd/ccsds/` のファイルの場所が変わったことにより， include パスを修正する．コンパイルが通らないところを直す． + ## v4.0.1 (2023-11-09) From 7c5087ccd13575a7135a47a328e91a858efaba3e Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 28 Nov 2023 12:54:21 +0900 Subject: [PATCH 18/20] fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d54bf0c0..b412e0250 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ - `#include ` -> `#include ` - `#include ` -> `#include ` - [#214](https://github.com/arkedge/c2a-core/pull/214): 影響範囲は MOBC のみ - 1. `src_user/tlm_cmd/ccsds/` 内部の Data Link Layer に関連するコードを消すし， `CMakeLists.txt` も修正する． + 1. `src_user/tlm_cmd/ccsds/` 内部の Data Link Layer に関連するコードを消し， `CMakeLists.txt` も修正する． 1. c2a user のトップレベルの `CMakeLists.txt` にて， `C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL`, `C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL` をともに `ON` に設定する． - `examples/mobc/CMakeLists.txt` を参考にできる． 1. コンパイルが通らないところを直す．想定されるものは以下． From 513058d9658d7afa9b1021b069c69024785d6e86 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Tue, 28 Nov 2023 12:56:44 +0900 Subject: [PATCH 19/20] Update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b412e0250..077649ef7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,12 @@ - `#include ` -> `#include ` - `#include ` -> `#include ` - [#214](https://github.com/arkedge/c2a-core/pull/214): 影響範囲は MOBC のみ - 1. `src_user/tlm_cmd/ccsds/` 内部の Data Link Layer に関連するコードを消し， `CMakeLists.txt` も修正する． + 1. `src_user/tlm_cmd/ccsds/` 内部の以下のような Data Link Layer に関連するコードを消し， `CMakeLists.txt` も修正する． + - `aos_transfer_frame.{c,h}` + - `multiplexing_protocol_data_unit.{c,h}` + - `tcp_to_m_pdu.{c,h}` + - `tc_segment.{c,h}` + - `tc_transfer_frame.{c,h}` 1. c2a user のトップレベルの `CMakeLists.txt` にて， `C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL`, `C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL` をともに `ON` に設定する． - `examples/mobc/CMakeLists.txt` を参考にできる． 1. コンパイルが通らないところを直す．想定されるものは以下． From 78e9d78deb177c4b5e01c50d7b669d7234ab3965 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Sun, 3 Dec 2023 17:57:37 +0900 Subject: [PATCH 20/20] Update CHANGELOG.md --- CHANGELOG.md | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 077649ef7..3b9edfa16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,17 +34,26 @@ - `#include ` -> `#include ` - `#include ` -> `#include ` - `#include ` -> `#include ` -- [#214](https://github.com/arkedge/c2a-core/pull/214): 影響範囲は MOBC のみ - 1. `src_user/tlm_cmd/ccsds/` 内部の以下のような Data Link Layer に関連するコードを消し， `CMakeLists.txt` も修正する． - - `aos_transfer_frame.{c,h}` - - `multiplexing_protocol_data_unit.{c,h}` - - `tcp_to_m_pdu.{c,h}` - - `tc_segment.{c,h}` - - `tc_transfer_frame.{c,h}` - 1. c2a user のトップレベルの `CMakeLists.txt` にて， `C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL`, `C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL` をともに `ON` に設定する． - - `examples/mobc/CMakeLists.txt` を参考にできる． - 1. コンパイルが通らないところを直す．想定されるものは以下． - - `src_core/tlm_cmd/ccsds/` のファイルの場所が変わったことにより， include パスを修正する．コンパイルが通らないところを直す． +- [#214](https://github.com/arkedge/c2a-core/pull/214): 影響範囲は MOBC の CCSDS Data Link Layer の実装 + 1. AOS Space Data Link Protocol の実装を c2a-core のものに切り替える + 1. `src_user/tlm_cmd/ccsds/` 内の既存の実装を消す + - `aos_transfer_frame.{c,h}` + - `multiplexing_protocol_data_unit.{c,h}` + - `tcp_to_m_pdu.{c,h}` + 1. c2a-core の実装を使うように切り替える + - `src_core/ccsds/aos_space_data_link_protocol/` 内のソースファイルをビルド対象に追加する + - CMake の場合， `C2A_USE_CORE_CCSDS_AOS_SPACE_DATA_LINK_PROTOCOL` option を `ON` にするだけでよい (C2A user top の `CMakeLists.txt`) + - `examples/mobc/CMakeLists.txt` を参考にできる． + 1. コンパイルが通らないところを直す．ファイルの場所が変わったことによる include path の修正が想定される． + 1. TC Space Data Link Protocol の実装を c2a-core のものに切り替える + 1. `src_user/tlm_cmd/ccsds/` 内の既存の実装を消す + - `tc_segment.{c,h}` + - `tc_transfer_frame.{c,h}` + 1. c2a-core の実装を使うように切り替える + - `src_core/ccsds/tc_space_data_link_protocol/` 内のソースファイルをビルド対象に追加する + - CMake の場合， `C2A_USE_CORE_CCSDS_TC_SPACE_DATA_LINK_PROTOCOL` option を `ON` にするだけでよい (C2A user top の `CMakeLists.txt`) + - `examples/mobc/CMakeLists.txt` を参考にできる． + 1. コンパイルが通らないところを直す．ファイルの場所が変わったことによる include path の修正が想定される． ## v4.0.1 (2023-11-09)