From 7a4c0e1a00cafd80d6ea15ecec9f095a18e09829 Mon Sep 17 00:00:00 2001 From: sksat Date: Tue, 17 Oct 2023 20:15:48 +0900 Subject: [PATCH] add CDS_ prefix to CDS constants and globals --- component_driver/cds_common_tlm_cmd_packet.c | 26 +++++++++---------- component_driver/cds_eb90_frame.c | 14 +++++----- component_driver/cds_eb90_frame.h | 24 ++++++++--------- component_driver/cds_eb90_packet.h | 2 +- .../v4-rename-component-driver-prefix.sh | 19 ++++++++++++++ 5 files changed, 52 insertions(+), 33 deletions(-) diff --git a/component_driver/cds_common_tlm_cmd_packet.c b/component_driver/cds_common_tlm_cmd_packet.c index 2264ac8d..fdb97e16 100644 --- a/component_driver/cds_common_tlm_cmd_packet.c +++ b/component_driver/cds_common_tlm_cmd_packet.c @@ -70,7 +70,7 @@ CDS_ERR_CODE CDS_CTCP_init(CDS_StreamConfig* p_stream_config, { // MOBC か sub OBC かによって，送信側 (tx 側) が CTP になるか CCP になるかは不明なため，ひとまず CTCP に // メモリが苦しい OBC もあるので，考えてもいいかも - const uint16_t max_frame_size = EB90_FRAME_HEADER_SIZE + CTCP_MAX_LEN + EB90_FRAME_FOOTER_SIZE; + const uint16_t max_frame_size = CDS_EB90_FRAME_HEADER_SIZE + CTCP_MAX_LEN + CDS_EB90_FRAME_FOOTER_SIZE; if (tx_frame_buffer_size < max_frame_size) { return CDS_ERR_CODE_ERR; @@ -82,14 +82,14 @@ CDS_ERR_CODE CDS_CTCP_init(CDS_StreamConfig* p_stream_config, CDSSC_set_tx_frame_size(p_stream_config, 0); // 送る直前に値をセットする // 定期的な受信はする - CDSSC_set_rx_header(p_stream_config, EB90_FRAME_kStx, EB90_FRAME_STX_SIZE); - CDSSC_set_rx_footer(p_stream_config, EB90_FRAME_kEtx, EB90_FRAME_ETX_SIZE); + CDSSC_set_rx_header(p_stream_config, CDS_EB90_FRAME_kStx, CDS_EB90_FRAME_STX_SIZE); + CDSSC_set_rx_footer(p_stream_config, CDS_EB90_FRAME_kEtx, CDS_EB90_FRAME_ETX_SIZE); CDSSC_set_rx_frame_size(p_stream_config, -1); // 可変 CDSSC_set_max_rx_frame_size(p_stream_config, max_frame_size); - CDSSC_set_rx_framelength_pos(p_stream_config, EB90_FRAME_STX_SIZE); + CDSSC_set_rx_framelength_pos(p_stream_config, CDS_EB90_FRAME_STX_SIZE); CDSSC_set_rx_framelength_type_size(p_stream_config, 2); CDSSC_set_rx_framelength_offset(p_stream_config, - EB90_FRAME_HEADER_SIZE + EB90_FRAME_FOOTER_SIZE); + CDS_EB90_FRAME_HEADER_SIZE + CDS_EB90_FRAME_FOOTER_SIZE); CDSSC_set_data_analyzer(p_stream_config, data_analyzer); // 定期 TLM の監視機能の有効化はここではしないので， ComponentDriver 側でやる @@ -106,7 +106,7 @@ CDS_ERR_CODE CDS_CTCP_set_tx_frame(CDS_StreamConfig* p_stream_config, size_t size; uint16_t crc; uint16_t packet_len = CTCP_get_packet_len(send_packet); - uint16_t frame_len = (uint16_t)(packet_len + EB90_FRAME_HEADER_SIZE + EB90_FRAME_FOOTER_SIZE); + uint16_t frame_len = (uint16_t)(packet_len + CDS_EB90_FRAME_HEADER_SIZE + CDS_EB90_FRAME_FOOTER_SIZE); uint8_t* tx_frame = CDSSC_get_tx_frame_as_non_const_pointer(p_stream_config); if (frame_len > CDSSC_get_tx_frame_buffer_size(p_stream_config)) return CDS_ERR_CODE_ERR; @@ -114,10 +114,10 @@ CDS_ERR_CODE CDS_CTCP_set_tx_frame(CDS_StreamConfig* p_stream_config, CDSSC_set_tx_frame_size(p_stream_config, frame_len); pos = 0; - size = EB90_FRAME_STX_SIZE; - memcpy(&(tx_frame[pos]), EB90_FRAME_kStx, size); + size = CDS_EB90_FRAME_STX_SIZE; + memcpy(&(tx_frame[pos]), CDS_EB90_FRAME_kStx, size); pos += size; - size = EB90_FRAME_LEN_SIZE; + size = CDS_EB90_FRAME_LEN_SIZE; ENDIAN_memcpy(&(tx_frame[pos]), &packet_len, size); // ここはエンディアンを気にする！ pos += size; @@ -125,12 +125,12 @@ CDS_ERR_CODE CDS_CTCP_set_tx_frame(CDS_StreamConfig* p_stream_config, memcpy(&(tx_frame[pos]), send_packet->packet, size); pos += size; - crc = EB90_FRAME_calc_crc(tx_frame + EB90_FRAME_HEADER_SIZE, pos - EB90_FRAME_HEADER_SIZE); - size = EB90_FRAME_CRC_SIZE; + crc = EB90_FRAME_calc_crc(tx_frame + CDS_EB90_FRAME_HEADER_SIZE, pos - CDS_EB90_FRAME_HEADER_SIZE); + size = CDS_EB90_FRAME_CRC_SIZE; ENDIAN_memcpy(&(tx_frame[pos]), &crc, size); // ここはエンディアンを気にする！ pos += size; - size = EB90_FRAME_ETX_SIZE; - memcpy(&(tx_frame[pos]), EB90_FRAME_kEtx, size); + size = CDS_EB90_FRAME_ETX_SIZE; + memcpy(&(tx_frame[pos]), CDS_EB90_FRAME_kEtx, size); return CDS_ERR_CODE_OK; } diff --git a/component_driver/cds_eb90_frame.c b/component_driver/cds_eb90_frame.c index 14c91938..aa30b38f 100644 --- a/component_driver/cds_eb90_frame.c +++ b/component_driver/cds_eb90_frame.c @@ -7,29 +7,29 @@ #include "../library/endian.h" #include "../library/crc.h" -const uint8_t EB90_FRAME_kStx[EB90_FRAME_STX_SIZE] = {EB90_FRAME_STX_1ST_BYTE, EB90_FRAME_STX_2ND_BYTE}; -const uint8_t EB90_FRAME_kEtx[EB90_FRAME_ETX_SIZE] = {EB90_FRAME_ETX_1ST_BYTE, EB90_FRAME_ETX_2ND_BYTE}; +const uint8_t CDS_EB90_FRAME_kStx[CDS_EB90_FRAME_STX_SIZE] = {CDS_EB90_FRAME_STX_1ST_BYTE, CDS_EB90_FRAME_STX_2ND_BYTE}; +const uint8_t CDS_EB90_FRAME_kEtx[CDS_EB90_FRAME_ETX_SIZE] = {CDS_EB90_FRAME_ETX_1ST_BYTE, CDS_EB90_FRAME_ETX_2ND_BYTE}; uint16_t CDS_EB90_FRAME_get_packet_length(const CDS_StreamConfig* p_stream_config) { uint16_t length; - ENDIAN_memcpy(&length, &(CDSSC_get_rx_frame(p_stream_config)[2]), EB90_FRAME_LEN_SIZE); + ENDIAN_memcpy(&length, &(CDSSC_get_rx_frame(p_stream_config)[2]), CDS_EB90_FRAME_LEN_SIZE); return length; } const uint8_t* CDS_EB90_FRAME_get_packet_head(const CDS_StreamConfig* p_stream_config) { - return &(CDSSC_get_rx_frame(p_stream_config)[EB90_FRAME_HEADER_SIZE]); + return &(CDSSC_get_rx_frame(p_stream_config)[CDS_EB90_FRAME_HEADER_SIZE]); } uint16_t CDS_EB90_FRAME_get_crc(const CDS_StreamConfig* p_stream_config) { uint16_t crc; - uint16_t offset = EB90_FRAME_HEADER_SIZE + CDS_EB90_FRAME_get_packet_length(p_stream_config); - ENDIAN_memcpy(&crc, &(CDSSC_get_rx_frame(p_stream_config)[offset]), EB90_FRAME_CRC_SIZE); + uint16_t offset = CDS_EB90_FRAME_HEADER_SIZE + CDS_EB90_FRAME_get_packet_length(p_stream_config); + ENDIAN_memcpy(&crc, &(CDSSC_get_rx_frame(p_stream_config)[offset]), CDS_EB90_FRAME_CRC_SIZE); return crc; } @@ -38,7 +38,7 @@ uint8_t CDS_EB90_FRAME_is_valid_crc(const CDS_StreamConfig* p_stream_config) { uint16_t len = CDS_EB90_FRAME_get_packet_length(p_stream_config); const uint8_t* head = CDS_EB90_FRAME_get_packet_head(p_stream_config); - return (EB90_FRAME_calc_crc(head, len + EB90_FRAME_CRC_SIZE) == 0) ? 1 : 0; + return (EB90_FRAME_calc_crc(head, len + CDS_EB90_FRAME_CRC_SIZE) == 0) ? 1 : 0; } diff --git a/component_driver/cds_eb90_frame.h b/component_driver/cds_eb90_frame.h index dcc8533d..2b03cede 100644 --- a/component_driver/cds_eb90_frame.h +++ b/component_driver/cds_eb90_frame.h @@ -37,20 +37,20 @@ #include #include "driver_super.h" -#define EB90_FRAME_STX_SIZE (2) //!< EB90 Frame の STX のサイズ -#define EB90_FRAME_ETX_SIZE (2) //!< EB90 Frame の ETX のサイズ -#define EB90_FRAME_LEN_SIZE (2) //!< EB90 Frame の LEN のサイズ -#define EB90_FRAME_CRC_SIZE (2) //!< EB90 Frame の CRC のサイズ -#define EB90_FRAME_HEADER_SIZE (EB90_FRAME_STX_SIZE + EB90_FRAME_LEN_SIZE) //!< EB90 Frame のヘッダサイズ -#define EB90_FRAME_FOOTER_SIZE (EB90_FRAME_ETX_SIZE + EB90_FRAME_CRC_SIZE) //!< EB90 Frame のフッタサイズ +#define CDS_EB90_FRAME_STX_SIZE (2) //!< EB90 Frame の STX のサイズ +#define CDS_EB90_FRAME_ETX_SIZE (2) //!< EB90 Frame の ETX のサイズ +#define CDS_EB90_FRAME_LEN_SIZE (2) //!< EB90 Frame の LEN のサイズ +#define CDS_EB90_FRAME_CRC_SIZE (2) //!< EB90 Frame の CRC のサイズ +#define CDS_EB90_FRAME_HEADER_SIZE (CDS_EB90_FRAME_STX_SIZE + CDS_EB90_FRAME_LEN_SIZE) //!< EB90 Frame のヘッダサイズ +#define CDS_EB90_FRAME_FOOTER_SIZE (CDS_EB90_FRAME_ETX_SIZE + CDS_EB90_FRAME_CRC_SIZE) //!< EB90 Frame のフッタサイズ -#define EB90_FRAME_STX_1ST_BYTE (0xEB) //!< EB90 Frame の STX 1st byte -#define EB90_FRAME_STX_2ND_BYTE (0x90) //!< EB90 Frame の STX 2nd byte -#define EB90_FRAME_ETX_1ST_BYTE (0xC5) //!< EB90 Frame の ETX 1st byte -#define EB90_FRAME_ETX_2ND_BYTE (0x79) //!< EB90 Frame の ETX 2nd byte +#define CDS_EB90_FRAME_STX_1ST_BYTE (0xEB) //!< EB90 Frame の STX 1st byte +#define CDS_EB90_FRAME_STX_2ND_BYTE (0x90) //!< EB90 Frame の STX 2nd byte +#define CDS_EB90_FRAME_ETX_1ST_BYTE (0xC5) //!< EB90 Frame の ETX 1st byte +#define CDS_EB90_FRAME_ETX_2ND_BYTE (0x79) //!< EB90 Frame の ETX 2nd byte -extern const uint8_t EB90_FRAME_kStx[EB90_FRAME_STX_SIZE]; -extern const uint8_t EB90_FRAME_kEtx[EB90_FRAME_ETX_SIZE]; +extern const uint8_t CDS_EB90_FRAME_kStx[CDS_EB90_FRAME_STX_SIZE]; +extern const uint8_t CDS_EB90_FRAME_kEtx[CDS_EB90_FRAME_ETX_SIZE]; /** * @brief Packet Length の取得 diff --git a/component_driver/cds_eb90_packet.h b/component_driver/cds_eb90_packet.h index 2c4e671e..e032fc1d 100644 --- a/component_driver/cds_eb90_packet.h +++ b/component_driver/cds_eb90_packet.h @@ -29,7 +29,7 @@ #include #include "driver_super.h" -#define EB90_PACKET_HEADER_SIZE (4) //!< EB90 Packet のヘッダサイズ +#define CDS_EB90_PACKET_HEADER_SIZE (4) //!< EB90 Packet のヘッダサイズ /** * @brief Version ID の取得 diff --git a/script/migration/v4-rename-component-driver-prefix.sh b/script/migration/v4-rename-component-driver-prefix.sh index fe2c13bb..befa08ca 100755 --- a/script/migration/v4-rename-component-driver-prefix.sh +++ b/script/migration/v4-rename-component-driver-prefix.sh @@ -23,5 +23,24 @@ for i in ${!remove_suffix[@]}; do done done +echo "rename constants" +constants=("EB90_PACKET_HEADER_SIZE" "EB90_FRAME_(MACRO_ANY)_SIZE" "EB90_FRAME_(MACRO_ANY)_BYTE") +for i in ${!constants[@]}; do + match_org=$(echo "${constants[$i]}" | sed -e "s#(MACRO_ANY)#(\[0-9A-Z_\]\*)#g") + match_new=$(echo "${constants[$i]}" | sed -e "s#(MACRO_ANY)#\\\1#g") + + echo " ${match_org} -> CDS_${match_new}" + find . -name "*" -not -path "*/.git/*" -type f -print0 \ + | xargs -0 sed -i -E "s#${match_org}#CDS_${match_new}#g" +done + +echo "rename globals" +global=("EB90_FRAME_kStx" "EB90_FRAME_kEtx") +for i in ${!global[@]}; do + echo " ${global[$i]} -> CDS_${global[$i]}" + find . -name "*" -not -path "*/.git/*" -type f -print0 \ + | xargs -0 sed -i -E "s#${global[$i]}#CDS_${global[$i]}#g" +done + git restore src/src_user/Settings/tlm_cmd/data_base/CMD_DB/*.xlsm git restore src/src_user/Settings/tlm_cmd/data_base/TLM_DB/*.xlsm