diff --git a/rover/src/owr_messages/CMakeLists.txt b/rover/src/owr_messages/CMakeLists.txt index c8233733..6f979f10 100644 --- a/rover/src/owr_messages/CMakeLists.txt +++ b/rover/src/owr_messages/CMakeLists.txt @@ -63,6 +63,7 @@ find_package(catkin REQUIRED COMPONENTS board.msg adc.msg stop.msg + devices.msg ) ## Generate services in the 'srv' folder diff --git a/rover/src/owr_messages/msg/devices.msg b/rover/src/owr_messages/msg/devices.msg new file mode 100644 index 00000000..c4195ecb --- /dev/null +++ b/rover/src/owr_messages/msg/devices.msg @@ -0,0 +1 @@ +string[] devices \ No newline at end of file diff --git a/rover/src/owr_usb_reset/CMakeLists.txt b/rover/src/owr_usb_reset/CMakeLists.txt new file mode 100644 index 00000000..652690e9 --- /dev/null +++ b/rover/src/owr_usb_reset/CMakeLists.txt @@ -0,0 +1,190 @@ +cmake_minimum_required(VERSION 2.8.3) +project(owr_usb_reset) + +## 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 + owr_messages +) + +## 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 run_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 run_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 +# Service1.srv +# Service2.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 +# owr_messages +#) + +################################################ +## 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 run_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 you 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 owr_usb_reset +# CATKIN_DEPENDS roscpp rospy std_msgs +# DEPENDS system_lib +) + +########### +## Build ## +########### + +## Specify additional locations of header files +## Your package locations should be listed before other locations +# include_directories(include) +include_directories( + ${catkin_INCLUDE_DIRS} +) + +## Declare a C++ library +# add_library(owr_usb_reset +# src/${PROJECT_NAME}/owr_usb_reset.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(owr_usb_reset ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) + +## Declare a C++ executable +# add_executable(owr_usb_reset_node src/owr_usb_reset_node.cpp) + +## Add cmake target dependencies of the executable +## same as for the library above +# add_dependencies(owr_usb_reset_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) + +## Specify libraries to link a library or executable target against +# target_link_libraries(owr_usb_reset_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 +# install(PROGRAMS +# scripts/my_python_script +# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +# ) + +## Mark executables and/or libraries for installation +# install(TARGETS owr_usb_reset owr_usb_reset_node +# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} +# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} +# RUNTIME DESTINATION ${CATKIN_PACKAGE_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_owr_usb_reset.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) diff --git a/rover/src/owr_usb_reset/package.xml b/rover/src/owr_usb_reset/package.xml new file mode 100644 index 00000000..e0055684 --- /dev/null +++ b/rover/src/owr_usb_reset/package.xml @@ -0,0 +1,58 @@ + + + owr_usb_reset + 0.0.0 + The owr_usb_reset package + + + + + ros + + + + + + TODO + + + + + + + + + + + + + + + + + + + + + + + + + + catkin + roscpp + rospy + std_msgs + owr_messages + owr_messages + roscpp + rospy + std_msgs + + + + + + + + \ No newline at end of file diff --git a/rover/src/owr_usb_reset/scripts/usb_reset.py b/rover/src/owr_usb_reset/scripts/usb_reset.py new file mode 100755 index 00000000..2f26f732 --- /dev/null +++ b/rover/src/owr_usb_reset/scripts/usb_reset.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python +# license removed for brevity +import rospy +import subprocess +from std_msgs.msg import String,Int16 +from owr_messages.msg import devices + +"""in visudo, need to add %ros ALL = NOPASSWD: /home/ros/owr_software/rover/src/owr_usb_reset/usb_reset +after %sudo ALL=(ALL:ALL) ALL. This allows the usb reset program to run without needing a password for +sudo. Eneter password manually while running causes a problem +""" + +def idmap(device): + if (device[23:27] == "1d6b"): + return "linux" + else: + return device[0:32] + +def callback(data): + subprocess.call("cd /dev/bus/usb",shell=True) + devs = subprocess.check_output(["lsusb"]) + devs = devs.split("\n") + if(data.data < len(devs) - 1): + devs[data.data].replace(' ', '') + print(devs[data.data]) + filepath = "/dev/bus/usb/" + devs[data.data][4:7] + filepath = filepath + "/" + devs[data.data][15:18] + print(filepath) + command = "sudo ./usb_reset " + filepath + subprocess.call(command,shell=True) + rospy.loginfo("reset attempted") + else: + print("Out of range") + +def listener(): + rospy.init_node('usb_reset', anonymous=True) + rospy.Subscriber("rover/usb/reset", Int16, callback) + +def talker(): + pub = rospy.Publisher('/rover/usb', devices, queue_size=1) + rospy.init_node('usb_reset', anonymous=True) + rate = rospy.Rate(1) # 1hz + + while not rospy.is_shutdown(): + subprocess.call("cd /dev/bus/usb",shell=True) + devs = subprocess.check_output(["lsusb"]) + devs = devs.split("\n") + for i in range(0,len(devs)): + devs[i] = idmap(devs[i]) + pub.publish(devs) + rate.sleep() + +if __name__ == '__main__': + try: + listener() + talker() + except rospy.ROSInterruptException: + pass + + + + + diff --git a/rover/usb_reset b/rover/usb_reset new file mode 100755 index 00000000..a5bdc87e Binary files /dev/null and b/rover/usb_reset differ