divide CTP_set_global_time

arkedge · Apr 5, 2024 · dd901bd · dd901bd
1 parent fa22857
commit dd901bd
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,6 @@ 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)
 option(C2A_USE_SPACE_PACKET_AS_COMMON_PACKET  "Use C2A-core Space Packet as Common Packet implementation" ON)
-option(C2A_USE_DEFAULT_GLOBAL_TIME_IN_CTP     "Use C2A-core default global time in Common Tlm Packet" ON)
 
 ## C2A build target board option （標準実装などがこのオプションによってスイッチされる．デフォルトでは sub OBC を想定）
 option(C2A_MOBC_FEATURES            "Enable some features for MOBC" OFF)

diff --git a/examples/mobc/src/src_user/settings/CMakeLists.txt b/examples/mobc/src/src_user/settings/CMakeLists.txt
@@ -18,6 +18,7 @@ set(C2A_SRCS
   system/event_handler_rules/event_handler_rules.c
   system/event_handler_rules/event_handler_rule_test.c
   tlm_cmd/common_cmd_packet_define.c
+  tlm_cmd/common_tlm_packet_define.c
   tlm_cmd/ccsds/aos_transfer_frame_define.c
   tlm_cmd/ccsds/apid_define.c
   tlm_cmd/ccsds/tc_transfer_frame_define.c

diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/common_tlm_packet_define.c b/examples/mobc/src/src_user/settings/tlm_cmd/common_tlm_packet_define.c
@@ -0,0 +1,16 @@
+#pragma section REPRO
+/**
+ * @file
+ * @brief  CTP 型の user 定義
+ */
+#include <src_core/tlm_cmd/common_packet/common_tlm_packet.h>
+
+void CTP_set_global_time(CommonTlmPacket* packet)
+{
+  // 何を設定するかはユーザー定義
+  // TMGR_get_curret_unixtime() で現在の unixtime を入れたり, gps 時刻 を入れたり, など
+  // User 独自の値を設定する場合は， C2A_USE_DEFAULT_GLOBAL_TIME_IN_CTP を OFF にすること
+  TSP_set_global_time(packet, 0.0);
+}
+
+#pragma section
diff --git a/examples/subobc/src/src_user/settings/CMakeLists.txt b/examples/subobc/src/src_user/settings/CMakeLists.txt
@@ -15,6 +15,7 @@ set(C2A_SRCS
   system/event_logger_settings.c
   system/event_handler_rules/event_handler_rules.c
   tlm_cmd/common_cmd_packet_define.c
+  tlm_cmd/common_tlm_packet_define.c
   tlm_cmd/ccsds/apid_define.c
 )
 

diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/common_tlm_packet_define.c b/examples/subobc/src/src_user/settings/tlm_cmd/common_tlm_packet_define.c
@@ -0,0 +1,16 @@
+#pragma section REPRO
+/**
+ * @file
+ * @brief  CTP 型の user 定義
+ */
+#include <src_core/tlm_cmd/common_packet/common_tlm_packet.h>
+
+void CTP_set_global_time(CommonTlmPacket* packet)
+{
+  // 何を設定するかはユーザー定義
+  // TMGR_get_curret_unixtime() で現在の unixtime を入れたり, gps 時刻 を入れたり, など
+  // User 独自の値を設定する場合は， C2A_USE_DEFAULT_GLOBAL_TIME_IN_CTP を OFF にすること
+  TSP_set_global_time(packet, 0.0);
+}
+
+#pragma section
diff --git a/examples/subobc/sync_with_mobc_example.bat b/examples/subobc/sync_with_mobc_example.bat
@@ -19,6 +19,7 @@ call :sync_file ".\src\src_user\hal\sils_mockup\wdt_sils.c" "..\mobc\src\src_use
 call :sync_file ".\src\src_user\settings\git_revision_config.h" "..\mobc\src\src_user\settings\git_revision_config.h"
 call :sync_file ".\src\src_user\settings\component_driver_super\driver_buffer_define.h" "..\mobc\src\src_user\settings\component_driver_super\driver_buffer_define.h"
 call :sync_file ".\src\src_user\settings\tlm_cmd\common_cmd_packet_define.c" "..\mobc\src\src_user\settings\tlm_cmd\common_cmd_packet_define.c"
+call :sync_file ".\src\src_user\settings\tlm_cmd\common_tlm_packet_define.c" "..\mobc\src\src_user\settings\tlm_cmd\common_tlm_packet_define.c"
 call :sync_file ".\src\src_user\settings\tlm_cmd\common_tlm_cmd_packet_define.h" "..\mobc\src\src_user\settings\tlm_cmd\common_tlm_cmd_packet_define.h"
 call :sync_file ".\src\src_user\settings\tlm_cmd\ccsds\apid_define.c" "..\mobc\src\src_user\settings\tlm_cmd\ccsds\apid_define.c"
 call :sync_file ".\src\src_user\settings\tlm_cmd\ccsds\apid_define.h" "..\mobc\src\src_user\settings\tlm_cmd\ccsds\apid_define.h"

diff --git a/tlm_cmd/common_packet/space_packet/common_tlm_packet.c b/tlm_cmd/common_packet/space_packet/common_tlm_packet.c
@@ -33,17 +33,6 @@ double CTP_get_global_time(const CommonTlmPacket* packet)
   return TSP_get_global_time(packet);
 }
 
-#ifdef C2A_USE_DEFAULT_GLOBAL_TIME_IN_CTP
-void CTP_set_global_time(CommonTlmPacket* packet)
-{
-  // 何を設定するかはユーザー定義
-  // TMGR_get_curret_unixtime() で現在の unixtime を入れたり, gps 時刻 を入れたり, など
-  // User 独自の値を設定する場合は， C2A_USE_DEFAULT_GLOBAL_TIME_IN_CTP を OFF にすること
-  // その場合は user 側で独自に CTP_set_global_time を実装すること
-  TSP_set_global_time(packet, 0.0);
-}
-#endif
-
 uint32_t CTP_get_on_board_subnet_time(const CommonTlmPacket* packet)
 {
   return TSP_get_on_board_subnet_time(packet);