BRSRI/bellande_humanoid_robot_intelligence_control_system_framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Group Bulk/Sync class ClearParam() function changed.

Browse Source
This commit is contained in:
ROBOTIS-zerom
2016-05-20 15:41:22 +09:00
parent 0f98400116
commit 243b4dfbc9
4 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dynamixel_sdk/src/dynamixel_sdk/GroupBulkRead.cpp
View File

@@ -90,11 +90,11 @@ void GroupBulkRead::RemoveParam(UINT8_T id)
void GroupBulkRead::ClearParam()
{
if(id_list_.size() != 0)
{
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
}
if(id_list_.size() == 0)
return;
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
id_list_.clear();
address_list_.clear();

9
dynamixel_sdk/src/dynamixel_sdk/GroupBulkWrite.cpp
View File

@@ -111,14 +111,11 @@ bool GroupBulkWrite::ChangeParam(UINT8_T id, UINT16_T start_address, UINT16_T da
}
void GroupBulkWrite::ClearParam()
{
if(ph_->GetProtocolVersion() == 1.0)
if(ph_->GetProtocolVersion() == 1.0 || id_list_.size() == 0)
return;
if(id_list_.size() != 0)
{
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
}
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
id_list_.clear();
address_list_.clear();

9
dynamixel_sdk/src/dynamixel_sdk/GroupSyncRead.cpp
View File

@@ -72,14 +72,11 @@ void GroupSyncRead::RemoveParam(UINT8_T id)
}
void GroupSyncRead::ClearParam()
{
if(ph_->GetProtocolVersion() == 1.0)
if(ph_->GetProtocolVersion() == 1.0 || id_list_.size() == 0)
return;
if(id_list_.size() != 0)
{
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
}
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
id_list_.clear();
data_list_.clear();

10
dynamixel_sdk/src/dynamixel_sdk/GroupSyncWrite.cpp
View File

@@ -92,11 +92,11 @@ bool GroupSyncWrite::ChangeParam(UINT8_T id, UINT8_T *data)
void GroupSyncWrite::ClearParam()
{
if(id_list_.size() != 0)
{
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
}
if(id_list_.size() == 0)
return;
for(unsigned int _i = 0; _i < id_list_.size(); _i++)
delete[] data_list_[id_list_[_i]];
id_list_.clear();
data_list_.clear();