Skip to content

Commit fb90dbf

Browse files
author
Kei
committed
Deleted namespace for ControlTableItem.
1 parent df1faec commit fb90dbf

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/actuator.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,6 @@
201201
#endif
202202

203203

204-
namespace DYNAMIXEL{
205-
206204
enum ControlTableItem{
207205
MODEL_NUMBER = 0,
208206
MODEL_INFORMATION,
@@ -299,6 +297,8 @@ enum ControlTableItem{
299297
LAST_DUMMY_ITEM = 0xFF
300298
};
301299

300+
namespace DYNAMIXEL{
301+
302302
typedef struct ControlTableItemInfo{
303303
uint16_t addr;
304304
uint8_t addr_length;

src/utility/slave.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,8 @@ Slave::rxInstPacket(uint8_t* p_param_buf, uint16_t param_buf_cap)
666666
begin_parse_dxl_packet(&info_rx_packet_, protocol_ver_idx_, p_param_buf, param_buf_cap);
667667
while(p_port_->available() > 0)
668668
{
669-
err = parse_dxl_packet(&info_rx_packet_, p_port_->read());
669+
uint8_t c = p_port_->read();
670+
err = parse_dxl_packet(&info_rx_packet_, c);
670671
if(err == DXL_LIB_OK){
671672
if((protocol_ver_idx_ == 2 && info_rx_packet_.inst_idx != DXL_INST_STATUS)
672673
|| protocol_ver_idx_ == 1){

0 commit comments

Comments
 (0)