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

Merge pull request #77 from ROBOTIS-GIT/develop

Browse Source 
Added check to change value of EEPROM area.
This commit is contained in:
Kayman
2019-06-04 15:07:10 +09:00
committed by GitHub
parent ba02d50d3f af992c7d15
commit e8a4ee48bb
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
robotis_controller/src/robotis_controller/robotis_controller.cpp
View File

@ -374,6 +374,9 @@ void RobotisController::initializeDevice(const std::string init_file_path)
if (DEBUG_PRINT)
ROS_INFO("JOINT_NAME: %s", joint_name.c_str());
uint8_t torque_enabled = 0;
read1Byte(joint_name, dxl->torque_enable_item_->address_, &torque_enabled);
for (YAML::const_iterator it_joint = joint_node.begin(); it_joint != joint_node.end(); it_joint++)
{
std::string item_name = it_joint->first.as<std::string>();
@ -416,6 +419,12 @@ void RobotisController::initializeDevice(const std::string init_file_path)
default:
break;
}
if (torque_enabled == 1)
{
ROS_ERROR("################\nThe initial value of the EEPROM area has been changed. \nTurn off Torque Enable and try again.");
exit(-1);
}
}
switch (item->data_length_)
@ -469,6 +478,9 @@ void RobotisController::initializeDevice(const std::string init_file_path)
// bulkread_data_length = dxl->present_position_item->data_length;
// }
uint8_t torque_enabled = 0;
read1Byte(joint_name, dxl->torque_enable_item_->address_, &torque_enabled);
// calculate bulk read start address & data length
auto indirect_addr_it = dxl->ctrl_table_.find(INDIRECT_ADDRESS_1);
if (indirect_addr_it != dxl->ctrl_table_.end()) // INDIRECT_ADDRESS_1 exist
@ -494,6 +506,11 @@ void RobotisController::initializeDevice(const std::string init_file_path)
read2Byte(joint_name, indirect_addr, &data16);
if (data16 != dxl->ctrl_table_[dxl->bulk_read_items_[i]->item_name_]->address_ + l)
{
if (torque_enabled == 1)
{
ROS_ERROR("################\nThe indirect address of the EEPROM area has been changed. \nTurn off Torque Enable and try again.");
exit(-1);
}
write2Byte(joint_name, indirect_addr, dxl->ctrl_table_[dxl->bulk_read_items_[i]->item_name_]->address_ + l);
}
indirect_addr += 2;
@ -908,7 +925,11 @@ void RobotisController::process()
for (auto& it : port_to_bulk_read_)
{
robot_->ports_[it.first]->setPacketTimeout(0.0);
it.second->rxPacket();
//it.second->rxPacket();
int result = it.second->rxPacket();
if(result != COMM_SUCCESS)
ROS_ERROR_STREAM("Bulk Read Fail : " << it.first);
}
// -> save to robot->dxls_[]->dxl_state_