Revert "correct merge"

This reverts commit 7f605f27a1.
This commit is contained in:
Splinter1984 2022-03-21 23:19:30 +08:00
parent 7f605f27a1
commit f18ccccd7e
75 changed files with 3558 additions and 1983 deletions

View file

@ -1,9 +1,7 @@
#pragma once
#include <string>
#include <geometry_msgs/msg/pose_stamped.hpp>
#include <geometry_msgs/msg/pose.hpp>
#include "scene_monitor_interfaces/msg/grasp_pose.hpp"
#include "nlohmann_json/json.hpp"
@ -21,7 +19,6 @@ Description:
Posted:
- model is posted with another
*/
enum ComponentState
{
Initialized,
@ -48,6 +45,7 @@ public:
void updateState(const ComponentState &state);
private:
std::string _frame_name;
@ -55,7 +53,6 @@ private:
geometry_msgs::msg::Pose _placement;
std::map<std::string, scene_monitor_interfaces::msg::GraspPose> _grasp_poses;
geometry_msgs::msg::Pose _current_pose;
};
}