Replace ros

.gitignore

@@ -7,3 +7,9 @@
 
 .idea/
 cmake-build-debug/
+
+# Python environment for Clion
+venv/
+
+# Mac OS files
+.DS_Store

CMakeLists.txt

@@ -1,98 +1,28 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.10)
 project(roboteam_input)
 
-# Needed for the documentation generator.
-set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
-## 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
-  joy
-  std_msgs
-  sensor_msgs
-  roboteam_msgs # for message definition
-  roboteam_utils
-  # roboteam_tactics
-)
+find_package(SDL2 REQUIRED sdl2)
+include_directories(${SDL2_INCLUDE_DIRS} ${SDL2IMAGE_INCLUDE_DIRS})
 
-## Need to install:
-# sudo apt-get install libsdl2-dev
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-find_package(SDL2)
-include_directories(${SDL2_INCLUDE_DIR})
-
-
-catkin_package(
-#  INCLUDE_DIRS include
-#  LIBRARIES roboteam_control
-#  CATKIN_DEPENDS roscpp std_msgs
-#  DEPENDS system_lib
-    CATKIN_DEPENDS
-    roscpp
-    std_msgs
-    sensor_msgs
-    message_runtime
-    roboteam_msgs
-    roboteam_utils
-    # roboteam_tactics
-)
-
-###########
-## Build ##
-###########
-
-add_definitions(-std=c++11)
-
-## Specify additional locations of header files
-## Your package locations should be listed before other locations
-# include_directories(include)
-include_directories(
-  ${catkin_INCLUDE_DIRS}
-  src
-  boost-process/include
-)
-
-
-
-add_executable(joystick_input src/joystick_input.cpp src/joystick_enums.h src/joystick_profiles.h)
-target_link_libraries(joystick_input ${catkin_LIBRARIES})
-add_dependencies(joystick_input ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
-
-if (${SDL2_FOUND})
-
-    MESSAGE("-- Building keyboard controller with SDL2")
-
-    add_executable(keyboard_controller 
-        src/keyboard_controller.cpp
+set (JOYSTICK_SOURCES
+        src/joystick/JoystickHandler.cpp
+        src/joystick/JoystickManager.cpp
         )
-    target_link_libraries( keyboard_controller 
-        ${catkin_LIBRARIES}
-        ${SDL2_LIBRARY}
-        )
-    add_dependencies(keyboard_controller 
-        ${${PROJECT_NAME}_EXPORTED_TARGETS} 
-        ${catkin_EXPORTED_TARGETS}
-        )
-
-else (${SDL2_FOUND})
-
-    MESSAGE("-- SDL2 not found, so cannot build keyboard_controller! Have you installed SDL2?")
-
-endif(${SDL2_FOUND})
-
 
+add_executable(joystick
+        ${JOYSTICK_SOURCES}
+        )
 
+target_include_directories(joystick
+        PRIVATE include/roboteam_input
+        )
 
-#############
-## Testing ##
-#############
-
-catkin_add_gtest(input_test
-    test/main.cpp
-	test/SimpleTest.cpp
-)
-target_link_libraries(input_test ${catkin_LIBRARIES})
-
+target_link_libraries(joystick
+        ${SDL2_LIBRARIES}
+        roboteam_proto
+        roboteam_utils
+        )
 

README.md

@@ -1,12 +1,11 @@
-# roboteam\_input
-
-## Getting the controllers right
-Just plug them all in. Start the `joysticks.launch` file. Then assign the joysticks to the right players. Keep in mind that the xbox receiver creates 4 controllers, even though you might only connect 1 xbox controller.
-
-## Testing which controller is which & if they are functioning properly.
-
-`ls /dev/input/` should tell you which joysticks are available. They are typically numbered from js0 to js8 or some other N. With `jstest /dev/input/jsX` (where X = some integer between 0 and infinity) you can check if the joystick is working correctly, and also check which joystick is connected to that port.
-
-## Installing SDL2 for keyboard controller
-
-`sudo apt-get install libsdl2-dev` should take care of it. If you don't have it installed it should not give an error but just not compile the keyboard controller.
+# RoboTeam Input
+This repository allows manual control of robots. 
+At the moment, only input from xbox-360 controllers is supported.
+
+#### Possible improvements
+* Automatic braking when robots are about to crash
+* Keyboard support
+* Assisted driving
+  * Automatically enable / disable dribbler
+  * Automatically look at ball when needed
+  * Following path user obviously wants to follow