Skip to content

Commit 2fd4c4b

Browse files
committed
refactor: Update item comparison logic in Dynamixel read/write type checks for consistency
1 parent 152a338 commit 2fd4c4b

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

src/dynamixel/dynamixel.cpp

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -894,19 +894,15 @@ bool Dynamixel::checkReadType()
894894
return BULK;
895895
}
896896

897-
if (read_data_list_.at(dxl_index).item_name.size() !=
898-
read_data_list_.at(dxl_index - 1).item_name.size())
897+
if (read_data_list_.at(dxl_index).item_size.size() !=
898+
read_data_list_.at(dxl_index - 1).item_size.size())
899899
{
900900
return BULK;
901901
}
902-
for (size_t item_index = 0; item_index < read_data_list_.at(dxl_index).item_name.size();
902+
for (size_t item_index = 0; item_index < read_data_list_.at(dxl_index).item_size.size();
903903
item_index++)
904904
{
905-
if (read_data_list_.at(dxl_index).item_name.at(item_index) !=
906-
read_data_list_.at(dxl_index - 1).item_name.at(item_index) ||
907-
read_data_list_.at(dxl_index).item_addr.at(item_index) !=
908-
read_data_list_.at(dxl_index - 1).item_addr.at(item_index) ||
909-
read_data_list_.at(dxl_index).item_size.at(item_index) !=
905+
if (read_data_list_.at(dxl_index).item_size.at(item_index) !=
910906
read_data_list_.at(dxl_index - 1).item_size.at(item_index))
911907
{
912908
return BULK;
@@ -946,19 +942,15 @@ bool Dynamixel::checkWriteType()
946942
return BULK;
947943
}
948944

949-
if (write_data_list_.at(dxl_index).item_name.size() !=
950-
write_data_list_.at(dxl_index - 1).item_name.size())
945+
if (write_data_list_.at(dxl_index).item_size.size() !=
946+
write_data_list_.at(dxl_index - 1).item_size.size())
951947
{
952948
return BULK;
953949
}
954-
for (size_t item_index = 0; item_index < write_data_list_.at(dxl_index).item_name.size();
950+
for (size_t item_index = 0; item_index < write_data_list_.at(dxl_index).item_size.size();
955951
item_index++)
956952
{
957-
if (write_data_list_.at(dxl_index).item_name.at(item_index) !=
958-
write_data_list_.at(dxl_index - 1).item_name.at(item_index) ||
959-
write_data_list_.at(dxl_index).item_addr.at(item_index) !=
960-
write_data_list_.at(dxl_index - 1).item_addr.at(item_index) ||
961-
write_data_list_.at(dxl_index).item_size.at(item_index) !=
953+
if (write_data_list_.at(dxl_index).item_size.at(item_index) !=
962954
write_data_list_.at(dxl_index - 1).item_size.at(item_index))
963955
{
964956
return BULK;

0 commit comments

Comments
 (0)