From 2c0e83e40681ec8efc6c4790388f9cef4a476260 Mon Sep 17 00:00:00 2001 From: Kiveisha Yevgeniy Date: Wed, 18 Jun 2014 08:51:31 +0000 Subject: [PATCH] stepmotor: changed name from step_motor to stepmotor Signed-off-by: Kiveisha Yevgeniy --- examples/CMakeLists.txt | 6 +++--- examples/{step_motor_example.cxx => stepmotor.cxx} | 2 +- src/step_motor/jsupm_step_motor.i | 7 ------- src/step_motor/pyupm_step_motor.i | 10 ---------- src/{step_motor => stepmotor}/CMakeLists.txt | 4 ++-- src/stepmotor/jsupm_stepmotor.i | 7 +++++++ src/stepmotor/pyupm_stepmotor.i | 10 ++++++++++ src/{step_motor/step_motor.cxx => stepmotor/stepmotor.cxx} | 2 +- src/{step_motor/step_motor.h => stepmotor/stepmotor.h} | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) rename examples/{step_motor_example.cxx => stepmotor.cxx} (98%) delete mode 100644 src/step_motor/jsupm_step_motor.i delete mode 100644 src/step_motor/pyupm_step_motor.i rename src/{step_motor => stepmotor}/CMakeLists.txt (54%) create mode 100644 src/stepmotor/jsupm_stepmotor.i create mode 100644 src/stepmotor/pyupm_stepmotor.i rename src/{step_motor/step_motor.cxx => stepmotor/stepmotor.cxx} (99%) rename src/{step_motor/step_motor.h => stepmotor/stepmotor.h} (96%) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 6666071..0fcd077 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable (accelerometer mma7455.cxx) add_executable (lcd st7735.cxx) add_executable (max31855-example max31855.cxx) add_executable (gy65-example gy65.cxx) -add_executable (stepmotor-example step_motor_example.cxx) +add_executable (stepmotor-example stepmotor.cxx) include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l) include_directories (${PROJECT_SOURCE_DIR}/src/grove) @@ -33,7 +33,7 @@ include_directories (${PROJECT_SOURCE_DIR}/src/mma7455) include_directories (${PROJECT_SOURCE_DIR}/src/st7735) include_directories (${PROJECT_SOURCE_DIR}/src/max31855) include_directories (${PROJECT_SOURCE_DIR}/src/gy65) -include_directories (${PROJECT_SOURCE_DIR}/src/step_motor) +include_directories (${PROJECT_SOURCE_DIR}/src/stepmotor) target_link_libraries (compass hmc5883l ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (groveled grove ${CMAKE_THREAD_LIBS_INIT}) @@ -54,4 +54,4 @@ target_link_libraries (accelerometer mma7455 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (lcd st7735 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (max31855-example max31855 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (gy65-example gy65 ${CMAKE_THREAD_LIBS_INIT}) -target_link_libraries (stepmotor-example step_motor ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (stepmotor-example stepmotor ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/step_motor_example.cxx b/examples/stepmotor.cxx similarity index 98% rename from examples/step_motor_example.cxx rename to examples/stepmotor.cxx index dc06941..cc8091e 100644 --- a/examples/step_motor_example.cxx +++ b/examples/stepmotor.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "step_motor.h" +#include "stepmotor.h" #include int doWork = 0; diff --git a/src/step_motor/jsupm_step_motor.i b/src/step_motor/jsupm_step_motor.i deleted file mode 100644 index 3c45a7a..0000000 --- a/src/step_motor/jsupm_step_motor.i +++ /dev/null @@ -1,7 +0,0 @@ -%module jsupm_step_motor - -%{ - #include "step_motor.h" -%} - -%include "step_motor.h" diff --git a/src/step_motor/pyupm_step_motor.i b/src/step_motor/pyupm_step_motor.i deleted file mode 100644 index abd80c2..0000000 --- a/src/step_motor/pyupm_step_motor.i +++ /dev/null @@ -1,10 +0,0 @@ -%module pyupm_step_motor - -%include "stdint.i" - -%feature("autodoc", "3"); - -%include "step_motor.h" -%{ - #include "step_motor.h" -%} diff --git a/src/step_motor/CMakeLists.txt b/src/stepmotor/CMakeLists.txt similarity index 54% rename from src/step_motor/CMakeLists.txt rename to src/stepmotor/CMakeLists.txt index 62fe6cf..1d506bb 100644 --- a/src/step_motor/CMakeLists.txt +++ b/src/stepmotor/CMakeLists.txt @@ -1,5 +1,5 @@ -set (libname "step_motor") -set (libdescription "upm STEP_MOTOR") +set (libname "stepmotor") +set (libdescription "upm STEPMOTOR") set (module_src ${libname}.cxx) set (module_h ${libname}.h) upm_module_init() diff --git a/src/stepmotor/jsupm_stepmotor.i b/src/stepmotor/jsupm_stepmotor.i new file mode 100644 index 0000000..cfadbce --- /dev/null +++ b/src/stepmotor/jsupm_stepmotor.i @@ -0,0 +1,7 @@ +%module jsupm_stepmotor + +%{ + #include "stepmotor.h" +%} + +%include "stepmotor.h" diff --git a/src/stepmotor/pyupm_stepmotor.i b/src/stepmotor/pyupm_stepmotor.i new file mode 100644 index 0000000..4c236c4 --- /dev/null +++ b/src/stepmotor/pyupm_stepmotor.i @@ -0,0 +1,10 @@ +%module pyupm_stepmotor + +%include "stdint.i" + +%feature("autodoc", "3"); + +%include "stepmotor.h" +%{ + #include "stepmotor.h" +%} diff --git a/src/step_motor/step_motor.cxx b/src/stepmotor/stepmotor.cxx similarity index 99% rename from src/step_motor/step_motor.cxx rename to src/stepmotor/stepmotor.cxx index 9f04e4c..d628718 100644 --- a/src/step_motor/step_motor.cxx +++ b/src/stepmotor/stepmotor.cxx @@ -26,7 +26,7 @@ #include #include -#include "step_motor.h" +#include "stepmotor.h" using namespace upm; diff --git a/src/step_motor/step_motor.h b/src/stepmotor/stepmotor.h similarity index 96% rename from src/step_motor/step_motor.h rename to src/stepmotor/stepmotor.h index f80ff65..c1d1314 100644 --- a/src/step_motor/step_motor.h +++ b/src/stepmotor/stepmotor.h @@ -44,9 +44,9 @@ namespace upm { /** * @brief C++ API for StepMotor Drivers * - * This file defines the step_motor C++ interface for libstep_motor + * This file defines the stepmotor C++ interface for libstepmotor * - * @snippet step_motor_example.cxx Interesting + * @snippet stepmotor.cxx Interesting */ class StepMotor { public: -- 2.7.4