Skip to content

Commit 31edcbd

Browse files
committed
fixed automatic transitions from the parent states
1 parent 64d36d3 commit 31edcbd

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

crs_application/src/crs_executive.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,10 @@ bool CRSExecutive::setupScanAcquisitionStates()
537537

538538
st_callbacks_map[scan::PARENT] = StateCallbackInfo{
539539
entry_cb : [this]() -> common::ActionResult { return part_rework_mngr_->hideToolPathsPreview(); },
540-
async : false
540+
async : false,
541+
exit_cb : nullptr,
542+
on_done_action : "",
543+
on_failed_action: ""
541544
};
542545

543546
st_callbacks_map[scan::CAPTURE] = StateCallbackInfo{
@@ -547,7 +550,7 @@ bool CRSExecutive::setupScanAcquisitionStates()
547550

548551
st_callbacks_map[scan::MOVE_ROBOT] = StateCallbackInfo{
549552
entry_cb : std::bind(&task_managers::ScanAcquisitionManager::moveRobot, scan_acqt_mngr_.get()),
550-
async : true
553+
async : false
551554
};
552555

553556
st_callbacks_map[scan::VERIFICATION] = StateCallbackInfo{
@@ -587,7 +590,7 @@ bool CRSExecutive::setupPartReworkStates()
587590
},
588591
async : true,
589592
exit_cb : std::bind(&task_managers::PartReworkManager::hideRegions, part_rework_mngr_.get()),
590-
on_done_action : action_names::SM_DONE,
593+
on_done_action : "",
591594
};
592595

593596
st_callbacks_map[part_rework::RESET] = StateCallbackInfo{

crs_application/src/task_managers/part_registration_manager.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ common::ActionResult PartRegistrationManager::computeTransform()
228228
{
229229
auto remove_part_request = std::make_shared<std_srvs::srv::Trigger::Request>();
230230
auto remove_result_future = remove_part_tesseract_client_->async_send_request(remove_part_request);
231+
RCLCPP_INFO(node_->get_logger(), "REMOVED PART");
231232

232233
common::ActionResult res;
233234
if (!config_)
@@ -328,7 +329,7 @@ common::ActionResult PartRegistrationManager::applyTransform()
328329

329330
// calling load part service
330331
auto result_future = load_part_tesseract_client_->async_send_request(load_part_request);
331-
332+
RCLCPP_INFO(node_->get_logger(), "ADDED PART");
332333
return true;
333334
}
334335

crs_application/src/task_managers/scan_acquisition_manager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ common::ActionResult ScanAcquisitionManager::moveRobot()
187187
freespace_motion_request->goal_pose = scan_poses_.at(scan_index_);
188188
freespace_motion_request->execute = true;
189189

190+
190191
auto result_future = call_freespace_motion_client_->async_send_request(freespace_motion_request);
191192

192193
std::future_status status = result_future.wait_for(std::chrono::duration<double>(WAIT_MOTION_COMPLETION));

crs_motion_planning/src/path_processing_utils.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,6 @@ crs_motion_planning::filterSingularityCylinder(const geometry_msgs::msg::PoseArr
11081108
filtered_waypoints.push_back(filtered_raster);
11091109
filtered_raster.poses.clear();
11101110
}
1111-
std::cout << std::endl;
11121111
}
11131112
if (filtered_raster.poses.size() > 0)
11141113
{

0 commit comments

Comments
 (0)