New types and attrs added

robocomp · May 24, 2024 · a8be036 · a8be036
1 parent b71fc1e
commit a8be036
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/core/include/dsr/core/types/type_checking/dsr_attr_name.h b/core/include/dsr/core/types/type_checking/dsr_attr_name.h
@@ -213,9 +213,9 @@ REGISTER_TYPE(cam_depth_width, int, false)
 REGISTER_TYPE(viriato_head_pan_tilt_nose_pos_ref, std::reference_wrapper<const std::vector<float>>, true)
 REGISTER_TYPE(viriato_head_pan_tilt_nose_speed_ref, std::reference_wrapper<const std::vector<float>>, true)
 
-//REGISTER_TYPE(robot_current_advance_speed, std::reference_wrapper<const std::vector<float>>, true)
-//REGISTER_TYPE(robot_current_angular_speed, std::reference_wrapper<const std::vector<float>>, true)
-//REGISTER_TYPE(robot_current_side_speed, std::reference_wrapper<const std::vector<float>>, true)
+REGISTER_TYPE(robot_current_advance_speed, float, true)
+REGISTER_TYPE(robot_current_angular_speed, float, true)
+REGISTER_TYPE(robot_current_side_speed, float, true)
 REGISTER_TYPE(robot_local_linear_velocity, std::reference_wrapper<const std::vector<float>>, true)
 REGISTER_TYPE(robot_local_angular_velocity, std::reference_wrapper<const std::vector<float>>, true)
 REGISTER_TYPE(robot_ref_adv_speed, float, true)

diff --git a/core/include/dsr/core/types/type_checking/dsr_edge_type.h b/core/include/dsr/core/types/type_checking/dsr_edge_type.h
@@ -56,6 +56,7 @@ REGISTER_EDGE_TYPE(following_action)
 REGISTER_EDGE_TYPE(lost)
 REGISTER_EDGE_TYPE(has_intention)
 REGISTER_EDGE_TYPE(collision)
+REGISTER_EDGE_TYPE(TARGET)
 REGISTER_EDGE_TYPE(testtype_e)
 
 #endif //DSR_EDGE_TYPE_H
diff --git a/core/include/dsr/core/types/type_checking/dsr_node_type.h b/core/include/dsr/core/types/type_checking/dsr_node_type.h
@@ -57,6 +57,7 @@ REGISTER_NODE_TYPE(mesh)
 REGISTER_NODE_TYPE(house)
 REGISTER_NODE_TYPE(kitchen)
 REGISTER_NODE_TYPE(bathroom)
+REGISTER_NODE_TYPE(wall)
 
 REGISTER_NODE_TYPE(face)
 REGISTER_NODE_TYPE(nape)
@@ -114,7 +115,6 @@ REGISTER_NODE_TYPE(target)
 REGISTER_NODE_TYPE(obstacle)
 
 REGISTER_NODE_TYPE(corner)
-REGISTER_NODE_TYPE(wall)
 
 //melex-rodao types
 REGISTER_NODE_TYPE(road)