Skip to content

Commit 51afeae

Browse files
committed
pos_mon: use new conv functions for Transforms
Reduce duplication of conversion code.
1 parent 5236faf commit 51afeae

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

src/PositionMonitor.c

+4-16
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,7 @@ void Ros_PositionMonitor_CalculateTransforms(int groupIndex, long* pulsePos_moto
314314
}
315315

316316
geometry_msgs__msg__Transform* transform = &g_messages_PositionMonitor.transform->transforms.data[(groupIndex * NUMBER_TRANSFORM_LINKS_PER_ROBOT) + tfLink_WorldToBase].transform;
317-
transform->translation.x = MICROMETERS_TO_METERS(coordWorldToBase.x);
318-
transform->translation.y = MICROMETERS_TO_METERS(coordWorldToBase.y);
319-
transform->translation.z = MICROMETERS_TO_METERS(coordWorldToBase.z);
320-
QuatConversion_MpCoordOrient_To_GeomMsgsQuaternion(coordWorldToBase.rx, coordWorldToBase.ry, coordWorldToBase.rz, &transform->rotation);
317+
Ros_MpCoord_To_GeomMsgsTransform(&coordWorldToBase, transform);
321318

322319
//============================
323320
// Calculate Flange and Tool0
@@ -374,22 +371,13 @@ void Ros_PositionMonitor_CalculateTransforms(int groupIndex, long* pulsePos_moto
374371
//=======================
375372

376373
transform = &g_messages_PositionMonitor.transform->transforms.data[(groupIndex * NUMBER_TRANSFORM_LINKS_PER_ROBOT) + tfLink_BaseToFlange].transform;
377-
transform->translation.x = MICROMETERS_TO_METERS(coordBaseToFlange.x);
378-
transform->translation.y = MICROMETERS_TO_METERS(coordBaseToFlange.y);
379-
transform->translation.z = MICROMETERS_TO_METERS(coordBaseToFlange.z);
380-
QuatConversion_MpCoordOrient_To_GeomMsgsQuaternion(coordBaseToFlange.rx, coordBaseToFlange.ry, coordBaseToFlange.rz, &transform->rotation);
374+
Ros_MpCoord_To_GeomMsgsTransform(&coordBaseToFlange, transform);
381375

382376
transform = &g_messages_PositionMonitor.transform->transforms.data[(groupIndex * NUMBER_TRANSFORM_LINKS_PER_ROBOT) + tfLink_FlangeToTool0].transform;
383-
transform->translation.x = MICROMETERS_TO_METERS(coordFlangeToTool0.x);
384-
transform->translation.y = MICROMETERS_TO_METERS(coordFlangeToTool0.y);
385-
transform->translation.z = MICROMETERS_TO_METERS(coordFlangeToTool0.z);
386-
QuatConversion_MpCoordOrient_To_GeomMsgsQuaternion(coordFlangeToTool0.rx, coordFlangeToTool0.ry, coordFlangeToTool0.rz, &transform->rotation);
377+
Ros_MpCoord_To_GeomMsgsTransform(&coordFlangeToTool0, transform);
387378

388379
transform = &g_messages_PositionMonitor.transform->transforms.data[(groupIndex * NUMBER_TRANSFORM_LINKS_PER_ROBOT) + tfLink_FlangeToTcp].transform;
389-
transform->translation.x = MICROMETERS_TO_METERS(coordToolData.x);
390-
transform->translation.y = MICROMETERS_TO_METERS(coordToolData.y);
391-
transform->translation.z = MICROMETERS_TO_METERS(coordToolData.z);
392-
QuatConversion_MpCoordOrient_To_GeomMsgsQuaternion(coordToolData.rx, coordToolData.ry, coordToolData.rz, &transform->rotation);
380+
Ros_MpCoord_To_GeomMsgsTransform(&coordToolData, transform);
393381
}
394382

395383
void Ros_PositionMonitor_UpdateLocation()

0 commit comments

Comments
 (0)