From 74f6637e41ecea40caef93cc7d4311f41ddc6674 Mon Sep 17 00:00:00 2001 From: sookyungson Date: Fri, 14 Feb 2025 09:03:29 +0900 Subject: [PATCH 1/2] comment out for fixed build error --- library.properties | 4 ++-- src/dxl_c/protocol.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library.properties b/library.properties index f86bed8..43bf496 100644 --- a/library.properties +++ b/library.properties @@ -1,8 +1,8 @@ name=Dynamixel2Arduino -version=0.7.0 +version=0.8.0 author=ROBOTIS license=Apache-2.0 -maintainer=HongHyun Kim(khh@robotis.com) +maintainer=Sookyung Son(sukaa@robotis.com) sentence=DYNAMIXEL protocol Library for Arduino paragraph=This library helps the Arduino boards to communicate with DYNAMIXEL protocol. category=Communication diff --git a/src/dxl_c/protocol.h b/src/dxl_c/protocol.h index 95cdbac..e593216 100644 --- a/src/dxl_c/protocol.h +++ b/src/dxl_c/protocol.h @@ -99,7 +99,7 @@ struct InfoBulkWriteInst_t { } -using namespace DYNAMIXEL; +//using namespace DYNAMIXEL; //comment out for fixed build error #ifdef __cplusplus extern "C" { From 54ff758aa9de441adce027abd247ad9503e41870 Mon Sep 17 00:00:00 2001 From: sookyungson Date: Mon, 24 Feb 2025 11:21:55 +0900 Subject: [PATCH 2/2] fix: namespace duplication handling --- src/dxl_c/protocol.cpp | 1 + src/dxl_c/protocol.h | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dxl_c/protocol.cpp b/src/dxl_c/protocol.cpp index 7d7d220..51804e0 100644 --- a/src/dxl_c/protocol.cpp +++ b/src/dxl_c/protocol.cpp @@ -12,6 +12,7 @@ #define pgm_read_word_near(x) (*(uint16_t*)(x)) #endif +using namespace DYNAMIXEL; // 2.0 Protocol #define DXL2_0_PACKET_IDX_HEADER_1 0 diff --git a/src/dxl_c/protocol.h b/src/dxl_c/protocol.h index e593216..6a99801 100644 --- a/src/dxl_c/protocol.h +++ b/src/dxl_c/protocol.h @@ -97,9 +97,7 @@ struct InfoBulkWriteInst_t { InfoSyncBulkBuffer_t packet; } __attribute__((packed)); -} - -//using namespace DYNAMIXEL; //comment out for fixed build error +} // namespace DYNAMIXEL #ifdef __cplusplus extern "C" { @@ -258,7 +256,7 @@ DXLLibErrorCode_t parse_dxl_packet(InfoToParseDXLPacket_t* p_parse_packet, uint8 DXLLibErrorCode_t fast_begin_parse_dxl_packet(InfoToParseDXLPacket_t* p_parse_packet, uint8_t protocol_ver);//, uint8_t* p_param_buf, uint16_t param_buf_cap, uint8_t xel_count); DXLLibErrorCode_t fast_parse_dxl_packet(InfoToParseDXLPacket_t* p_parse_packet, uint8_t recv_data, - InfoSyncReadInst_t *sync_read, InfoBulkReadInst_t *bulk_read); + DYNAMIXEL::InfoSyncReadInst_t *sync_read, DYNAMIXEL::InfoBulkReadInst_t *bulk_read); #ifdef __cplusplus }