Skip to content

Commit a802d0c

Browse files
committed
3x faster getError member function of GroupSync&BulkRead Class ROBOTIS-GIT#388
1 parent 8832d60 commit a802d0c

File tree

4 files changed

+4
-40
lines changed

4 files changed

+4
-40
lines changed

c++/src/dynamixel_sdk/group_bulk_read.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,5 @@ bool GroupBulkRead::getError(uint8_t id, uint8_t* error)
232232
// TODO : check protocol version, last_result_, data_list
233233
// if (last_result_ == false || error_list_.find(id) == error_list_.end())
234234

235-
error[0] = error_list_[id][0];
236-
237-
if (error[0] != 0)
238-
{
239-
return true;
240-
}
241-
else
242-
{
243-
return false;
244-
}
235+
return error[0] = error_list_[id][0];
245236
}

c++/src/dynamixel_sdk/group_sync_read.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,5 @@ bool GroupSyncRead::getError(uint8_t id, uint8_t* error)
201201
// TODO : check protocol version, last_result_, data_list
202202
// if (ph_->getProtocolVersion() == 1.0 || last_result_ == false || error_list_.find(id) == error_list_.end())
203203

204-
error[0] = error_list_[id][0];
205-
206-
if (error[0] != 0)
207-
{
208-
return true;
209-
}
210-
else
211-
{
212-
return false;
213-
}
204+
return error[0] = error_list_[id][0];
214205
}

ros/src/dynamixel_sdk/group_bulk_read.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,14 +232,5 @@ bool GroupBulkRead::getError(uint8_t id, uint8_t* error)
232232
// TODO : check protocol version, last_result_, data_list
233233
// if (last_result_ == false || error_list_.find(id) == error_list_.end())
234234

235-
error[0] = error_list_[id][0];
236-
237-
if (error[0] != 0)
238-
{
239-
return true;
240-
}
241-
else
242-
{
243-
return false;
244-
}
235+
return error[0] = error_list_[id][0];
245236
}

ros/src/dynamixel_sdk/group_sync_read.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,5 @@ bool GroupSyncRead::getError(uint8_t id, uint8_t* error)
201201
// TODO : check protocol version, last_result_, data_list
202202
// if (ph_->getProtocolVersion() == 1.0 || last_result_ == false || error_list_.find(id) == error_list_.end())
203203

204-
error[0] = error_list_[id][0];
205-
206-
if (error[0] != 0)
207-
{
208-
return true;
209-
}
210-
else
211-
{
212-
return false;
213-
}
204+
return error[0] = error_list_[id][0];
214205
}

0 commit comments

Comments
 (0)