Skip to content

Commit 152a338

Browse files
committed
refactor: Improve error logging formatting and consistency in Dynamixel hardware interface and related files
1 parent 67c4dab commit 152a338

File tree

2 files changed

+32
-21
lines changed

2 files changed

+32
-21
lines changed

src/dynamixel/dynamixel.cpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,8 +1648,9 @@ DxlError Dynamixel::ProcessReadData(
16481648
dxl_info_.GetDxlSignType(ID, item_names[item_index], is_signed))
16491649
{
16501650
// Use unit info and sign type to properly convert the value
1651-
*data_ptrs[item_index] = ConvertValueWithUnitInfo(ID, item_names[item_index], dxl_getdata,
1652-
size, is_signed);
1651+
*data_ptrs[item_index] = ConvertValueWithUnitInfo(
1652+
ID, item_names[item_index], dxl_getdata,
1653+
size, is_signed);
16531654
} else {
16541655
// Fallback to existing logic for compatibility
16551656
if (item_names[item_index] == "Present Position") {
@@ -1686,8 +1687,9 @@ DxlError Dynamixel::ProcessDirectReadData(
16861687
dxl_info_.GetDxlSignType(ID, item_names[item_index], is_signed))
16871688
{
16881689
// Use unit info and sign type to properly convert the value
1689-
*data_ptrs[item_index] = ConvertValueWithUnitInfo(ID, item_names[item_index], dxl_getdata,
1690-
size, is_signed);
1690+
*data_ptrs[item_index] = ConvertValueWithUnitInfo(
1691+
ID, item_names[item_index], dxl_getdata,
1692+
size, is_signed);
16911693
} else {
16921694
// Fallback to existing logic for compatibility
16931695
if (item_names[item_index] == "Present Position") {
@@ -1865,8 +1867,9 @@ DxlError Dynamixel::SetDxlValueToSyncWrite()
18651867
// Fallback to existing logic for compatibility
18661868
if (item_name == "Goal Position") {
18671869
int32_t goal_position = dxl_info_.ConvertRadianToValue(ID, data);
1868-
WriteValueToBuffer(param_write_value, added_byte, static_cast<uint32_t>(goal_position),
1869-
4);
1870+
WriteValueToBuffer(
1871+
param_write_value, added_byte, static_cast<uint32_t>(goal_position),
1872+
4);
18701873
} else {
18711874
WriteValueToBuffer(param_write_value, added_byte, static_cast<uint32_t>(data), size);
18721875
}
@@ -2058,8 +2061,9 @@ DxlError Dynamixel::SetDxlValueToBulkWrite()
20582061
// Fallback to existing logic for compatibility
20592062
if (item_name == "Goal Position") {
20602063
int32_t goal_position = dxl_info_.ConvertRadianToValue(ID, data);
2061-
WriteValueToBuffer(param_write_value, added_byte, static_cast<uint32_t>(goal_position),
2062-
4);
2064+
WriteValueToBuffer(
2065+
param_write_value, added_byte, static_cast<uint32_t>(goal_position),
2066+
4);
20632067
} else {
20642068
WriteValueToBuffer(param_write_value, added_byte, static_cast<uint32_t>(data), size);
20652069
}
@@ -2099,8 +2103,9 @@ DxlError Dynamixel::SetDxlValueToBulkWrite()
20992103
// Fallback to existing logic for compatibility
21002104
if (item_name == "Goal Position") {
21012105
int32_t goal_position = dxl_info_.ConvertRadianToValue(ID, data);
2102-
WriteValueToBuffer(param_write_value, added_byte, static_cast<uint32_t>(goal_position),
2103-
4);
2106+
WriteValueToBuffer(
2107+
param_write_value, added_byte, static_cast<uint32_t>(goal_position),
2108+
4);
21042109
} else {
21052110
WriteValueToBuffer(param_write_value, added_byte, static_cast<uint32_t>(data), size);
21062111
}
@@ -2158,7 +2163,8 @@ DxlError Dynamixel::AddIndirectWrite(
21582163
uint8_t using_size = indirect_info_write_[id].size;
21592164

21602165
for (uint16_t i = 0; i < item_size; i++) {
2161-
if (WriteItem(id, static_cast<uint16_t>(INDIRECT_ADDR + (using_size * 2)), 2,
2166+
if (WriteItem(
2167+
id, static_cast<uint16_t>(INDIRECT_ADDR + (using_size * 2)), 2,
21622168
item_addr + i) != DxlError::OK)
21632169
{
21642170
return DxlError::SET_BULK_WRITE_FAIL;

src/dynamixel_hardware_interface.cpp

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,17 @@ hardware_interface::CallbackReturn DynamixelHardware::on_init(
6666
}
6767

6868
if (info_.hardware_parameters.find("number_of_joints") == info_.hardware_parameters.end()) {
69-
RCLCPP_ERROR_STREAM(logger_,
70-
"Required parameter 'number_of_joints' not found in hardware parameters");
69+
RCLCPP_ERROR_STREAM(
70+
logger_,
71+
"Required parameter 'number_of_joints' not found in hardware parameters");
7172
return hardware_interface::CallbackReturn::ERROR;
7273
}
7374
if (info_.hardware_parameters.find("number_of_transmissions") ==
7475
info_.hardware_parameters.end())
7576
{
76-
RCLCPP_ERROR_STREAM(logger_,
77-
"Required parameter 'number_of_transmissions' not found in hardware parameters");
77+
RCLCPP_ERROR_STREAM(
78+
logger_,
79+
"Required parameter 'number_of_transmissions' not found in hardware parameters");
7880
return hardware_interface::CallbackReturn::ERROR;
7981
}
8082

@@ -131,8 +133,9 @@ hardware_interface::CallbackReturn DynamixelHardware::on_init(
131133
"port_name " << port_name_.c_str() << " / baudrate " << baud_rate_.c_str());
132134

133135
if (info_.hardware_parameters.find("dynamixel_model_folder") == info_.hardware_parameters.end()) {
134-
RCLCPP_ERROR_STREAM(logger_,
135-
"Required parameter 'dynamixel_model_folder' not found in hardware parameters");
136+
RCLCPP_ERROR_STREAM(
137+
logger_,
138+
"Required parameter 'dynamixel_model_folder' not found in hardware parameters");
136139
return hardware_interface::CallbackReturn::ERROR;
137140
}
138141
std::string dxl_model_folder = info_.hardware_parameters["dynamixel_model_folder"];
@@ -1118,8 +1121,9 @@ bool DynamixelHardware::SetMatrix()
11181121
if (info_.hardware_parameters.find("transmission_to_joint_matrix") ==
11191122
info_.hardware_parameters.end())
11201123
{
1121-
RCLCPP_ERROR_STREAM(logger_,
1122-
"Required parameter 'transmission_to_joint_matrix' not found in hardware parameters");
1124+
RCLCPP_ERROR_STREAM(
1125+
logger_,
1126+
"Required parameter 'transmission_to_joint_matrix' not found in hardware parameters");
11231127
return false;
11241128
}
11251129
std::stringstream ss_tj(info_.hardware_parameters["transmission_to_joint_matrix"]);
@@ -1149,8 +1153,9 @@ bool DynamixelHardware::SetMatrix()
11491153
if (info_.hardware_parameters.find("joint_to_transmission_matrix") ==
11501154
info_.hardware_parameters.end())
11511155
{
1152-
RCLCPP_ERROR_STREAM(logger_,
1153-
"Required parameter 'joint_to_transmission_matrix' not found in hardware parameters");
1156+
RCLCPP_ERROR_STREAM(
1157+
logger_,
1158+
"Required parameter 'joint_to_transmission_matrix' not found in hardware parameters");
11541159
return false;
11551160
}
11561161
std::stringstream ss_jt(info_.hardware_parameters["joint_to_transmission_matrix"]);

0 commit comments

Comments
 (0)