Skip to content

Commit

Permalink
Fixed CmakeList files so code is detected on the robot
Browse files Browse the repository at this point in the history
  • Loading branch information
LucienMorey committed Nov 24, 2014
1 parent eaa6301 commit 8dc1a12
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 17 deletions.
15 changes: 0 additions & 15 deletions src/commands/auton/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
project(Holly)

macro (add_sources)
file (RELATIVE_PATH _relPath "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
foreach (_src ${ARGN})
if (_relPath)
list (APPEND SOURCE_CODE "${_relPath}/${_src}")
else()
list (APPEND SOURCE_CODE "${_src}")
endif()
endforeach()
if (_relPath)
# propagate SOURCE_CODE to parent directory
set (SOURCE_CODE ${SOURCE_CODE} PARENT_SCOPE)
endif()
endmacro()

add_sources (
AutonomousCommandGroup.cpp
Expand Down
4 changes: 4 additions & 0 deletions src/commands/pid/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
add_sources (
GyroReset.cpp
TogglePimpin.cpp
)
7 changes: 7 additions & 0 deletions src/commands/systems/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@


add_sources (
HolonomicDrive.cpp
WinchLoosen.cpp
WinchTension.cpp
)
8 changes: 8 additions & 0 deletions src/commands/vision/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@


add_sources (
DemoCommandGroup.cpp
FindTarget.cpp
PositionRobot.cpp
SpinOneEighty.cpp
)
2 changes: 1 addition & 1 deletion src/subsystems/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ AUX_SOURCE_DIRECTORY(sensors SensorsSources)
add_sources(
${MoveSources}
${SubPidSources}
${SystemsSources}
${SensorsSources}
)
6 changes: 6 additions & 0 deletions src/subsystems/move/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@


add_sources (
Chassis.cpp
Winch.cpp
)
2 changes: 1 addition & 1 deletion src/subsystems/move/Chassis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <commands/systems/HolonomicDrive.h>
#include <CommandBase.h>

#define GYRO_P (-0.6)
#define GYRO_P (-0.8)
#define GYRO_I (-0.00)
#define GYRO_D (-0.0)
#define MOMENTUM_THRESHOLD (deg2rad(30.0)) // rad/s
Expand Down
5 changes: 5 additions & 0 deletions src/subsystems/pid/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@


add_sources (
GyroCorrection.cpp
)
5 changes: 5 additions & 0 deletions src/subsystems/sensors/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@


add_sources (
EyeBone.cpp
)

0 comments on commit 8dc1a12

Please sign in to comment.