654

Makefile

@@ -2,9 +2,15 @@
 #$ g++ -c -I./toolkit-dynamixel/include main.cpp
 #$ g++ DynamixelHandler.o main.o –L/usr/local/lib –ldxl_x64_cpp -lrt
 
-all: g++ -c -I./toolkit-dynamixel/include toolkit-dynamixel/src/DynamixelHandler.cpp
+all: dynamixel main
-dynamixel: g++ -c -I./toolkit-dynamixel/include toolkit-dynamixel/src/DynamixelHandler.cpp
+	g++ DynamixelHandler.o main.o -L/usr/local/lib -ldxl_x64_cpp -lrt
-main: g++ -c -I./toolkit-dynamixel/include main.cpp
+
-clean:{
+dynamixel: /home/ros/EENG3/IntroRoboticsLab1/toolkit-dynamixel/src/DynamixelHandler.cpp
-rm *.o
+	g++ -c -I./toolkit-dynamixel/include toolkit-dynamixel/src/DynamixelHandler.cpp -I./toolkit-dynamixel/include toolkit-dynamixel/src/DynamixelHandler.cpp
-rm *.out}
+	
+main: main.cpp
+	g++ -c -I./toolkit-dynamixel/include main.cpp
+
+clean: 
+	rm *.o
+	rm*.out

main.cpp

@@ -13,7 +13,7 @@ float _maxJointCmd = 1023;
 float _minJointAngle = -180.0f;
 float _maxJointAngle = 180.0f;
 
-nt convertAnglesToJointCmd(float fJointAngle)
+int convertAnglesToJointCmd(float fJointAngle)
 { // y = ax + b
 float a = (_maxJointCmd-_minJointCmd) / (_maxJointAngle - _minJointAngle);
 float b = _minJointCmd - a * _minJointAngle;