diff --git a/roboglue_ros_ws.workspace.user b/roboglue_ros_ws.workspace.user index c056b09..c683a93 100644 --- a/roboglue_ros_ws.workspace.user +++ b/roboglue_ros_ws.workspace.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -72,7 +72,7 @@ {b917fd33-cfca-4cf9-a8d9-025510846768} 0 0 - 1 + 2 @@ -124,7 +124,7 @@ ROS_PACKAGE_PATH=/home/emanuele/Documents/GestioneMacchine/Robot_Incollaggio/Software/roboglue_ros_ws/src:/opt/ros/kinetic/share ROS_ROOT=/opt/ros/kinetic/share/ros ROS_VERSION=1 - SHLVL=172 + SHLVL=178 TERM=xterm _=/usr/bin/env @@ -471,19 +471,6 @@ ROSProjectManager.RunStepList - - - ROSProjectManager.ROSAttachToNode - false - - debug - false - roboglue_ros - /home/emanuele/Documents/GestioneMacchine/Robot_Incollaggio/Software/roboglue_ros_ws/src/roboglue_ros - roboglue_ros_recorder - /home/emanuele/Documents/GestioneMacchine/Robot_Incollaggio/Software/roboglue_ros_ws/devel/lib/roboglue_ros/roboglue_ros_recorder - - ROSProjectManager.ROSLaunchStep @@ -496,7 +483,7 @@ roboglue_ros_urdriver.launch /home/emanuele/Documents/GestioneMacchine/Robot_Incollaggio/Software/roboglue_ros_ws/src/roboglue_ros/launch/roboglue_ros_urdriver.launch - 2 + 1 3768 false @@ -505,7 +492,86 @@ false true - 2 + + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + ROS Run Configuration + RoboGlueRUN_urOfficialDriver-noRviz + ROSProjectManager.ROSRunConfigurationThis is a test + + Run + + ROSProjectManager.RunStepList + + + + ROSProjectManager.ROSLaunchStep + true + + roslaunch + true + roboglue_ros + /home/emanuele/Documents/GestioneMacchine/Robot_Incollaggio/Software/roboglue_ros_ws/src/roboglue_ros + roboglue_ros_urdriver_norviz.launch + /home/emanuele/Documents/GestioneMacchine/Robot_Incollaggio/Software/roboglue_ros_ws/src/roboglue_ros/launch/roboglue_ros_urdriver_norviz.launch + + 1 + + 3768 + true + false + false + false + false + + 3 diff --git a/src/roboglue_ros/launch/roboglue_ros_urdriver_norviz.launch b/src/roboglue_ros/launch/roboglue_ros_urdriver_norviz.launch index aba6786..b7b12bc 100644 --- a/src/roboglue_ros/launch/roboglue_ros_urdriver_norviz.launch +++ b/src/roboglue_ros/launch/roboglue_ros_urdriver_norviz.launch @@ -23,7 +23,8 @@ - + + diff --git a/src/roboglue_ros/src/roboglue_follower.cpp b/src/roboglue_ros/src/roboglue_follower.cpp index 058766f..b0dbc74 100644 --- a/src/roboglue_ros/src/roboglue_follower.cpp +++ b/src/roboglue_ros/src/roboglue_follower.cpp @@ -9,6 +9,7 @@ 20190308 - Inserita una funzione che si occupa di effettuare il blocco delle variaili. 20190325 - Implementato uso del ros parameter server per la configurazione del nodo. Contiene i nomi delle code ros. +20191023 - Passaggio dei commenti a GIT */ ////////// ROS INCLUDES ///////////// #include "ros/ros.h" @@ -21,6 +22,7 @@ ////////////////////////////////////////// void testFunction( ros::Publisher* trj_pub); trajectory_msgs::JointTrajectory composeTrjMessage(std::vector jtpos); +bool resetModelJointsHome(geometry_msgs::Pose, bool); /////////////////////////////////////////// ///////// ROS CALLBACKS ////////////////// @@ -45,7 +47,9 @@ void commandCallback(const std_msgs::String::ConstPtr& msg, internalState* is, p } else ROS_ERROR("Invalid acton"); } else if (!command.compare("RECORD") || !command.compare("PLAY") || !command.compare("OPEN")) { - return; + return; + } else if (!command.compare("HOME")) { + // Chiamata alla funzione di reset dei giunti nel modello } else { ROS_WARN("Unknown command: %s", command.c_str()); } @@ -242,6 +246,16 @@ int main(int argc, char **argv) { ///////////// END MAIN ///////////////// //////////////////////////////////////// +// TODO: aggiungere la possibilità di resettare i giunti nella configurazione home a comando da interfaccia +bool resetModelJointsHome(geometry_msgs::Pose home_pos, bool execute=false) {{ + ROS_DEBUG("Setting joint position to home"); + if (execute){ + return false; + } else { + return false; + } +} + trajectory_msgs::JointTrajectory composeTrjMessage(std::vector jtpos){ static trajectory_msgs::JointTrajectory trj; static double ang=0.0;