Skip to content

Commit 9492838

Browse files
committed
Fix unit scaling
1 parent f753fde commit 9492838

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/MathConstants.h

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717

1818
// macro
1919
#define MICROMETERS_TO_METERS(x) (x * 0.000001)
20+
#define METERS_TO_MICROMETERS(x) (x * 1000000)
21+
#define RAD_TO_DEG_0001(x) (x * DEGREES_PER_RAD * 10000)
22+
#define DEG_0001_TO_RAD(x) ((x / 10000) * RAD_PER_DEGREE)
2023

2124
// used for comparing floating point values
2225
#define EPSILON_TOLERANCE_DOUBLE (0.001)

src/PositionMonitor.c

+6-8
Original file line numberDiff line numberDiff line change
@@ -295,16 +295,14 @@ void Ros_PositionMonitor_CalculateTransforms(int groupIndex, long* pulsePos_moto
295295
{
296296
switch (group->baseTrackInfo.motionType[i])
297297
{
298-
case MOTION_TYPE_X: coordTrackTravel.x = track_pos_meters[i]; break;
299-
case MOTION_TYPE_Y: coordTrackTravel.y = track_pos_meters[i]; break;
300-
case MOTION_TYPE_Z: coordTrackTravel.z = track_pos_meters[i]; break;
301-
case MOTION_TYPE_RX: coordTrackTravel.rx = track_pos_meters[i]; break;
302-
case MOTION_TYPE_RY: coordTrackTravel.ry = track_pos_meters[i]; break;
303-
case MOTION_TYPE_RZ: coordTrackTravel.rz = track_pos_meters[i]; break;
298+
case MOTION_TYPE_X: coordTrackTravel.x = METERS_TO_MICROMETERS(track_pos_meters[i]); break;
299+
case MOTION_TYPE_Y: coordTrackTravel.y = METERS_TO_MICROMETERS(track_pos_meters[i]); break;
300+
case MOTION_TYPE_Z: coordTrackTravel.z = METERS_TO_MICROMETERS(track_pos_meters[i]); break;
301+
case MOTION_TYPE_RX: coordTrackTravel.rx = RAD_TO_DEG_0001(track_pos_meters[i]); break;
302+
case MOTION_TYPE_RY: coordTrackTravel.ry = RAD_TO_DEG_0001(track_pos_meters[i]); break;
303+
case MOTION_TYPE_RZ: coordTrackTravel.rz = RAD_TO_DEG_0001(track_pos_meters[i]); break;
304304
}
305305
}
306-
Ros_Debug_BroadcastMsg("coordTrackTravel.x = %.3f", coordTrackTravel.x);
307-
Ros_Debug_BroadcastMsg("coordTrackTravel.y = %.3f", coordTrackTravel.y);
308306
mpZYXeulerToFrame(&coordWorldToBase, &frameWorldToTrack);
309307
mpZYXeulerToFrame(&coordTrackTravel, &frameTrackTravel);
310308
mpZYXeulerToFrame(&group->baseTrackInfo.offsetFromBaseToRobotOrigin, &frameTrackToRobot);

0 commit comments

Comments
 (0)