From 63d989dc22cd00a24c95840a8c7cffa4ea0e13f5 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Thu, 26 Oct 2023 23:55:13 +0900 Subject: [PATCH 1/6] fix indent --- component_driver/driver_super.c | 12 +++++----- component_driver/driver_super.h | 23 +++++++++---------- .../driver_buffer_define.h | 2 +- .../driver_super_params.h | 2 +- .../src/src_user/component_driver/com/gs.h | 2 +- .../driver_buffer_define.h | 2 +- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/component_driver/driver_super.c b/component_driver/driver_super.c index 57efff17e..db8315ce7 100644 --- a/component_driver/driver_super.c +++ b/component_driver/driver_super.c @@ -291,7 +291,7 @@ CDS_ERR_CODE CDS_reset(ComponentDriverSuper* p_super) p_super->hal_handler_id = HAL_HANDLER_ID_MAX; // FIXME: (*HAL_init_handlers[p_super->hal_handler_id])(p_super->hal_config) の様な使い方をするのでセグフォが起こる可能性があり p_super->hal_config = NULL; // FIXME: NULL ポインタはこの関数が Reset 単体で使われるとマズい - p_super->config.settings.hal_rx_buffer_size_ = CDS_HAL_RX_BUFFER_SIZE; + p_super->config.settings.hal_rx_buffer_size_ = CDS_HAL_RX_BUFFER_SIZE; p_super->config.settings.should_monitor_for_rx_disruption_ = 0; p_super->config.settings.time_threshold_for_rx_disruption_ = 60 * 1000; // この値はよく考えること @@ -578,8 +578,8 @@ static int CDS_tx_(ComponentDriverSuper* p_super, uint8_t stream) #endif ret = (*HAL_tx_handlers[p_super->hal_handler_id])(p_super->hal_config, - p_stream_config->settings.tx_frame_, - (int)p_stream_config->settings.tx_frame_size_); + p_stream_config->settings.tx_frame_, + (int)p_stream_config->settings.tx_frame_size_); if (ret != 0) return ret; return CDS_ERR_CODE_OK; @@ -608,8 +608,8 @@ static int CDS_rx_(ComponentDriverSuper* p_super) if (flag == 0) return 0; rec_data_len = (*HAL_rx_handlers[p_super->hal_handler_id])(p_super->hal_config, - CDS_hal_rx_buffer_, - p_super->config.settings.hal_rx_buffer_size_); + CDS_hal_rx_buffer_, + p_super->config.settings.hal_rx_buffer_size_); #ifdef CDS_DEBUG Printf("DS: rx_\n"); @@ -1204,7 +1204,7 @@ static CDS_ERR_CODE CDS_reset_stream_config_(CDS_StreamConfig* p_stream_config) p->settings.data_analyzer_ = CDS_data_analyzer_dummy_; // CDS_StreamSendStatus の初期化 - p->info.send_status_.status_code = CDS_STREAM_SEND_STATUS_DISABLE; + p->info.send_status_.status_code = CDS_STREAM_SEND_STATUS_DISABLE; p->info.send_status_.ret_from_hal_tx = 0; // CDS_StreamRecStatus の初期化 diff --git a/component_driver/driver_super.h b/component_driver/driver_super.h index 2151277d8..1b6993488 100644 --- a/component_driver/driver_super.h +++ b/component_driver/driver_super.h @@ -30,7 +30,7 @@ #define CDS_STREAM_MAX (3) /*!< CDS_StreamConfig の最大数 uint8_t を想定 */ -#define CDS_HAL_RX_BUFFER_SIZE (1024) /*!< HAL_rx_handlers で受信するときの一次バッファ +#define CDS_HAL_RX_BUFFER_SIZE (1024) /*!< HAL_rx_handlers で受信するときの一次バッファ HAL_rx_handlers から受信できる最大数を規定する OBC の物理的な信号ラインのバッファサイズ以上とするともっともパフォーマンスが出る */ @@ -114,7 +114,7 @@ typedef enum */ typedef enum { - CDS_ERR_CODE_OK = 0, //!< 返り値は継承先や IF 先で上書きされるため，OK は 0 であることが必須 + CDS_ERR_CODE_OK = 0, //!< 返り値は継承先や HAL 先で上書きされるため，OK は 0 であることが必須 CDS_ERR_CODE_ERR = 1 } CDS_ERR_CODE; @@ -131,11 +131,11 @@ typedef enum /** * @struct CDS_RecStatus - * @brief IF 受信状況 + * @brief HAL 受信状況 */ typedef struct { - int ret_from_hal_rx; //!< HAL_rx_handlers の返り値 + int ret_from_hal_rx; //!< HAL_rx_handlers の返り値 CDS_RX_DISRUPTION_STATUS_CODE rx_disruption_status; //!< 受信途絶判定 } CDS_RecStatus; @@ -160,7 +160,7 @@ typedef enum typedef struct { CDS_STREAM_SEND_STATUS_CODE status_code; //!< status - int ret_from_hal_tx; //!< HAL_tx_handlers の返り値 + int ret_from_hal_tx; //!< HAL_tx_handlers の返り値 // 今後詳細情報を拡張するなら，ここに入れる } CDS_StreamSendStatus; @@ -233,14 +233,13 @@ typedef struct * @struct CDS_Config * @brief ComponentDriverSuper の設定 * - * 各IFはこれを継承してつかう． * CDS_Config のメンバはすべての ComponentDriver から非公開とし， getter / setter でアクセスする */ typedef struct { struct { - uint16_t hal_rx_buffer_size_; /*!< HAL_rx_handlers で受信するときの一次バッファのサイズ + uint16_t hal_rx_buffer_size_; /*!< HAL_rx_handlers で受信するときの一次バッファのサイズ DS ではまず HAL_rx_handlers を全 ComponentDriver 共通の一次バッファにコピーした後， CDS_StreamRecBuffer に push して解析していく． HAL_rx_handlers で読み込む量が多すぎると，CDS_StreamRecBuffer に収まりきらないことがあるので， @@ -402,13 +401,13 @@ struct CDS_StreamConfig /** * @struct ComponentDriverSuper * @brief ComponentDriverSuper の設定 - * 各 IF はこれを継承してつかう． + * 各 Driver はこれを継承してつかう． */ struct ComponentDriverSuper { // 【継承先まで公開】 - HAL_HANDLER_ID hal_handler_id; //!< 継承先の機器の使用 IF - void* hal_config; //!< IF 設定 + HAL_HANDLER_ID hal_handler_id; //!< 継承先の機器の使用 HAL + void* hal_config; //!< HAL 設定 CDS_Config config; //!< ComponentDriverSuper の設定 @@ -430,7 +429,7 @@ struct ComponentDriverSuper * デフォルト値の上書きは load_init_setting で行う * @note ComponentDriverSuper を使用する時は起動時に必ず実施すること * @param p_super: 初期化する ComponentDriverSuper 構造体へのポインタ - * @param hal_config: 初期化する ComponentDriverで用いられている IF の config 構造体 + * @param hal_config: 初期化する ComponentDriverで用いられている HAL の config 構造体 * @param rx_buffer: 初期化する ComponentDriverSuper の stream 0 で用いられるフレーム受信バッファ * @param load_init_setting: ComponentDriverSuper の初期設定ロード関数ポインタ * @return CDS_ERR_CODE @@ -448,7 +447,7 @@ CDS_ERR_CODE CDS_init(ComponentDriverSuper* p_super, * デフォルト値の上書きは load_init_setting で行う * @note ComponentDriverSuper を使用する時は起動時に必ず実施すること * @param p_super: 初期化する ComponentDriverSuper 構造体へのポインタ - * @param hal_config: 初期化する ComponentDriverで用いられている IF の config 構造体 + * @param hal_config: 初期化する ComponentDriverで用いられている HAL の config 構造体 * @param rx_buffers: 初期化する ComponentDriverSuper で用いられるフレーム受信バッファ．使用しない stream は NULL を設定しておく * @param load_init_setting: ComponentDriverSuper の初期設定ロード関数ポインタ * @return CDS_ERR_CODE diff --git a/examples/mobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h b/examples/mobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h index 8604559e0..e5bff002c 100644 --- a/examples/mobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h +++ b/examples/mobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h @@ -7,7 +7,7 @@ #include "./driver_super_params.h" -#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_HAL_RX_BUFFER_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 +#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_HAL_RX_BUFFER_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 UART などの非同期通信はメモリに余力があれば CDS_HAL_RX_BUFFER_SIZE * 2 を推奨 詳細は dirver_super.c の @note を参照 */ diff --git a/examples/mobc/src/src_user/Settings/component_driver_super/driver_super_params.h b/examples/mobc/src/src_user/Settings/component_driver_super/driver_super_params.h index 51013f828..378bfe8e1 100644 --- a/examples/mobc/src/src_user/Settings/component_driver_super/driver_super_params.h +++ b/examples/mobc/src/src_user/Settings/component_driver_super/driver_super_params.h @@ -9,6 +9,6 @@ #undef CDS_HAL_RX_BUFFER_SIZE #define CDS_STREAM_MAX (3) -#define CDS_HAL_RX_BUFFER_SIZE (1024) +#define CDS_HAL_RX_BUFFER_SIZE (1024) #endif 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 fd3549f82..614e3877e 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs.h +++ b/examples/mobc/src/src_user/component_driver/com/gs.h @@ -36,7 +36,7 @@ typedef struct struct { CDS_ERR_CODE rec_status; //!< ComponentDriverSuper からの受信結果 - int ret_from_hal_rx; //!< UART or CCSDS からの返り値 + int ret_from_hal_rx; //!< UART or CCSDS からの返り値 CCP_DEST_TYPE last_dest_type; //!< 最後に受信したパケットの dest type cycle_t last_rec_time; //!< 最後に受信した時刻 PH_ACK cmd_ack; //!< 受信した CMD の実行結果 diff --git a/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h b/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h index 8604559e0..39c5f736b 100644 --- a/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h +++ b/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h @@ -7,7 +7,7 @@ #include "./driver_super_params.h" -#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_HAL_RX_BUFFER_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 +#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_HAL_RX_BUFFE_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 UART などの非同期通信はメモリに余力があれば CDS_HAL_RX_BUFFER_SIZE * 2 を推奨 詳細は dirver_super.c の @note を参照 */ From 34196517697fb91ddc2680a55682138fc8f05769 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 27 Oct 2023 00:02:16 +0900 Subject: [PATCH 2/6] fix HAL_HANDLER_ID --- .../component_driver_super/hal_handler_registry.c | 8 ++++---- .../component_driver_super/hal_handler_registry.h | 12 ++++++------ .../mobc/src/src_user/component_driver/aocs/aobc.c | 2 +- examples/mobc/src/src_user/component_driver/com/gs.c | 2 +- .../src/src_user/component_driver/etc/uart_test.c | 2 +- .../component_driver_super/hal_handler_registry.c | 8 ++++---- .../component_driver_super/hal_handler_registry.h | 10 +++++----- .../subobc/src/src_user/component_driver/etc/mobc.c | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c b/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c index 6753800d8..f4fe89319 100644 --- a/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c +++ b/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c @@ -3,12 +3,12 @@ #include -int (*HAL_init_handlers[])(void* my_if) = { CCSDS_init, UART_init}; +int (*HAL_init_handlers[])(void* config) = { CCSDS_init, UART_init }; -int (*HAL_rx_handlers[])(void* my_if, void* data_v, int buffer_size) = { CCSDS_rx, UART_rx}; +int (*HAL_rx_handlers[])(void* config, void* buffer, int buffer_size) = { CCSDS_rx, UART_rx }; -int (*HAL_tx_handlers[])(void* my_if, void* data_v, int data_size) = { CCSDS_tx, UART_tx}; +int (*HAL_tx_handlers[])(void* config, void* data, int data_size) = { CCSDS_tx, UART_tx }; -int (*HAL_reopen_handlers[])(void* my_if, int reason) = { CCSDS_reopen, UART_reopen}; +int (*HAL_reopen_handlers[])(void* config, int reason) = { CCSDS_reopen, UART_reopen }; #pragma section diff --git a/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h b/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h index e8c844de9..4b7c4ff0e 100644 --- a/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h +++ b/examples/mobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h @@ -7,8 +7,8 @@ typedef enum { - CCSDS, - UART, + HAL_HANDLER_ID_CCSDS, + HAL_HANDLER_ID_UART, HAL_HANDLER_ID_MAX } HAL_HANDLER_ID; @@ -17,9 +17,9 @@ typedef enum IF_REOPEN_TLM_DISRUPTION = 100 } HAL_HANDLER_REOPEN_REASON; -extern int (*HAL_init_handlers[] )(void* my_if); -extern int (*HAL_rx_handlers[] )(void* my_if, void* data_v, int buffer_size); -extern int (*HAL_tx_handlers[] )(void* my_if, void* data_v, int data_size); -extern int (*HAL_reopen_handlers[])(void* my_if, int reason); +extern int (*HAL_init_handlers[] )(void* config); +extern int (*HAL_rx_handlers[] )(void* config, void* buffer, int buffer_size); +extern int (*HAL_tx_handlers[] )(void* config, void* data, int data_size); +extern int (*HAL_reopen_handlers[])(void* config, int reason); #endif diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc.c b/examples/mobc/src/src_user/component_driver/aocs/aobc.c index 14e615d92..5913e65f3 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc.c +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc.c @@ -49,7 +49,7 @@ static CDS_ERR_CODE AOBC_load_driver_super_init_settings_(ComponentDriverSuper* { CDS_StreamConfig* p_stream_config; - p_super->hal_handler_id = UART; + p_super->hal_handler_id = HAL_HANDLER_ID_UART; // stream は 0 のみ p_stream_config = &(p_super->stream_config[AOBC_STREAM_TLM_CMD]); 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 3c5e8b8bb..2fc69ef5f 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs.c +++ b/examples/mobc/src/src_user/component_driver/com/gs.c @@ -126,7 +126,7 @@ CDS_INIT_ERR_CODE GS_init(GS_Driver* gs_driver, static CDS_ERR_CODE GS_load_ccsds_driver_super_init_settings_(ComponentDriverSuper* p_super) { - p_super->hal_handler_id = CCSDS; + p_super->hal_handler_id = HAL_HANDLER_ID_CCSDS; GS_load_default_driver_super_init_settings_(p_super); return CDS_ERR_CODE_OK; diff --git a/examples/mobc/src/src_user/component_driver/etc/uart_test.c b/examples/mobc/src/src_user/component_driver/etc/uart_test.c index 5808e19ed..4b53c5753 100644 --- a/examples/mobc/src/src_user/component_driver/etc/uart_test.c +++ b/examples/mobc/src/src_user/component_driver/etc/uart_test.c @@ -51,7 +51,7 @@ static CDS_ERR_CODE UART_TEST_load_driver_super_init_settings_(ComponentDriverSu { CDS_StreamConfig* p_stream_config; - p_super->hal_handler_id = UART; + p_super->hal_handler_id = HAL_HANDLER_ID_UART; // stream0の設定 p_stream_config = &(p_super->stream_config[UART_TEST_STREAM_FIX]); diff --git a/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c index 1869e23dc..450a493bf 100644 --- a/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c +++ b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.c @@ -3,12 +3,12 @@ #include -int (*HAL_init_handlers[])(void* my_if) = { UART_init}; +int (*HAL_init_handlers[])(void* config) = { UART_init }; -int (*HAL_rx_handlers[])(void* my_if, void* data_v, int buffer_size) = { UART_rx}; +int (*HAL_rx_handlers[])(void* config, void* buffer, int buffer_size) = { UART_rx }; -int (*HAL_tx_handlers[])(void* my_if, void* data_v, int data_size) = { UART_tx}; +int (*HAL_tx_handlers[])(void* config, void* data, int data_size) = { UART_tx }; -int (*HAL_reopen_handlers[])(void* my_if, int reason) = { UART_reopen}; +int (*HAL_reopen_handlers[])(void* config, int reason) = { UART_reopen }; #pragma section diff --git a/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h index 4d3603088..62d7589a6 100644 --- a/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h +++ b/examples/subobc/src/src_user/Settings/component_driver_super/hal_handler_registry.h @@ -7,7 +7,7 @@ typedef enum { - UART, + HAL_HANDLER_ID_UART, HAL_HANDLER_ID_MAX } HAL_HANDLER_ID; @@ -16,9 +16,9 @@ typedef enum IF_REOPEN_TLM_DISRUPTION = 100 } HAL_HANDLER_REOPEN_REASON; -extern int (*HAL_init_handlers[] )(void* my_if); -extern int (*HAL_rx_handlers[] )(void* my_if, void* data_v, int buffer_size); -extern int (*HAL_tx_handlers[] )(void* my_if, void* data_v, int data_size); -extern int (*HAL_reopen_handlers[])(void* my_if, int reason); +extern int (*HAL_init_handlers[] )(void* config); +extern int (*HAL_rx_handlers[] )(void* config, void* buffer, int buffer_size); +extern int (*HAL_tx_handlers[] )(void* config, void* data, int data_size); +extern int (*HAL_reopen_handlers[])(void* config, int reason); #endif diff --git a/examples/subobc/src/src_user/component_driver/etc/mobc.c b/examples/subobc/src/src_user/component_driver/etc/mobc.c index 9515f68e3..3c0baaf4b 100644 --- a/examples/subobc/src/src_user/component_driver/etc/mobc.c +++ b/examples/subobc/src/src_user/component_driver/etc/mobc.c @@ -48,7 +48,7 @@ static CDS_ERR_CODE MOBC_load_driver_super_init_settings_(ComponentDriverSuper* { CDS_StreamConfig* p_stream_config; - p_super->hal_handler_id = UART; + p_super->hal_handler_id = HAL_HANDLER_ID_UART; // stream は 0 のみ p_stream_config = &(p_super->stream_config[MOBC_STREAM_TLM_CMD]); From 57d1f13523d67bf331aea2712359f01f9f3a556f Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 27 Oct 2023 00:08:32 +0900 Subject: [PATCH 3/6] fix indent --- component_driver/driver_super.c | 2 +- component_driver/driver_super.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/component_driver/driver_super.c b/component_driver/driver_super.c index db8315ce7..8521d1f17 100644 --- a/component_driver/driver_super.c +++ b/component_driver/driver_super.c @@ -1321,7 +1321,7 @@ uint16_t CDSC_get_hal_rx_buffer_size(const ComponentDriverSuper* p_super) } CDS_ERR_CODE CDSC_set_hal_rx_buffer_size(ComponentDriverSuper* p_super, - const uint16_t hal_rx_buffer_size) + const uint16_t hal_rx_buffer_size) { if (hal_rx_buffer_size > CDS_HAL_RX_BUFFER_SIZE) return CDS_ERR_CODE_ERR; p_super->config.settings.hal_rx_buffer_size_ = hal_rx_buffer_size; diff --git a/component_driver/driver_super.h b/component_driver/driver_super.h index 1b6993488..9282a9979 100644 --- a/component_driver/driver_super.h +++ b/component_driver/driver_super.h @@ -543,7 +543,7 @@ CDS_ERR_CODE CDS_send_req_tlm_cmd(ComponentDriverSuper* p_super, uint8_t stream) // ###### CDS_Config Getter/Setter of Settings ###### uint16_t CDSC_get_hal_rx_buffer_size(const ComponentDriverSuper* p_super); CDS_ERR_CODE CDSC_set_hal_rx_buffer_size(ComponentDriverSuper* p_super, - const uint16_t hal_rx_buffer_size); + const uint16_t hal_rx_buffer_size); uint8_t CDSC_get_should_monitor_for_rx_disruption(const ComponentDriverSuper* p_super); void CDSC_enable_monitor_for_rx_disruption(ComponentDriverSuper* p_super); void CDSC_disable_monitor_for_rx_disruption(ComponentDriverSuper* p_super); From 05730d41fc295a5caeab24f1573151967d8b41cc Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 27 Oct 2023 00:11:36 +0900 Subject: [PATCH 4/6] rename --- examples/mobc/src/src_user/component_driver/com/gs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2fc69ef5f..52bdcdb03 100644 --- a/examples/mobc/src/src_user/component_driver/com/gs.c +++ b/examples/mobc/src/src_user/component_driver/com/gs.c @@ -134,7 +134,7 @@ static CDS_ERR_CODE GS_load_ccsds_driver_super_init_settings_(ComponentDriverSup static CDS_ERR_CODE GS_load_uart_driver_super_init_settings_(ComponentDriverSuper* p_super) { - p_super->hal_handler_id = UART; + p_super->hal_handler_id = HAL_HANDLER_ID_UART; GS_load_default_driver_super_init_settings_(p_super); return CDS_ERR_CODE_OK; From e3c910f2ae5c163d887e3b09ee5ac5014b4cd352 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 27 Oct 2023 00:15:42 +0900 Subject: [PATCH 5/6] typo --- .../Settings/component_driver_super/driver_buffer_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h b/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h index 39c5f736b..e5bff002c 100644 --- a/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h +++ b/examples/subobc/src/src_user/Settings/component_driver_super/driver_buffer_define.h @@ -7,7 +7,7 @@ #include "./driver_super_params.h" -#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_HAL_RX_BUFFE_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 +#define CDS_STREAM_REC_BUFFER_SIZE_DEFAULT (CDS_HAL_RX_BUFFER_SIZE * 2) /*!< CDS_StreamRecBuffer のバッファサイズのデフォルト値 UART などの非同期通信はメモリに余力があれば CDS_HAL_RX_BUFFER_SIZE * 2 を推奨 詳細は dirver_super.c の @note を参照 */ From 05c50292eb90f06d361b7e6f938df43992554f2a Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Fri, 27 Oct 2023 00:19:50 +0900 Subject: [PATCH 6/6] update version --- Cargo.toml | 2 +- c2a_core_main.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7ad8a1c2e..157bcfa5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "4.0.0-beta.4" +version = "4.0.0-beta.5" [workspace] resolver = "2" diff --git a/c2a_core_main.h b/c2a_core_main.h index 82d1f2239..8a2aa8d63 100644 --- a/c2a_core_main.h +++ b/c2a_core_main.h @@ -10,6 +10,6 @@ void C2A_core_main(void); #define C2A_CORE_VER_MAJOR (4) #define C2A_CORE_VER_MINOR (0) #define C2A_CORE_VER_PATCH (0) -#define C2A_CORE_VER_PRE ("beta.4") +#define C2A_CORE_VER_PRE ("beta.5") #endif