Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
crs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marius Bock
crs
Commits
f1dea3f4
Commit
f1dea3f4
authored
Oct 31, 2018
by
CRS-User
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asd
parent
29cb11f5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
1 deletion
+47
-1
CMakeLists.txt
CMakeLists.txt
+23
-1
msg/ER1ControlMsgStudent.msg
msg/ER1ControlMsgStudent.msg
+0
-0
src/er1_control_node_student/er1_motor_control.cpp
src/er1_control_node_student/er1_motor_control.cpp
+10
-0
src/er1_driver_node_student/er1_motor_driver.cpp
src/er1_driver_node_student/er1_motor_driver.cpp
+14
-0
No files found.
CMakeLists.txt
View file @
f1dea3f4
...
@@ -31,6 +31,7 @@ find_package(catkin REQUIRED COMPONENTS
...
@@ -31,6 +31,7 @@ find_package(catkin REQUIRED COMPONENTS
add_message_files
(
add_message_files
(
FILES
FILES
ER1ControlMsg.msg
ER1ControlMsg.msg
ER1ControlMsgStudent.msg
)
)
generate_messages
(
generate_messages
(
...
@@ -115,6 +116,28 @@ add_dependencies(er1driver comon)
...
@@ -115,6 +116,28 @@ add_dependencies(er1driver comon)
target_link_libraries
(
er1driver comon
)
target_link_libraries
(
er1driver comon
)
####################################### er1_driver_node_student #######################################
set
(
er1_driver_node_student_INCLUDE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/include/er1_driver_node_student/
)
file
(
GLOB er1_driver_node_student_HEADERS
${
er1_driver_node_student_INCLUDE_DIR
}
/*.h*
)
set
(
er1_driver_node_student_SOURCE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/src/er1_driver_node_student/
)
file
(
GLOB er1_driver_node_student_SOURCES
${
er1_driver_node_student_SOURCE_DIR
}
/*.c*
)
add_executable
(
er1_driver_node_student
${
er1_driver_node_student_SOURCES
}
${
er1_driver_node_student_HEADERS
}
)
add_dependencies
(
er1_driver_node_student comon er1driver
)
target_link_libraries
(
er1_driver_node_student comon er1driver
${
catkin_LIBRARIES
}
)
####################################### er1_control_node_student #######################################
set
(
er1_control_node_student_INCLUDE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/include/er1_control_node_student/
)
file
(
GLOB er1_control_node_student_HEADERS
${
er1_control_node_student_INCLUDE_DIR
}
/*.h*
)
set
(
er1_control_node_student_SOURCE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/src/er1_control_node_student/
)
file
(
GLOB er1_control_node_student_SOURCES
${
er1_control_node_student_SOURCE_DIR
}
/*.c*
)
add_executable
(
er1_control_node_student
${
er1_control_node_student_SOURCES
}
${
er1_control_node_student_HEADERS
}
)
add_dependencies
(
er1_control_node_student er1driver
)
target_link_libraries
(
er1_control_node_student er1driver
${
SDL2_LIBRARY
}
${
catkin_LIBRARIES
}
)
####################################### er1_driver_node #######################################
####################################### er1_driver_node #######################################
set
(
er1_driver_node_INCLUDE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/include/er1_driver_node/
)
set
(
er1_driver_node_INCLUDE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/include/er1_driver_node/
)
file
(
GLOB er1_driver_node_HEADERS
${
er1_driver_node_INCLUDE_DIR
}
/*.h*
)
file
(
GLOB er1_driver_node_HEADERS
${
er1_driver_node_INCLUDE_DIR
}
/*.h*
)
...
@@ -138,7 +161,6 @@ add_dependencies(er1_control_node er1driver)
...
@@ -138,7 +161,6 @@ add_dependencies(er1_control_node er1driver)
target_link_libraries
(
er1_control_node er1driver
${
SDL2_LIBRARY
}
${
catkin_LIBRARIES
}
)
target_link_libraries
(
er1_control_node er1driver
${
SDL2_LIBRARY
}
${
catkin_LIBRARIES
}
)
if
(
0
)
if
(
0
)
####################################### student_image_node #######################################
####################################### student_image_node #######################################
set
(
student_image_node_INCLUDE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/include/student_image_node/
)
set
(
student_image_node_INCLUDE_DIR
${
CMAKE_CURRENT_LIST_DIR
}
/include/student_image_node/
)
...
...
msg/ER1ControlMsgStudent.msg
0 → 100755
View file @
f1dea3f4
src/er1_control_node_student/er1_motor_control.cpp
0 → 100755
View file @
f1dea3f4
#include "ros/ros.h"
#include <iostream>
#include <string>
#include <SDL2/SDL.h>
#include <crs/ER1ControlMsgStudent.h>
int
main
(
int
argc
,
char
**
argv
)
{
return
0
;
}
src/er1_driver_node_student/er1_motor_driver.cpp
0 → 100755
View file @
f1dea3f4
#include <er1driver/er1driver.hpp>
#include "ros/ros.h"
#include <iostream>
#include <string>
#include <SDL2/SDL.h>
#include <crs/ER1ControlMsgStudent.h>
er1driver
::
SimpleER1Interface
robot
;
// Todo: very bad idea
int
main
(
int
argc
,
char
**
argv
)
{
return
0
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment