simplify settings

ut-issl · Jul 27, 2022 · b6334bf · b6334bf
1 parent e75a01e
commit b6334bf
Show file tree

Hide file tree

Showing 15 changed files with 488 additions and 602 deletions.
diff --git a/Examples/2nd_obc_user/src/src_user/Library/git_revision.c b/Examples/2nd_obc_user/src/src_user/Library/git_revision.c
@@ -1,14 +1,11 @@
-#pragma section REPRO
-/**
- * @file
- * @brief git revisionをコードに埋め込む
- */
-
-#include "git_revision.h"
-
-const char GIT_REV_CORE[41] = "0000000000000000000000000000000000000000";
-const uint32_t GIT_REV_CORE_SHORT = 0x0000000;
-const char GIT_REV_USER[41] = "0000000000000000000000000000000000000000";
-const uint32_t GIT_REV_USER_SHORT = 0x0000000;
-
-#pragma section
+#pragma section REPRO 
+/** 
+ * @file 
+ * @brief git revisionをコードに埋め込む  
+ */ 
+#include "git_revision.h" 
+const char GIT_REV_CORE[41] = "e75a01e9a450525241bcb30ac177c8b1f621543b";  
+const uint32_t GIT_REV_CORE_SHORT = 0xe75a01e; 
+const char GIT_REV_USER[41] = "e75a01e9a450525241bcb30ac177c8b1f621543b";  
+const uint32_t GIT_REV_USER_SHORT = 0xe75a01e; 
+#pragma section 
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/CMakeLists.txt b/Examples/2nd_obc_user/src/src_user/Settings/CMakeLists.txt
@@ -11,7 +11,6 @@ set(C2A_SRCS
   Modes/TaskLists/Elements/tl_elem_tlm_cmd_hirate.c
   Modes/Transitions/sl_initial.c
   Modes/Transitions/sl_nop.c
-  Modes/Transitions/sequence_items.c
   System/event_logger_settings.c
   System/EventHandlerRules/event_handler_rules.c
   System/EventHandlerRules/event_handler_rule_test.c

diff --git a/Examples/2nd_obc_user/src/src_user/Settings/DriverSuper/driver_super_params.h b/Examples/2nd_obc_user/src/src_user/Settings/DriverSuper/driver_super_params.h
@@ -5,12 +5,6 @@
 #ifndef DRIVER_SUPER_PARAMS_H_
 #define DRIVER_SUPER_PARAMS_H_
 
-#undef DS_STREAM_MAX
-#undef DS_RX_BUFFER_SIZE_MAX
-#undef DS_RX_FRAME_SIZE_MAX
-
-#define DS_STREAM_MAX          (3)
-#define DS_RX_BUFFER_SIZE_MAX  (1024)
-#define DS_RX_FRAME_SIZE_MAX   (1024)
+// Core のデフォルト設定をそのまま使う
 
 #endif
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/Modes/Transitions/sequence_items.c b/Examples/2nd_obc_user/src/src_user/Settings/Modes/Transitions/sequence_items.c
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/Modes/Transitions/sequence_items.h b/Examples/2nd_obc_user/src/src_user/Settings/Modes/Transitions/sequence_items.h
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/Modes/mode_manager_params.h b/Examples/2nd_obc_user/src/src_user/Settings/Modes/mode_manager_params.h
@@ -5,10 +5,6 @@
 #ifndef MODE_MANAGER_PARAMS_H_
 #define MODE_MANAGER_PARAMS_H_
 
-#undef MM_NOT_DEFINED
-
-// モード遷移などの未定義を示す定数。
-// ブロックコマンドの最大ブロック数を用いる
-#define MM_NOT_DEFINED (BCT_MAX_BLOCKS)
+// Core のデフォルト設定をそのまま使う
 
 #endif
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/System/app_manager_params.h b/Examples/2nd_obc_user/src/src_user/Settings/System/app_manager_params.h
@@ -5,12 +5,6 @@
 #ifndef APP_MANAGER_PARAMS_H_
 #define APP_MANAGER_PARAMS_H_
 
-#undef AM_TLM_PAGE_SIZE
-#undef AM_TLM_PAGE_MAX
-#undef AM_MAX_APPS
-
-#define AM_TLM_PAGE_SIZE (32)
-#define AM_TLM_PAGE_MAX (4)
-#define AM_MAX_APPS (AM_TLM_PAGE_SIZE * AM_TLM_PAGE_MAX)
+// Core のデフォルト設定をそのまま使う
 
 #endif
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/System/event_handler_params.h b/Examples/2nd_obc_user/src/src_user/Settings/System/event_handler_params.h
@@ -6,23 +6,6 @@
 #ifndef EVENT_HANDLER_PARAMS_H_
 #define EVENT_HANDLER_PARAMS_H_
 
-#undef EH_RULE_TLM_PAGE_SIZE
-#undef EH_RULE_TLM_PAGE_MAX
-#undef EH_LOG_TLM_PAGE_SIZE
-#undef EH_LOG_TLM_PAGE_MAX
-#undef EH_MAX_RULE_NUM_OF_EL_ID_DUPLICATES
-#undef EH_MAX_RESPONSE_NUM_DEFAULT
-#undef EH_MAX_CHECK_EVENT_NUM_DEFAULT
-#undef EH_MAX_MULTI_LEVEL_NUM_DEFAULT
-
-
-#define EH_RULE_TLM_PAGE_SIZE (20)
-#define EH_RULE_TLM_PAGE_MAX  (8)
-#define EH_LOG_TLM_PAGE_SIZE  (64)
-#define EH_LOG_TLM_PAGE_MAX   (2)
-#define EH_MAX_RULE_NUM_OF_EL_ID_DUPLICATES   (4)
-#define EH_MAX_RESPONSE_NUM_DEFAULT           (8)
-#define EH_MAX_CHECK_EVENT_NUM_DEFAULT        (64)
-#define EH_MAX_MULTI_LEVEL_NUM_DEFAULT        (4)
+// Core のデフォルト設定をそのまま使う
 
 #endif
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/System/event_logger_params.h b/Examples/2nd_obc_user/src/src_user/Settings/System/event_logger_params.h
@@ -6,49 +6,6 @@
 #ifndef EVENT_LOGGER_PARAMS_H_
 #define EVENT_LOGGER_PARAMS_H_
 
-#undef EL_TLOG_TLM_PAGE_SIZE
-#undef EL_TLOG_TLM_PAGE_MAX_HIGH
-#undef EL_TLOG_TLM_PAGE_MAX_MIDDLE
-#undef EL_TLOG_TLM_PAGE_MAX_LOW
-#undef EL_CLOG_TLM_PAGE_SIZE
-#undef EL_CLOG_TLM_PAGE_MAX_HIGH
-#undef EL_CLOG_TLM_PAGE_MAX_MIDDLE
-#undef EL_CLOG_TLM_PAGE_MAX_LOW
-
-#undef EL_TLOG_LOG_SIZE_MAX_EL
-#undef EL_CLOG_LOG_SIZE_MAX_EL
-#undef EL_TLOG_LOG_SIZE_MAX_EH
-#undef EL_CLOG_LOG_SIZE_MAX_EH
-
-#undef EL_IS_ENABLE_TLOG
-#undef EL_IS_ENABLE_CLOG
-#undef EL_IS_ENABLE_EVENT_NOTE
-#undef EL_IS_ENABLE_MIDDLE_ERROR_LEVEL
-#undef EL_IS_ENABLE_EL_ERROR_LEVEL
-
-#undef SIZE_OF_EL_CLOG_COUNTER_T
-
-
-#define EL_TLOG_TLM_PAGE_SIZE         (28)
-#define EL_TLOG_TLM_PAGE_MAX_HIGH     (4)
-#define EL_TLOG_TLM_PAGE_MAX_MIDDLE   (4)
-#define EL_TLOG_TLM_PAGE_MAX_LOW      (4)
-#define EL_CLOG_TLM_PAGE_SIZE         (18)
-#define EL_CLOG_TLM_PAGE_MAX_HIGH     (4)
-#define EL_CLOG_TLM_PAGE_MAX_MIDDLE   (4)
-#define EL_CLOG_TLM_PAGE_MAX_LOW      (4)
-
-#define EL_TLOG_LOG_SIZE_MAX_EL           (16)
-#define EL_CLOG_LOG_SIZE_MAX_EL           (8)
-#define EL_TLOG_LOG_SIZE_MAX_EH           (16)
-#define EL_CLOG_LOG_SIZE_MAX_EH           (8)
-
-#define EL_IS_ENABLE_TLOG
-#define EL_IS_ENABLE_CLOG
-#define EL_IS_ENABLE_EVENT_NOTE
-#define EL_IS_ENABLE_MIDDLE_ERROR_LEVEL
-#define EL_IS_ENABLE_EL_ERROR_LEVEL
-
-#define SIZE_OF_EL_CLOG_COUNTER_T     (2)
+// Core のデフォルト設定をそのまま使う
 
 #endif
diff --git a/Examples/2nd_obc_user/src/src_user/Settings/System/obc_time_params.h b/Examples/2nd_obc_user/src/src_user/Settings/System/obc_time_params.h
@@ -5,14 +5,6 @@
 #ifndef OBC_TIME_PARAMS_H_
 #define OBC_TIME_PARAMS_H_
 
-#undef OBCT_STEP_IN_MSEC
-#undef OBCT_STEPS_PER_CYCLE
-#undef OBCT_CYCLES_PER_SEC
-#undef OBCT_MAX_CYCLE
-
-#define OBCT_STEP_IN_MSEC (1)
-#define OBCT_STEPS_PER_CYCLE (100)
-#define OBCT_CYCLES_PER_SEC (1000 / OBCT_STEP_IN_MSEC / OBCT_STEPS_PER_CYCLE)
-#define OBCT_MAX_CYCLE (0xfffffff0u)
+// Core のデフォルト設定をそのまま使う
 
 #endif