Repository navigation
Software Challenge Urban Pistek #11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
UrbanPistek
wants to merge
9
commits into
uwrobotics:master
Choose a base branch
from
UrbanPistek:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
f5e0cf9
Launch file created, service clients added
UrbanPistek 4b71dcd
Added Custom reset turtle service
UrbanPistek aabc1c4
Added clear turtles service
UrbanPistek 249c968
Custom msg publisher added
UrbanPistek 7a5507a
Added action client, need to add action server
UrbanPistek ba63d7b
Adding action implmentation
UrbanPistek 17ce177
Made small chnages to main and resetTurtle
UrbanPistek 6fb4cc4
Merge pull request #1 from UrbanPistek/urban_updates
UrbanPistek 1876046
Addressed pull request comments
UrbanPistek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added Custom reset turtle service
- Loading branch information
commit 4b71dcd8683eae1f409e0b85fc9d70d7a2a0d43d
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| CMakeLists.txt | ||
| !software_training_assignment/CMakeLists.txt |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,207 @@ | ||
| cmake_minimum_required(VERSION 3.0.2) | ||
| project(software_training_assignment) | ||
|
|
||
| ## Compile as C++11, supported in ROS Kinetic and newer | ||
| # add_compile_options(-std=c++11) | ||
|
|
||
| ## Find catkin macros and libraries | ||
| ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) | ||
| ## is used, also find other catkin packages | ||
| find_package(catkin REQUIRED COMPONENTS | ||
| roscpp | ||
| rospy | ||
| std_msgs | ||
| turtlesim | ||
| message_generation | ||
| ) | ||
|
|
||
| ## System dependencies are found with CMake's conventions | ||
| # find_package(Boost REQUIRED COMPONENTS system) | ||
|
|
||
|
|
||
| ## Uncomment this if the package has a setup.py. This macro ensures | ||
| ## modules and global scripts declared therein get installed | ||
| ## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html | ||
| # catkin_python_setup() | ||
|
|
||
| ################################################ | ||
| ## Declare ROS messages, services and actions ## | ||
| ################################################ | ||
|
|
||
| ## To declare and build messages, services or actions from within this | ||
| ## package, follow these steps: | ||
| ## * Let MSG_DEP_SET be the set of packages whose message types you use in | ||
| ## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...). | ||
| ## * In the file package.xml: | ||
| ## * add a build_depend tag for "message_generation" | ||
| ## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET | ||
| ## * If MSG_DEP_SET isn't empty the following dependency has been pulled in | ||
| ## but can be declared for certainty nonetheless: | ||
| ## * add a exec_depend tag for "message_runtime" | ||
| ## * In this file (CMakeLists.txt): | ||
| ## * add "message_generation" and every package in MSG_DEP_SET to | ||
| ## find_package(catkin REQUIRED COMPONENTS ...) | ||
| ## * add "message_runtime" and every package in MSG_DEP_SET to | ||
| ## catkin_package(CATKIN_DEPENDS ...) | ||
| ## * uncomment the add_*_files sections below as needed | ||
| ## and list every .msg/.srv/.action file to be processed | ||
| ## * uncomment the generate_messages entry below | ||
| ## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...) | ||
|
|
||
| ## Generate messages in the 'msg' folder | ||
| # add_message_files( | ||
| # FILES | ||
| # Message1.msg | ||
| # Message2.msg | ||
| # ) | ||
|
|
||
| ## Generate services in the 'srv' folder | ||
| # add_service_files( | ||
| FILES | ||
| resetTurtle.srv | ||
| ) | ||
|
|
||
| ## Generate actions in the 'action' folder | ||
| # add_action_files( | ||
| # FILES | ||
| # Action1.action | ||
| # Action2.action | ||
| # ) | ||
|
|
||
| ## Generate added messages and services with any dependencies listed here | ||
| generate_messages( | ||
| DEPENDENCIES | ||
| std_msgs | ||
| ) | ||
|
|
||
| ################################################ | ||
| ## Declare ROS dynamic reconfigure parameters ## | ||
| ################################################ | ||
|
|
||
| ## To declare and build dynamic reconfigure parameters within this | ||
| ## package, follow these steps: | ||
| ## * In the file package.xml: | ||
| ## * add a build_depend and a exec_depend tag for "dynamic_reconfigure" | ||
| ## * In this file (CMakeLists.txt): | ||
| ## * add "dynamic_reconfigure" to | ||
| ## find_package(catkin REQUIRED COMPONENTS ...) | ||
| ## * uncomment the "generate_dynamic_reconfigure_options" section below | ||
| ## and list every .cfg file to be processed | ||
|
|
||
| ## Generate dynamic reconfigure parameters in the 'cfg' folder | ||
| # generate_dynamic_reconfigure_options( | ||
| # cfg/DynReconf1.cfg | ||
| # cfg/DynReconf2.cfg | ||
| # ) | ||
|
|
||
| ################################### | ||
| ## catkin specific configuration ## | ||
| ################################### | ||
| ## The catkin_package macro generates cmake config files for your package | ||
| ## Declare things to be passed to dependent projects | ||
| ## INCLUDE_DIRS: uncomment this if your package contains header files | ||
| ## LIBRARIES: libraries you create in this project that dependent projects also need | ||
| ## CATKIN_DEPENDS: catkin_packages dependent projects also need | ||
| ## DEPENDS: system dependencies of this project that dependent projects also need | ||
| catkin_package( | ||
| # INCLUDE_DIRS include | ||
| # LIBRARIES software_training_assignment | ||
| CATKIN_DEPENDS roscpp rospy std_msgs message_runtime | ||
| # DEPENDS system_lib | ||
| ) | ||
|
|
||
| ########### | ||
| ## Build ## | ||
| ########### | ||
|
|
||
| ## Specify additional locations of header files | ||
| ## Your package locations should be listed before other locations | ||
| include_directories( | ||
| # include | ||
| ${catkin_INCLUDE_DIRS} | ||
| ) | ||
|
|
||
| ## Declare a C++ library | ||
| # add_library(${PROJECT_NAME} | ||
| # src/${PROJECT_NAME}/software_training_assignment.cpp | ||
| # ) | ||
|
|
||
| ## Add cmake target dependencies of the library | ||
| ## as an example, code may need to be generated before libraries | ||
| ## either from message generation or dynamic reconfigure | ||
| # add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) | ||
|
|
||
| ## Declare a C++ executable | ||
| ## With catkin_make all packages are built within a single CMake context | ||
| ## The recommended prefix ensures that target names across packages don't collide | ||
| # add_executable(${PROJECT_NAME}_node src/software_training_assignment_node.cpp) | ||
|
|
||
| ## Rename C++ executable without prefix | ||
| ## The above recommended prefix causes long target names, the following renames the | ||
| ## target back to the shorter version for ease of user use | ||
| ## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node" | ||
| # set_target_properties(${PROJECT_NAME}_node PROPERTIES OUTPUT_NAME node PREFIX "") | ||
|
|
||
| ## Add cmake target dependencies of the executable | ||
| ## same as for the library above | ||
| # add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) | ||
|
|
||
| ## Specify libraries to link a library or executable target against | ||
| # target_link_libraries(${PROJECT_NAME}_node | ||
| # ${catkin_LIBRARIES} | ||
| # ) | ||
|
|
||
| ############# | ||
| ## Install ## | ||
| ############# | ||
|
|
||
| # all install targets should use catkin DESTINATION variables | ||
| # See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html | ||
|
|
||
| ## Mark executable scripts (Python etc.) for installation | ||
| ## in contrast to setup.py, you can choose the destination | ||
| # catkin_install_python(PROGRAMS | ||
| # scripts/my_python_script | ||
| # DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} | ||
| # ) | ||
|
|
||
| ## Mark executables for installation | ||
| ## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html | ||
| # install(TARGETS ${PROJECT_NAME}_node | ||
| # RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} | ||
| # ) | ||
|
|
||
| ## Mark libraries for installation | ||
| ## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html | ||
| # install(TARGETS ${PROJECT_NAME} | ||
| # ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
| # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
| # RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} | ||
| # ) | ||
|
|
||
| ## Mark cpp header files for installation | ||
| # install(DIRECTORY include/${PROJECT_NAME}/ | ||
| # DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| # FILES_MATCHING PATTERN "*.h" | ||
| # PATTERN ".svn" EXCLUDE | ||
| # ) | ||
|
|
||
| ## Mark other files for installation (e.g. launch and bag files, etc.) | ||
| # install(FILES | ||
| # # myfile1 | ||
| # # myfile2 | ||
| # DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} | ||
| # ) | ||
|
|
||
| ############# | ||
| ## Testing ## | ||
| ############# | ||
|
|
||
| ## Add gtest based cpp test target and link libraries | ||
| # catkin_add_gtest(${PROJECT_NAME}-test test/test_software_training_assignment.cpp) | ||
| # if(TARGET ${PROJECT_NAME}-test) | ||
| # target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) | ||
| # endif() | ||
|
|
||
| ## Add folders to be run by python nosetests | ||
| # catkin_add_nosetests(test) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| Server for the Reset Turtle Service | ||
| */ | ||
|
|
||
| #include <ros/ros.h> | ||
| #include <string> | ||
|
|
||
| //Including the service files for resetTurtle service | ||
| #include <software_training_assignment/resetTurtle.h> | ||
|
|
||
| //Struct for the service information | ||
| struct turtleInfo { | ||
| std::string name; | ||
| int x_coord; | ||
| int y_coord; | ||
| } | ||
|
|
||
| //Defining the service class | ||
| class TurtleReset { | ||
| public: | ||
| TurtleReset() {} | ||
|
|
||
| bool resetTurtlePosition(software_training_assignment::resetTurtleRequest &request, | ||
| software_training_assignment::resetTurtleResponse &response){ | ||
| ROS_INFO("Turtle Position Reset"); | ||
|
UrbanPistek marked this conversation as resolved.
Resolved
|
||
| return true; | ||
| }; | ||
| } | ||
|
|
||
| int main(int argc, char **argv) { | ||
| ros::init(argc, argv, "resetTurtle"); | ||
| ros::NodeHandle nh; | ||
|
|
||
| //Create an instance of the class | ||
| TurtleReset turtle; | ||
|
|
||
| //Link up the service | ||
| ros::ServiceServer resetTurtle = nh.advertiseService( | ||
| "resetTurtle", &TurtleReset::resetTurtlePosition, &Turtle); | ||
|
|
||
| ros::spin(); //Creates a infinite loop for the server | ||
|
|
||
| return 0; | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.