From 8ce555cb5847b996770c45b0dfb763219c692813 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Thu, 2 Mar 2023 03:37:26 +0900 Subject: [PATCH 1/3] sed uart_test_instance to uart_test_driver --- .../DriverInstances/di_uart_test.c | 10 ++--- .../DriverInstances/di_uart_test.h | 2 +- .../src/src_user/Drivers/Etc/uart_test.c | 38 +++++++++---------- .../src/src_user/Drivers/Etc/uart_test.h | 18 ++++----- .../TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv | 28 +++++++------- .../SAMPLE_MOBC_TLM_DB_UART_TEST.csv | 28 +++++++------- .../src_user/TlmCmd/telemetry_definitions.c | 28 +++++++------- 7 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c b/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c index 1eed4271d..2af13e2b6 100644 --- a/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c +++ b/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c @@ -21,8 +21,8 @@ static void UART_TEST_update_(void); // static int UART_TEST_is_rec_flag_up_(uint32_t no); // FIXME: インスタンス名 -static UART_TEST_Driver uart_test_instance_; -const UART_TEST_Driver* const uart_test_instance = &uart_test_instance_; +static UART_TEST_Driver uart_test_driver_; +const UART_TEST_Driver* const uart_test_driver = &uart_test_driver_; // バッファ static DS_StreamRecBuffer DI_UART_TEST_rx_buffer_0_; @@ -77,7 +77,7 @@ static void UART_TEST_init_(void) rx_buffers[0] = &DI_UART_TEST_rx_buffer_0_; rx_buffers[1] = &DI_UART_TEST_rx_buffer_1_; - ret2 = UART_TEST_init(&uart_test_instance_, PORT_CH_UART_TEST, rx_buffers); + ret2 = UART_TEST_init(&uart_test_driver_, PORT_CH_UART_TEST, rx_buffers); if (ret2 != DS_INIT_OK) { Printf("UART_TEST init Failed! Err:%d \n", ret2); @@ -93,7 +93,7 @@ static void UART_TEST_update_(void) { DS_REC_ERR_CODE ret; - ret = UART_TEST_rec(&uart_test_instance_); + ret = UART_TEST_rec(&uart_test_driver_); // TODO: エラー処理 (void)ret; @@ -128,7 +128,7 @@ CCP_CmdRet Cmd_UART_TEST_SEND_TEST(const CommonCmdPacket* packet) id = param[0]; - ret = UART_TEST_send(&uart_test_instance_, id); + ret = UART_TEST_send(&uart_test_driver_, id); return DS_conv_cmd_err_to_ccp_cmd_ret(ret); } diff --git a/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.h b/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.h index 0cdb0b230..8f4de9848 100644 --- a/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.h +++ b/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.h @@ -9,7 +9,7 @@ #include #include -extern const UART_TEST_Driver* const uart_test_instance; +extern const UART_TEST_Driver* const uart_test_driver; // アプリケーション AppInfo UART_TEST_update(void); diff --git a/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.c b/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.c index ad4763dca..c940352d0 100644 --- a/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.c +++ b/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.c @@ -28,18 +28,18 @@ static DS_ERR_CODE UART_TEST_load_driver_super_init_settings_(DriverSuper* p_sup static DS_ERR_CODE UART_TEST_analyze_rec_data_(DS_StreamConfig* p_stream_config, void* p_driver); -DS_INIT_ERR_CODE UART_TEST_init(UART_TEST_Driver* uart_test_instance, uint8_t ch, DS_StreamRecBuffer* rx_buffers[DS_STREAM_MAX]) +DS_INIT_ERR_CODE UART_TEST_init(UART_TEST_Driver* uart_test_driver, uint8_t ch, DS_StreamRecBuffer* rx_buffers[DS_STREAM_MAX]) { DS_ERR_CODE ret; - uart_test_instance->driver.uart_config.ch = ch; - uart_test_instance->driver.uart_config.baudrate = 38400; - uart_test_instance->driver.uart_config.parity_settings = PARITY_SETTINGS_NONE; - uart_test_instance->driver.uart_config.data_length = UART_DATA_LENGTH_8BIT; - uart_test_instance->driver.uart_config.stop_bit = UART_STOP_BIT_1BIT; + uart_test_driver->driver.uart_config.ch = ch; + uart_test_driver->driver.uart_config.baudrate = 38400; + uart_test_driver->driver.uart_config.parity_settings = PARITY_SETTINGS_NONE; + uart_test_driver->driver.uart_config.data_length = UART_DATA_LENGTH_8BIT; + uart_test_driver->driver.uart_config.stop_bit = UART_STOP_BIT_1BIT; - ret = DS_init_streams(&(uart_test_instance->driver.super), - &(uart_test_instance->driver.uart_config), + ret = DS_init_streams(&(uart_test_driver->driver.super), + &(uart_test_driver->driver.uart_config), rx_buffers, UART_TEST_load_driver_super_init_settings_); if (ret != DS_ERR_CODE_OK) return DS_INIT_DS_INIT_ERR; @@ -90,25 +90,25 @@ static DS_ERR_CODE UART_TEST_load_driver_super_init_settings_(DriverSuper* p_sup } -DS_REC_ERR_CODE UART_TEST_rec(UART_TEST_Driver* uart_test_instance) +DS_REC_ERR_CODE UART_TEST_rec(UART_TEST_Driver* uart_test_driver) { DS_ERR_CODE ret; DS_StreamConfig* p_stream_config; - ret = DS_receive(&(uart_test_instance->driver.super)); + ret = DS_receive(&(uart_test_driver->driver.super)); if (ret != DS_ERR_CODE_OK) return DS_REC_DS_RECEIVE_ERR; - p_stream_config = &(uart_test_instance->driver.super.stream_config[UART_TEST_STREAM_FIX]); + p_stream_config = &(uart_test_driver->driver.super.stream_config[UART_TEST_STREAM_FIX]); if (DSSC_get_rec_status(p_stream_config)->status_code == DS_STREAM_REC_STATUS_FIXED_FRAME) { - ret = DS_analyze_rec_data(&(uart_test_instance->driver.super), UART_TEST_STREAM_FIX, uart_test_instance); + ret = DS_analyze_rec_data(&(uart_test_driver->driver.super), UART_TEST_STREAM_FIX, uart_test_driver); } - p_stream_config = &(uart_test_instance->driver.super.stream_config[UART_TEST_STREAM_VAR]); + p_stream_config = &(uart_test_driver->driver.super.stream_config[UART_TEST_STREAM_VAR]); if (DSSC_get_rec_status(p_stream_config)->status_code == DS_STREAM_REC_STATUS_FIXED_FRAME) { - ret = DS_analyze_rec_data(&(uart_test_instance->driver.super), UART_TEST_STREAM_VAR, uart_test_instance); + ret = DS_analyze_rec_data(&(uart_test_driver->driver.super), UART_TEST_STREAM_VAR, uart_test_driver); } // 返り値ぐだぐだだけど,まあテストコードなので... @@ -120,10 +120,10 @@ DS_REC_ERR_CODE UART_TEST_rec(UART_TEST_Driver* uart_test_instance) static DS_ERR_CODE UART_TEST_analyze_rec_data_(DS_StreamConfig* p_stream_config, void* p_driver) { - UART_TEST_Driver* uart_test_instance = (UART_TEST_Driver*)p_driver; + UART_TEST_Driver* uart_test_driver = (UART_TEST_Driver*)p_driver; uint16_t i; - (void)(uart_test_instance); + (void)(uart_test_driver); #ifndef SILS_FW Printf("DEC DATA: %d\n", DSSC_get_rec_status(p_stream_config)->fixed_frame_len); @@ -144,12 +144,12 @@ static DS_ERR_CODE UART_TEST_analyze_rec_data_(DS_StreamConfig* p_stream_config, } -DS_CMD_ERR_CODE UART_TEST_send(UART_TEST_Driver* uart_test_instance, uint8_t id) +DS_CMD_ERR_CODE UART_TEST_send(UART_TEST_Driver* uart_test_driver, uint8_t id) { DS_ERR_CODE ret; DS_StreamConfig* p_stream_config; - p_stream_config = &(uart_test_instance->driver.super.stream_config[UART_TEST_STREAM_FIX]); + p_stream_config = &(uart_test_driver->driver.super.stream_config[UART_TEST_STREAM_FIX]); switch (id) { @@ -195,7 +195,7 @@ DS_CMD_ERR_CODE UART_TEST_send(UART_TEST_Driver* uart_test_instance, uint8_t id) break; } - ret = DS_send_general_cmd(&(uart_test_instance->driver.super), UART_TEST_STREAM_FIX); + ret = DS_send_general_cmd(&(uart_test_driver->driver.super), UART_TEST_STREAM_FIX); if (ret == DS_ERR_CODE_OK) { return DS_CMD_OK; diff --git a/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h b/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h index 2eb1a46fc..caf8d3e04 100644 --- a/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h +++ b/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h @@ -38,26 +38,26 @@ typedef struct * @brief UART_TEST初期化 * * UART_TEST_Driver構造体のポインタを渡すことでポートを初期化し,UART_TEST_Driverの各メンバも初期化する - * @param uart_test_instance: 初期化するUART_TEST_Driver構造体へのポインタ - * @param ch: UART_TESTが接続されているUARTポート番号 - * @param rx_buffers: 受信バッファ + * @param uart_test_driver: 初期化するUART_TEST_Driver構造体へのポインタ + * @param ch: UART_TESTが接続されているUARTポート番号 + * @param rx_buffers: 受信バッファ * @return DS_INIT_ERR_CODE */ -DS_INIT_ERR_CODE UART_TEST_init(UART_TEST_Driver* uart_test_instance, uint8_t ch, DS_StreamRecBuffer* rx_buffers[DS_STREAM_MAX]); +DS_INIT_ERR_CODE UART_TEST_init(UART_TEST_Driver* uart_test_driver, uint8_t ch, DS_StreamRecBuffer* rx_buffers[DS_STREAM_MAX]); /** * @brief UART_TESTのデータ(テレメ)受信 - * @param uart_test_instance: UART_TEST_Driver構造体へのポインタ + * @param *uart_test_driver: UART_TEST_Driver構造体へのポインタ * @return DS_REC_ERR_CODE */ -DS_REC_ERR_CODE UART_TEST_rec(UART_TEST_Driver* uart_test_instance); +DS_REC_ERR_CODE UART_TEST_rec(UART_TEST_Driver* uart_test_driver); /** * @brief UART_TESTへのコマンド送信 - * @param uart_test_instance: UART_TEST_Driver構造体へのポインタ - * @param id: Cmd id + * @param uart_test_driver: UART_TEST_Driver構造体へのポインタ + * @param id: Cmd id * @return DS_CMD_ERR_CODE */ -DS_CMD_ERR_CODE UART_TEST_send(UART_TEST_Driver* uart_test_instance, uint8_t id); +DS_CMD_ERR_CODE UART_TEST_send(UART_TEST_Driver* uart_test_driver, uint8_t id); #endif diff --git a/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv b/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv index cf5e0ff57..7f3154f7e 100644 --- a/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv +++ b/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv @@ -20,20 +20,20 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,SH.ON_BOARD_SUBNET_TIME,uint32_t,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,SH.DEST_FLAGS,uint8_t,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),HEX,,,,,,,,, ,SH.DR_PARTITION,uint8_t,,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER.INFO.REC_STATUS.RET_FROM_IF_RX,uint8_t,(uint8_t)(uart_test_instance->driver.super.config.info.rec_status_.ret_from_if_rx),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER.INFO.RX_COUNT,uint32_t,uart_test_instance->driver.super.config.info.rx_count_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER0.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_instance->driver.super.stream_config[0].info.rec_status_.status_code),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, -,DRIVER0.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[0].info.rec_status_.fixed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER0.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_instance->driver.super.stream_config[0].info.rx_frame_fix_count_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER0.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->size,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER0.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->confirmed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER0.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->is_frame_fixed,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER1.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_instance->driver.super.stream_config[1].info.rec_status_.status_code),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, -,DRIVER1.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[1].info.rec_status_.fixed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER1.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_instance->driver.super.stream_config[1].info.rx_frame_fix_count_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER1.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->size,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER1.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->confirmed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DRIVER1.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->is_frame_fixed,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER.INFO.REC_STATUS.RET_FROM_IF_RX,uint8_t,(uint8_t)(uart_test_driver->driver.super.config.info.rec_status_.ret_from_if_rx),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER.INFO.RX_COUNT,uint32_t,uart_test_driver->driver.super.config.info.rx_count_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER0.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_driver->driver.super.stream_config[0].info.rec_status_.status_code),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, +,DRIVER0.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[0].info.rec_status_.fixed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER0.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_driver->driver.super.stream_config[0].info.rx_frame_fix_count_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER0.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->size,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER0.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->confirmed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER0.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->is_frame_fixed,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER1.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_driver->driver.super.stream_config[1].info.rec_status_.status_code),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, +,DRIVER1.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[1].info.rec_status_.fixed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER1.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_driver->driver.super.stream_config[1].info.rx_frame_fix_count_,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER1.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->size,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER1.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->confirmed_frame_len,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,DRIVER1.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->is_frame_fixed,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, diff --git a/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv b/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv index a6fe0105a..dbaaa8c5b 100644 --- a/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv +++ b/Examples/minimum_user/src/src_user/Settings/TlmCmd/DataBase/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv @@ -20,20 +20,20 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,SH.ON_BOARD_SUBNET_TIME,uint32_t,,PACKET,20,0,32,NONE,,,,,,,,, ,SH.DEST_FLAGS,uint8_t,,PACKET,24,0,8,HEX,,,,,,,,, ,SH.DR_PARTITION,uint8_t,,PACKET,25,0,8,NONE,,,,,,,,, -,DRIVER.INFO.REC_STATUS.RET_FROM_IF_RX,uint8_t,(uint8_t)(uart_test_instance->driver.super.config.info.rec_status_.ret_from_if_rx),PACKET,26,0,8,NONE,,,,,,,,, -,DRIVER.INFO.RX_COUNT,uint32_t,uart_test_instance->driver.super.config.info.rx_count_,PACKET,27,0,32,NONE,,,,,,,,, -,DRIVER0.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_instance->driver.super.stream_config[0].info.rec_status_.status_code),PACKET,31,0,8,STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, -,DRIVER0.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[0].info.rec_status_.fixed_frame_len,PACKET,32,0,16,NONE,,,,,,,,, -,DRIVER0.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_instance->driver.super.stream_config[0].info.rx_frame_fix_count_,PACKET,34,0,32,NONE,,,,,,,,, -,DRIVER0.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->size,PACKET,38,0,16,NONE,,,,,,,,, -,DRIVER0.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->confirmed_frame_len,PACKET,40,0,16,NONE,,,,,,,,, -,DRIVER0.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->is_frame_fixed,PACKET,42,0,8,NONE,,,,,,,,, -,DRIVER1.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_instance->driver.super.stream_config[1].info.rec_status_.status_code),PACKET,43,0,8,STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, -,DRIVER1.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[1].info.rec_status_.fixed_frame_len,PACKET,44,0,16,NONE,,,,,,,,, -,DRIVER1.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_instance->driver.super.stream_config[1].info.rx_frame_fix_count_,PACKET,46,0,32,NONE,,,,,,,,, -,DRIVER1.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->size,PACKET,50,0,16,NONE,,,,,,,,, -,DRIVER1.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->confirmed_frame_len,PACKET,52,0,16,NONE,,,,,,,,, -,DRIVER1.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->is_frame_fixed,PACKET,54,0,8,NONE,,,,,,,,, +,DRIVER.INFO.REC_STATUS.RET_FROM_IF_RX,uint8_t,(uint8_t)(uart_test_driver->driver.super.config.info.rec_status_.ret_from_if_rx),PACKET,26,0,8,NONE,,,,,,,,, +,DRIVER.INFO.RX_COUNT,uint32_t,uart_test_driver->driver.super.config.info.rx_count_,PACKET,27,0,32,NONE,,,,,,,,, +,DRIVER0.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_driver->driver.super.stream_config[0].info.rec_status_.status_code),PACKET,31,0,8,STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, +,DRIVER0.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[0].info.rec_status_.fixed_frame_len,PACKET,32,0,16,NONE,,,,,,,,, +,DRIVER0.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_driver->driver.super.stream_config[0].info.rx_frame_fix_count_,PACKET,34,0,32,NONE,,,,,,,,, +,DRIVER0.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->size,PACKET,38,0,16,NONE,,,,,,,,, +,DRIVER0.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->confirmed_frame_len,PACKET,40,0,16,NONE,,,,,,,,, +,DRIVER0.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->is_frame_fixed,PACKET,42,0,8,NONE,,,,,,,,, +,DRIVER1.INFO.REC_STATUS.STATUS_CODE,uint8_t,(uint8_t)(uart_test_driver->driver.super.stream_config[1].info.rec_status_.status_code),PACKET,43,0,8,STATUS,,,,,,,0=FINDING_HEADER@@1=RECEIVING_HEADER@@2=RECEIVING_FRAMELENGTH@@3=RECEIVING_DATA@@4=RECEIVING_FOOTER@@5=FIXED_FRAME@@6=DISABLE@@7=RX_FRAME_TOO_LONG@@8=RX_ERR@@9=VALIDATE_ERR@@10=OTHER_ERR,, +,DRIVER1.INFO.REC_STATUS.FIXED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[1].info.rec_status_.fixed_frame_len,PACKET,44,0,16,NONE,,,,,,,,, +,DRIVER1.INFO.RX_FRAME_FIX_COUNT,uint32_t,uart_test_driver->driver.super.stream_config[1].info.rx_frame_fix_count_,PACKET,46,0,32,NONE,,,,,,,,, +,DRIVER1.SETTINGS.RX_BUFFER.SIZE,uint16_t,uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->size,PACKET,50,0,16,NONE,,,,,,,,, +,DRIVER1.SETTINGS.RX_BUFFER.CONFIRMED_FRAME_LEN,uint16_t,uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->confirmed_frame_len,PACKET,52,0,16,NONE,,,,,,,,, +,DRIVER1.SETTINGS.RX_BUFFER.IS_FRAME_FIXED,uint8_t,uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->is_frame_fixed,PACKET,54,0,8,NONE,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, diff --git a/Examples/minimum_user/src/src_user/TlmCmd/telemetry_definitions.c b/Examples/minimum_user/src/src_user/TlmCmd/telemetry_definitions.c index fbb921c41..1cf22a165 100644 --- a/Examples/minimum_user/src/src_user/TlmCmd/telemetry_definitions.c +++ b/Examples/minimum_user/src/src_user/TlmCmd/telemetry_definitions.c @@ -3431,20 +3431,20 @@ static TF_TLM_FUNC_ACK Tlm_UART_TEST_(uint8_t* packet, uint16_t* len, uint16_t m if (55 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; #ifndef BUILD_SETTINGS_FAST_BUILD - TF_copy_u8(&packet[26], (uint8_t)(uart_test_instance->driver.super.config.info.rec_status_.ret_from_if_rx)); - TF_copy_u32(&packet[27], uart_test_instance->driver.super.config.info.rx_count_); - TF_copy_u8(&packet[31], (uint8_t)(uart_test_instance->driver.super.stream_config[0].info.rec_status_.status_code)); - TF_copy_u16(&packet[32], uart_test_instance->driver.super.stream_config[0].info.rec_status_.fixed_frame_len); - TF_copy_u32(&packet[34], uart_test_instance->driver.super.stream_config[0].info.rx_frame_fix_count_); - TF_copy_u16(&packet[38], uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->size); - TF_copy_u16(&packet[40], uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->confirmed_frame_len); - TF_copy_u8(&packet[42], uart_test_instance->driver.super.stream_config[0].settings.rx_buffer_->is_frame_fixed); - TF_copy_u8(&packet[43], (uint8_t)(uart_test_instance->driver.super.stream_config[1].info.rec_status_.status_code)); - TF_copy_u16(&packet[44], uart_test_instance->driver.super.stream_config[1].info.rec_status_.fixed_frame_len); - TF_copy_u32(&packet[46], uart_test_instance->driver.super.stream_config[1].info.rx_frame_fix_count_); - TF_copy_u16(&packet[50], uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->size); - TF_copy_u16(&packet[52], uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->confirmed_frame_len); - TF_copy_u8(&packet[54], uart_test_instance->driver.super.stream_config[1].settings.rx_buffer_->is_frame_fixed); + TF_copy_u8(&packet[26], (uint8_t)(uart_test_driver->driver.super.config.info.rec_status_.ret_from_if_rx)); + TF_copy_u32(&packet[27], uart_test_driver->driver.super.config.info.rx_count_); + TF_copy_u8(&packet[31], (uint8_t)(uart_test_driver->driver.super.stream_config[0].info.rec_status_.status_code)); + TF_copy_u16(&packet[32], uart_test_driver->driver.super.stream_config[0].info.rec_status_.fixed_frame_len); + TF_copy_u32(&packet[34], uart_test_driver->driver.super.stream_config[0].info.rx_frame_fix_count_); + TF_copy_u16(&packet[38], uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->size); + TF_copy_u16(&packet[40], uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->confirmed_frame_len); + TF_copy_u8(&packet[42], uart_test_driver->driver.super.stream_config[0].settings.rx_buffer_->is_frame_fixed); + TF_copy_u8(&packet[43], (uint8_t)(uart_test_driver->driver.super.stream_config[1].info.rec_status_.status_code)); + TF_copy_u16(&packet[44], uart_test_driver->driver.super.stream_config[1].info.rec_status_.fixed_frame_len); + TF_copy_u32(&packet[46], uart_test_driver->driver.super.stream_config[1].info.rx_frame_fix_count_); + TF_copy_u16(&packet[50], uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->size); + TF_copy_u16(&packet[52], uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->confirmed_frame_len); + TF_copy_u8(&packet[54], uart_test_driver->driver.super.stream_config[1].settings.rx_buffer_->is_frame_fixed); #endif *len = 55; From 9523e8427d8ae2ddff8f4cae013e232915a585af Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Thu, 2 Mar 2023 03:41:06 +0900 Subject: [PATCH 2/3] del fixme comment --- .../src/src_user/Applications/DriverInstances/di_uart_test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c b/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c index 2af13e2b6..47dd8e9e5 100644 --- a/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c +++ b/Examples/minimum_user/src/src_user/Applications/DriverInstances/di_uart_test.c @@ -20,7 +20,6 @@ static void UART_TEST_update_(void); // static int UART_TEST_unset_rec_flag_(uint32_t no); // static int UART_TEST_is_rec_flag_up_(uint32_t no); -// FIXME: インスタンス名 static UART_TEST_Driver uart_test_driver_; const UART_TEST_Driver* const uart_test_driver = &uart_test_driver_; From b63d9879f9226b74c9a9b47086c3c3d91d9aa766 Mon Sep 17 00:00:00 2001 From: Ryo Suzumoto Date: Sat, 4 Mar 2023 16:44:02 +0900 Subject: [PATCH 3/3] fix small --- Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h b/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h index caf8d3e04..92f857603 100644 --- a/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h +++ b/Examples/minimum_user/src/src_user/Drivers/Etc/uart_test.h @@ -47,7 +47,7 @@ DS_INIT_ERR_CODE UART_TEST_init(UART_TEST_Driver* uart_test_driver, uint8_t ch, /** * @brief UART_TESTのデータ(テレメ)受信 - * @param *uart_test_driver: UART_TEST_Driver構造体へのポインタ + * @param uart_test_driver: UART_TEST_Driver構造体へのポインタ * @return DS_REC_ERR_CODE */ DS_REC_ERR_CODE UART_TEST_rec(UART_TEST_Driver* uart_test_driver);