Skip to content

Commit

Permalink
Revert "fix: correct azimuth offset (#112)" (#134)
Browse files Browse the repository at this point in the history
This reverts commit 5e587ba.
  • Loading branch information
badai-nguyen authored Mar 29, 2024
1 parent 2572f0f commit 1ae3f75
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ void Vlp16Decoder::unpack(const velodyne_msgs::msg::VelodynePacket & velodyne_pa
const float azimuth_corrected_f =
azimuth +
(azimuth_diff * ((dsr * VLP16_DSR_TOFFSET) + (firing * VLP16_FIRING_TOFFSET)) /
VLP16_BLOCK_DURATION) - corrections.rot_correction * 180.0 / M_PI * 100;
VLP16_BLOCK_DURATION);
const uint16_t azimuth_corrected =
(static_cast<uint16_t>(round(azimuth_corrected_f))) % 36000;

Expand All @@ -247,8 +247,13 @@ void Vlp16Decoder::unpack(const velodyne_msgs::msg::VelodynePacket & velodyne_pa
// Convert polar coordinates to Euclidean XYZ.
const float cos_vert_angle = corrections.cos_vert_correction;
const float sin_vert_angle = corrections.sin_vert_correction;
const float cos_rot_angle = cos_rot_table_[azimuth_corrected];
const float sin_rot_angle = sin_rot_table_[azimuth_corrected];
const float cos_rot_correction = corrections.cos_rot_correction;
const float sin_rot_correction = corrections.sin_rot_correction;

const float cos_rot_angle = cos_rot_table_[azimuth_corrected] * cos_rot_correction +
sin_rot_table_[azimuth_corrected] * sin_rot_correction;
const float sin_rot_angle = sin_rot_table_[azimuth_corrected] * cos_rot_correction -
cos_rot_table_[azimuth_corrected] * sin_rot_correction;

// Compute the distance in the xy plane (w/o accounting for rotation).
const float xy_distance = distance * cos_vert_angle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,7 @@ void Vls128Decoder::unpack(const velodyne_msgs::msg::VelodynePacket & velodyne_p

// Correct for the laser rotation as a function of timing during the firings.
const float azimuth_corrected_f =
azimuth + (azimuth_diff * vls_128_laser_azimuth_cache_[firing_order])
- corrections.rot_correction * 180.0 / M_PI * 100;
azimuth + (azimuth_diff * vls_128_laser_azimuth_cache_[firing_order]);
const uint16_t azimuth_corrected = ((uint16_t)round(azimuth_corrected_f)) % 36000;

if (
Expand All @@ -269,8 +268,13 @@ void Vls128Decoder::unpack(const velodyne_msgs::msg::VelodynePacket & velodyne_p
// convert polar coordinates to Euclidean XYZ.
const float cos_vert_angle = corrections.cos_vert_correction;
const float sin_vert_angle = corrections.sin_vert_correction;
const float cos_rot_angle = cos_rot_table_[azimuth_corrected];
const float sin_rot_angle = sin_rot_table_[azimuth_corrected];
const float cos_rot_correction = corrections.cos_rot_correction;
const float sin_rot_correction = corrections.sin_rot_correction;

const float cos_rot_angle = cos_rot_table_[azimuth_corrected] * cos_rot_correction +
sin_rot_table_[azimuth_corrected] * sin_rot_correction;
const float sin_rot_angle = sin_rot_table_[azimuth_corrected] * cos_rot_correction -
cos_rot_table_[azimuth_corrected] * sin_rot_correction;

// Compute the distance in the xy plane (w/o accounting for rotation).
const float xy_distance = distance * cos_vert_angle;
Expand Down
Binary file modified nebula_tests/data/velodyne/vls128/1614315746748918706.pcd
Binary file not shown.

0 comments on commit 1ae3f75

Please sign in to comment.