Skip to content

Commit 160e3b9

Browse files
committed
change name of package to Easy SDK
Signed-off-by: Hyungyu Kim <kimhg@robotis.com>
1 parent 0052c5c commit 160e3b9

13 files changed

Lines changed: 92 additions & 92 deletions

File tree

c++/build/linux64/Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ SOURCES = src/dynamixel_sdk/group_bulk_read.cpp \
6262
src/dynamixel_sdk/protocol1_packet_handler.cpp \
6363
src/dynamixel_sdk/protocol2_packet_handler.cpp \
6464
src/dynamixel_sdk/port_handler_linux.cpp \
65-
src/dynamixel_api/connector.cpp \
66-
src/dynamixel_api/control_table.cpp \
67-
src/dynamixel_api/motor.cpp \
68-
src/dynamixel_api/dynamixel_error.cpp \
69-
src/dynamixel_api/group_executor.cpp
65+
src/dynamixel_easy_sdk/connector.cpp \
66+
src/dynamixel_easy_sdk/control_table.cpp \
67+
src/dynamixel_easy_sdk/motor.cpp \
68+
src/dynamixel_easy_sdk/dynamixel_error.cpp \
69+
src/dynamixel_easy_sdk/group_executor.cpp
7070

7171

7272
OBJECTS=$(addsuffix .o,$(addprefix $(DIR_OBJS)/,$(basename $(notdir $(SOURCES)))))
@@ -96,8 +96,8 @@ install: $(TARGET)
9696
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/include/dynamixel_sdk || $(MKDIR) $(INSTALL_ROOT)/include/dynamixel_sdk
9797
$(CP_ALL) $(DIR_DXL)/include/dynamixel_sdk/* $(INSTALL_ROOT)/include/dynamixel_sdk
9898

99-
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/include/dynamixel_api || $(MKDIR) $(INSTALL_ROOT)/include/dynamixel_api
100-
$(CP_ALL) $(DIR_DXL)/include/dynamixel_api/* $(INSTALL_ROOT)/include/dynamixel_api
99+
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/include/dynamixel_easy_sdk || $(MKDIR) $(INSTALL_ROOT)/include/dynamixel_easy_sdk
100+
$(CP_ALL) $(DIR_DXL)/include/dynamixel_easy_sdk/* $(INSTALL_ROOT)/include/dynamixel_easy_sdk
101101

102102
# copy the control_table directory into the share directory
103103
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/share/dynamixel_sdk || $(MKDIR) -p $(INSTALL_ROOT)/share/dynamixel_sdk
@@ -113,7 +113,7 @@ uninstall:
113113

114114
$(RM) $(INSTALL_ROOT)/include/dynamixel_sdk/dynamixel_sdk.h
115115
$(RM_ALL) $(INSTALL_ROOT)/include/dynamixel_sdk/*
116-
$(RM_ALL) $(INSTALL_ROOT)/include/dynamixel_api/*
116+
$(RM_ALL) $(INSTALL_ROOT)/include/dynamixel_easy_sdk/*
117117
$(RM_ALL) $(INSTALL_ROOT)/share/dynamixel_sdk/control_table
118118

119119
reinstall: uninstall install
@@ -135,7 +135,7 @@ $(DIR_OBJS)/%.o: $(DIR_DXL)/src/dynamixel_sdk/%.c
135135
$(DIR_OBJS)/%.o: $(DIR_DXL)/src/dynamixel_sdk/%.cpp
136136
$(CX) $(CXFLAGS) -c $? -o $@
137137

138-
$(DIR_OBJS)/%.o: $(DIR_DXL)/src/dynamixel_api/%.cpp
138+
$(DIR_OBJS)/%.o: $(DIR_DXL)/src/dynamixel_easy_sdk/%.cpp
139139
$(CX) $(CXFLAGS) -c $? -o $@
140140

141141
#---------------------------------------------------------------------

c++/include/dynamixel_api/connector.hpp renamed to c++/include/dynamixel_easy_sdk/connector.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_CONNECTOR_HPP_
18-
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_CONNECTOR_HPP_
17+
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_CONNECTOR_HPP_
18+
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_CONNECTOR_HPP_
1919

2020
#include <memory>
2121
#include <string>
2222
#include <vector>
2323

2424
#include "dynamixel_sdk/dynamixel_sdk.h"
25-
#include "dynamixel_api/dynamixel_error.hpp"
26-
#include "dynamixel_api/motor.hpp"
27-
#include "dynamixel_api/group_executor.hpp"
25+
#include "dynamixel_easy_sdk/dynamixel_error.hpp"
26+
#include "dynamixel_easy_sdk/motor.hpp"
27+
#include "dynamixel_easy_sdk/group_executor.hpp"
2828

2929
namespace dynamixel
3030
{
@@ -59,4 +59,4 @@ class Connector
5959
PacketHandler * packet_handler_;
6060
};
6161
} // namespace dynamixel
62-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_CONNECTOR_HPP_ */
62+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_CONNECTOR_HPP_ */

c++/include/dynamixel_api/control_table.hpp renamed to c++/include/dynamixel_easy_sdk/control_table.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_CONTROL_TABLE_HPP_
18-
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_CONTROL_TABLE_HPP_
17+
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_CONTROL_TABLE_HPP_
18+
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_CONTROL_TABLE_HPP_
1919

2020
#include <cstdint>
2121
#include <fstream>
@@ -24,7 +24,7 @@
2424
#include <sstream>
2525
#include <string>
2626

27-
#include "dynamixel_api/dynamixel_error.hpp"
27+
#include "dynamixel_easy_sdk/dynamixel_error.hpp"
2828

2929
namespace dynamixel
3030
{
@@ -42,4 +42,4 @@ class ControlTable
4242
static const std::map<std::string, ControlTableItem> & getControlTable(uint16_t model_number);
4343
};
4444
} // namespace dynamixel
45-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_CONTROL_TABLE_HPP_ */
45+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_CONTROL_TABLE_HPP_ */

c++/include/dynamixel_api/dynamixel_api.hpp renamed to c++/include/dynamixel_easy_sdk/dynamixel_easy_sdk.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_DYNAMIXEL_API_HPP_
18-
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_DYNAMIXEL_API_HPP_
17+
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_DYNAMIXEL_API_HPP_
18+
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_DYNAMIXEL_API_HPP_
1919

2020

21-
#include "dynamixel_api/connector.hpp"
22-
#include "dynamixel_api/dynamixel_error.hpp"
23-
#include "dynamixel_api/motor.hpp"
24-
#include "dynamixel_api/group_executor.hpp"
21+
#include "dynamixel_easy_sdk/connector.hpp"
22+
#include "dynamixel_easy_sdk/dynamixel_error.hpp"
23+
#include "dynamixel_easy_sdk/motor.hpp"
24+
#include "dynamixel_easy_sdk/group_executor.hpp"
2525

26-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_HPP_ */
26+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_DYNAMIXEL_API_HPP_ */

c++/include/dynamixel_api/dynamixel_error.hpp renamed to c++/include/dynamixel_easy_sdk/dynamixel_error.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_DYNAMIXEL_ERROR_HPP_
18-
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_DYNAMIXEL_ERROR_HPP_
17+
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_DYNAMIXEL_ERROR_HPP_
18+
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_DYNAMIXEL_ERROR_HPP_
1919

2020
#include <variant>
2121
#include <stdexcept>
@@ -41,13 +41,13 @@ enum class DxlError
4141
SDK_ERRNUM_DATA_LENGTH = 5, // Data length error
4242
SDK_ERRNUM_DATA_LIMIT = 6, // Data limit error
4343
SDK_ERRNUM_ACCESS = 7, // Access error
44-
API_FUNCTION_NOT_SUPPORTED = 11, // API does not support this function
45-
API_MOTOR_TORQUE_OFF = 12, // Motor torque is off
46-
API_OPERATING_MODE_MISMATCH = 13, // Operating mode is not appropriate for this function
47-
API_ADD_PARAM_FAIL = 21, // Failed to add parameter
48-
API_COMMAND_IS_EMPTY = 22, // No command to execute
49-
API_DUPLICATE_ID = 23, // Duplicate ID in staged commands
50-
API_FAIL_TO_GET_DATA = 24 // Failed to get data from motor
44+
EASY_SDK_FUNCTION_NOT_SUPPORTED = 11, // API does not support this function
45+
EASY_SDK_MOTOR_TORQUE_OFF = 12, // Motor torque is off
46+
EASY_SDK_OPERATING_MODE_MISMATCH = 13, // Operating mode is not appropriate for this function
47+
EASY_SDK_ADD_PARAM_FAIL = 21, // Failed to add parameter
48+
EASY_SDK_COMMAND_IS_EMPTY = 22, // No command to execute
49+
EASY_SDK_DUPLICATE_ID = 23, // Duplicate ID in staged commands
50+
EASY_SDK_FAIL_TO_GET_DATA = 24 // Failed to get data from motor
5151
};
5252

5353
template<typename T, typename E>
@@ -142,4 +142,4 @@ class DxlRuntimeError : public std::runtime_error
142142
std::string getErrorMessage(DxlError error_code);
143143
} // namespace dynamixel
144144

145-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_DYNAMIXEL_ERROR_HPP_ */
145+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_DYNAMIXEL_ERROR_HPP_ */

c++/include/dynamixel_api/group_executor.hpp renamed to c++/include/dynamixel_easy_sdk/group_executor.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_GROUP_EXECUTOR_HPP_
18-
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_GROUP_EXECUTOR_HPP_
17+
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_GROUP_EXECUTOR_HPP_
18+
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_GROUP_EXECUTOR_HPP_
1919

2020
#include <cstdint>
2121
#include <map>
@@ -25,9 +25,9 @@
2525
#include <vector>
2626

2727
#include "dynamixel_sdk/dynamixel_sdk.h"
28-
#include "dynamixel_api/control_table.hpp"
29-
#include "dynamixel_api/dynamixel_error.hpp"
30-
#include "dynamixel_api/staged_command.hpp"
28+
#include "dynamixel_easy_sdk/control_table.hpp"
29+
#include "dynamixel_easy_sdk/dynamixel_error.hpp"
30+
#include "dynamixel_easy_sdk/staged_command.hpp"
3131

3232
namespace dynamixel
3333
{
@@ -68,4 +68,4 @@ class GroupExecutor
6868

6969
} // namespace dynamixel
7070

71-
#endif // DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_GROUP_EXECUTOR_HPP_
71+
#endif // DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_GROUP_EXECUTOR_HPP_
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_MOTOR_HPP_
18-
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_MOTOR_HPP_
17+
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_MOTOR_HPP_
18+
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_MOTOR_HPP_
1919

2020
#include <cstdint>
2121
#include <map>
2222
#include <memory>
2323
#include <string>
2424

2525
#include "dynamixel_sdk/dynamixel_sdk.h"
26-
#include "dynamixel_api/control_table.hpp"
27-
#include "dynamixel_api/dynamixel_error.hpp"
28-
#include "dynamixel_api/staged_command.hpp"
26+
#include "dynamixel_easy_sdk/control_table.hpp"
27+
#include "dynamixel_easy_sdk/dynamixel_error.hpp"
28+
#include "dynamixel_easy_sdk/staged_command.hpp"
2929

3030
namespace dynamixel
3131
{
@@ -129,4 +129,4 @@ class Motor
129129
const std::map<std::string, ControlTableItem> & control_table_;
130130
};
131131
} // namespace dynamixel
132-
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_MOTOR_HPP_ */
132+
#endif /* DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_MOTOR_HPP_ */

c++/include/dynamixel_api/staged_command.hpp renamed to c++/include/dynamixel_easy_sdk/staged_command.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_STAGED_COMMAND_HPP_
18-
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_STAGED_COMMAND_HPP_
17+
#ifndef DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_STAGED_COMMAND_HPP_
18+
#define DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_STAGED_COMMAND_HPP_
1919

2020
#include <cstdint>
2121
#include <vector>
@@ -51,4 +51,4 @@ struct StagedCommand
5151

5252
} // namespace dynamixel
5353

54-
#endif // DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_API_STAGED_COMMAND_HPP_
54+
#endif // DYNAMIXEL_SDK_INCLUDE_DYNAMIXEL_EASY_SDK_STAGED_COMMAND_HPP_
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
// Author: Hyungyu Kim
1616

17-
#include "dynamixel_api/connector.hpp"
17+
#include "dynamixel_easy_sdk/connector.hpp"
1818

1919
namespace dynamixel
2020
{

c++/src/dynamixel_api/control_table.cpp renamed to c++/src/dynamixel_easy_sdk/control_table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <stdexcept>
1818

19-
#include "dynamixel_api/control_table.hpp"
19+
#include "dynamixel_easy_sdk/control_table.hpp"
2020

2121
namespace dynamixel
2222
{

0 commit comments

Comments
 (0)