re-commit

jcicolani · Jan 12, 2016 · f351870 · f351870
2 parents 62aa058 + c894dea
commit f351870
Show file tree

Hide file tree

Showing 70 changed files with 1,583 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,14 @@
+# Nomad
+An autonomous robot project.
+
+The Nomad project is an autonomous robot project initially being built for the 2016 Sparkfun Autonomous Vehicle Challenge (AVC). Nomad is built on (and named after) a heavily modified robot chassis kit from Actobotics called Nomad. 
+
+The electronics consist of:
+Primary computer: Intel Edison Arduino breakout board
+Motor controller: Roboclaw 2x30
+Vision: Microsoft XBox Kinect
+
+The software for Nomad is written in Python using the Robot Operating System (ROS) framework. This framework breaks the processing into separate, independent nodes. The nodes are:
+Joynode: Standard jotstick package from ROS.
+roboclaw: A custom node built to interact with the Roboclaw motor controller via USB. The node leverages sample code provided by Orion Robotics to control the Roboclaw. The example code has been converted into a library for this project.
+Nomad_control: A custom node built to convert commands from the joystick into direction and rotation commands for the motors. This is the node which will likely change the most throughout development.
diff --git a/build/CMakeCache.txt b/build/CMakeCache.txt
@@ -1,5 +1,9 @@
 # This is the CMakeCache file.
+<<<<<<< HEAD
 # For build in directory: /home/nomad/nomad_ws/build
+=======
+# For build in directory: /home/edison/nomad_ws/build
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 # It was generated by CMake: /usr/bin/cmake
 # You can edit this file to change values found and used by cmake.
 # If you do not want to change any of the values, simply exit the editor.
@@ -21,7 +25,11 @@ BUILD_SHARED_LIBS:BOOL=ON
 CATKIN_BLACKLIST_PACKAGES:STRING=
 
 //catkin devel space
+<<<<<<< HEAD
 CATKIN_DEVEL_PREFIX:PATH=/home/nomad/nomad_ws/devel
+=======
+CATKIN_DEVEL_PREFIX:PATH=/home/edison/nomad_ws/devel
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 //Catkin enable testing
 CATKIN_ENABLE_TESTING:BOOL=ON
@@ -35,6 +43,13 @@ CATKIN_WHITELIST_PACKAGES:STRING=
 //Path to a program.
 CMAKE_AR:FILEPATH=/usr/bin/ar
 
+<<<<<<< HEAD
+=======
+//For backwards compatibility, what version of CMake commands and
+// syntax should this version of CMake try to support.
+CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4
+
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 //Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
 // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.
 CMAKE_BUILD_TYPE:STRING=
@@ -101,7 +116,11 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
 CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF
 
 //Install path prefix, prepended onto install directories.
+<<<<<<< HEAD
 CMAKE_INSTALL_PREFIX:PATH=/home/nomad/nomad_ws/install
+=======
+CMAKE_INSTALL_PREFIX:PATH=/home/edison/nomad_ws/install
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 //Path to a program.
 CMAKE_LINKER:FILEPATH=/usr/bin/ld
@@ -173,6 +192,15 @@ CMAKE_USE_RELATIVE_PATHS:BOOL=OFF
 // Studio IDE projects all commands are done without /nologo.
 CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
 
+<<<<<<< HEAD
+=======
+//LSB Distrib tag
+DEBIAN:BOOL=TRUE
+
+//LSB Distrib - codename tag
+DEBIAN_WHEEZY:BOOL=TRUE
+
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 //Path to a program.
 DOXYGEN_EXECUTABLE:FILEPATH=DOXYGEN_EXECUTABLE-NOTFOUND
 
@@ -182,6 +210,12 @@ EMPY_EXECUTABLE:FILEPATH=/usr/bin/empy
 //Empy script
 EMPY_SCRIPT:STRING=/usr/bin/empy
 
+<<<<<<< HEAD
+=======
+//Single output directory for building all executables.
+EXECUTABLE_OUTPUT_PATH:PATH=
+
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 //Path to a file.
 GTEST_INCLUDE_DIR:PATH=/usr/include
 
@@ -197,8 +231,19 @@ GTEST_MAIN_LIBRARY:FILEPATH=GTEST_MAIN_LIBRARY-NOTFOUND
 //Path to a library.
 GTEST_MAIN_LIBRARY_DEBUG:FILEPATH=GTEST_MAIN_LIBRARY_DEBUG-NOTFOUND
 
+<<<<<<< HEAD
 //Path to a program.
 LSB_RELEASE_EXECUTABLE:FILEPATH=LSB_RELEASE_EXECUTABLE-NOTFOUND
+=======
+//Single output directory for building all libraries.
+LIBRARY_OUTPUT_PATH:PATH=
+
+//lsb_release executable was found
+LSB_FOUND:BOOL=TRUE
+
+//Path to a program.
+LSB_RELEASE_EXECUTABLE:FILEPATH=/usr/bin/lsb_release
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 //Path to a program.
 NOSETESTS:FILEPATH=/usr/bin/nosetests-2.7
@@ -210,13 +255,23 @@ PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python
 PYTHON_VERSION:STRING=
 
 //Value Computed by CMake
+<<<<<<< HEAD
 Project_BINARY_DIR:STATIC=/home/nomad/nomad_ws/build
 
 //Value Computed by CMake
 Project_SOURCE_DIR:STATIC=/home/nomad/nomad_ws/src
 
 //Path to a library.
 RT_LIBRARY:FILEPATH=/usr/lib/arm-linux-gnueabihf/librt.so
+=======
+Project_BINARY_DIR:STATIC=/home/edison/nomad_ws/build
+
+//Value Computed by CMake
+Project_SOURCE_DIR:STATIC=/home/edison/nomad_ws/src
+
+//Path to a library.
+RT_LIBRARY:FILEPATH=/usr/lib/i386-linux-gnu/librt.so
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 //Enable debian style python package layout
 SETUPTOOLS_DEB_LAYOUT:BOOL=ON
@@ -228,13 +283,23 @@ _CATKIN_GTEST_INCLUDE:FILEPATH=/usr/include/gtest/gtest.h
 _CATKIN_GTEST_SRC:FILEPATH=/usr/src/gtest/src/gtest.cc
 
 //The directory containing a CMake configuration file for catkin.
+<<<<<<< HEAD
 catkin_DIR:PATH=/opt/ros/indigo/share/catkin/cmake
 
 //The directory containing a CMake configuration file for cpp_common.
 cpp_common_DIR:PATH=/opt/ros/indigo/share/cpp_common/cmake
 
 //Value Computed by CMake
 gtest_BINARY_DIR:STATIC=/home/nomad/nomad_ws/build/gtest
+=======
+catkin_DIR:PATH=/opt/ros/jade/share/catkin/cmake
+
+//The directory containing a CMake configuration file for cpp_common.
+cpp_common_DIR:PATH=/opt/ros/jade/share/cpp_common/cmake
+
+//Value Computed by CMake
+gtest_BINARY_DIR:STATIC=/home/edison/nomad_ws/build/gtest
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 //Dependencies for the target
 gtest_LIB_DEPENDS:STATIC=general;-lpthread;
@@ -259,6 +324,7 @@ gtest_force_shared_crt:BOOL=OFF
 gtest_main_LIB_DEPENDS:STATIC=general;-lpthread;general;gtest;
 
 //Path to a library.
+<<<<<<< HEAD
 lib:FILEPATH=/opt/ros/indigo/lib/libxmlrpcpp.so
 
 //The directory containing a CMake configuration file for message_runtime.
@@ -296,23 +362,62 @@ std_msgs_DIR:PATH=/opt/ros/indigo/share/std_msgs/cmake
 
 //The directory containing a CMake configuration file for xmlrpcpp.
 xmlrpcpp_DIR:PATH=/opt/ros/indigo/share/xmlrpcpp/cmake
+=======
+lib:FILEPATH=/usr/lib/i386-linux-gnu/libpthread.so
+
+//The directory containing a CMake configuration file for message_runtime.
+message_runtime_DIR:PATH=/opt/ros/jade/share/message_runtime/cmake
+
+//Value Computed by CMake
+nomad_BINARY_DIR:STATIC=/home/edison/nomad_ws/build/nomad
+
+//Value Computed by CMake
+nomad_SOURCE_DIR:STATIC=/home/edison/nomad_ws/src/nomad
+
+//The directory containing a CMake configuration file for roscpp_serialization.
+roscpp_serialization_DIR:PATH=/opt/ros/jade/share/roscpp_serialization/cmake
+
+//The directory containing a CMake configuration file for roscpp_traits.
+roscpp_traits_DIR:PATH=/opt/ros/jade/share/roscpp_traits/cmake
+
+//The directory containing a CMake configuration file for rospy.
+rospy_DIR:PATH=/opt/ros/jade/share/rospy/cmake
+
+//The directory containing a CMake configuration file for rostime.
+rostime_DIR:PATH=/opt/ros/jade/share/rostime/cmake
+
+//The directory containing a CMake configuration file for std.msgs.
+std.msgs_DIR:PATH=std.msgs_DIR-NOTFOUND
+
+//The directory containing a CMake configuration file for std_msgs.
+std_msgs_DIR:PATH=/opt/ros/jade/share/std_msgs/cmake
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 
 ########################
 # INTERNAL cache entries
 ########################
 
 //catkin environment
+<<<<<<< HEAD
 CATKIN_ENV:INTERNAL=/home/nomad/nomad_ws/build/catkin_generated/env_cached.sh
 CATKIN_TEST_RESULTS_DIR:INTERNAL=/home/nomad/nomad_ws/build/test_results
+=======
+CATKIN_ENV:INTERNAL=/home/edison/nomad_ws/build/catkin_generated/env_cached.sh
+CATKIN_TEST_RESULTS_DIR:INTERNAL=/home/edison/nomad_ws/build/test_results
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 //ADVANCED property for variable: CMAKE_AR
 CMAKE_AR-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_BUILD_TOOL
 CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1
 //What is the target build tool cmake is generating for.
 CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make
 //This is the directory where this CMakeCache.txt was created
+<<<<<<< HEAD
 CMAKE_CACHEFILE_DIR:INTERNAL=/home/nomad/nomad_ws/build
+=======
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/edison/nomad_ws/build
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 //Major version of cmake used to create the current loaded cache
 CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2
 //Minor version of cmake used to create the current loaded cache
@@ -383,7 +488,11 @@ CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1
 CMAKE_HAVE_PTHREAD_H:INTERNAL=1
 //Start directory with the top level CMakeLists.txt file for this
 // project
+<<<<<<< HEAD
 CMAKE_HOME_DIRECTORY:INTERNAL=/home/nomad/nomad_ws/src
+=======
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/edison/nomad_ws/src
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 //Install .so files without execute permission.
 CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
 //ADVANCED property for variable: CMAKE_LINKER
@@ -441,7 +550,11 @@ FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()]
 GTEST_FROM_SOURCE_FOUND:INTERNAL=TRUE
 GTEST_FROM_SOURCE_INCLUDE_DIRS:INTERNAL=/usr/include
 GTEST_FROM_SOURCE_LIBRARIES:INTERNAL=gtest
+<<<<<<< HEAD
 GTEST_FROM_SOURCE_LIBRARY_DIRS:INTERNAL=/home/nomad/nomad_ws/build/gtest
+=======
+GTEST_FROM_SOURCE_LIBRARY_DIRS:INTERNAL=/home/edison/nomad_ws/build/gtest
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 GTEST_FROM_SOURCE_MAIN_LIBRARIES:INTERNAL=gtest_main
 //ADVANCED property for variable: GTEST_INCLUDE_DIR
 GTEST_INCLUDE_DIR-ADVANCED:INTERNAL=1

diff --git a/build/CMakeFiles/CMakeCCompiler.cmake b/build/CMakeFiles/CMakeCCompiler.cmake
@@ -1,7 +1,11 @@
 SET(CMAKE_C_COMPILER "/usr/bin/gcc")
 SET(CMAKE_C_COMPILER_ARG1 "")
 SET(CMAKE_C_COMPILER_ID "GNU")
+<<<<<<< HEAD
 SET(CMAKE_C_COMPILER_VERSION "4.6.3")
+=======
+SET(CMAKE_C_COMPILER_VERSION "4.7.2")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 SET(CMAKE_C_PLATFORM_ID "Linux")
 
 SET(CMAKE_AR "/usr/bin/ar")
@@ -29,7 +33,11 @@ SET(CMAKE_C_LINKER_PREFERENCE 10)
 # Save compiler ABI information.
 SET(CMAKE_C_SIZEOF_DATA_PTR "4")
 SET(CMAKE_C_COMPILER_ABI "ELF")
+<<<<<<< HEAD
 SET(CMAKE_C_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf")
+=======
+SET(CMAKE_C_LIBRARY_ARCHITECTURE "i386-linux-gnu")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 IF(CMAKE_C_SIZEOF_DATA_PTR)
   SET(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}")
@@ -40,14 +48,22 @@ IF(CMAKE_C_COMPILER_ABI)
 ENDIF(CMAKE_C_COMPILER_ABI)
 
 IF(CMAKE_C_LIBRARY_ARCHITECTURE)
+<<<<<<< HEAD
   SET(CMAKE_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf")
+=======
+  SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 ENDIF()
 
 SET(CMAKE_C_HAS_ISYSROOT "")
 
 
 SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "c")
+<<<<<<< HEAD
 SET(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/arm-linux-gnueabihf/4.6;/usr/lib/arm-linux-gnueabihf;/usr/lib;/lib/arm-linux-gnueabihf")
+=======
+SET(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i486-linux-gnu/4.7;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 
 
diff --git a/build/CMakeFiles/CMakeCXXCompiler.cmake b/build/CMakeFiles/CMakeCXXCompiler.cmake
@@ -1,7 +1,11 @@
 SET(CMAKE_CXX_COMPILER "/usr/bin/c++")
 SET(CMAKE_CXX_COMPILER_ARG1 "")
 SET(CMAKE_CXX_COMPILER_ID "GNU")
+<<<<<<< HEAD
 SET(CMAKE_CXX_COMPILER_VERSION "4.6.3")
+=======
+SET(CMAKE_CXX_COMPILER_VERSION "4.7.2")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 SET(CMAKE_CXX_PLATFORM_ID "Linux")
 
 SET(CMAKE_AR "/usr/bin/ar")
@@ -30,7 +34,11 @@ SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
 # Save compiler ABI information.
 SET(CMAKE_CXX_SIZEOF_DATA_PTR "4")
 SET(CMAKE_CXX_COMPILER_ABI "ELF")
+<<<<<<< HEAD
 SET(CMAKE_CXX_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf")
+=======
+SET(CMAKE_CXX_LIBRARY_ARCHITECTURE "i386-linux-gnu")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 IF(CMAKE_CXX_SIZEOF_DATA_PTR)
   SET(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}")
@@ -41,14 +49,22 @@ IF(CMAKE_CXX_COMPILER_ABI)
 ENDIF(CMAKE_CXX_COMPILER_ABI)
 
 IF(CMAKE_CXX_LIBRARY_ARCHITECTURE)
+<<<<<<< HEAD
   SET(CMAKE_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf")
+=======
+  SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 ENDIF()
 
 SET(CMAKE_CXX_HAS_ISYSROOT "")
 
 
 SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;c")
+<<<<<<< HEAD
 SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/arm-linux-gnueabihf/4.6;/usr/lib/arm-linux-gnueabihf;/usr/lib;/lib/arm-linux-gnueabihf")
+=======
+SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i486-linux-gnu/4.7;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 
 
diff --git a/build/CMakeFiles/CMakeDirectoryInformation.cmake b/build/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -2,8 +2,13 @@
 # Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
 # Relative path conversion top directories.
+<<<<<<< HEAD
 SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/nomad/nomad_ws/src")
 SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/nomad/nomad_ws/build")
+=======
+SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/edison/nomad_ws/src")
+SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/edison/nomad_ws/build")
+>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648
 
 # Force unix paths in dependencies.
 SET(CMAKE_FORCE_UNIX_PATHS 1)