Browse Source

stepmotor: changed name from step_motor to stepmotor

Signed-off-by: Kiveisha Yevgeniy <yevgeniy.kiveisha@intel.com>
Kiveisha Yevgeniy 10 years ago
parent
commit
2c0e83e406

+ 3
- 3
examples/CMakeLists.txt View File

@@ -17,7 +17,7 @@ add_executable (accelerometer mma7455.cxx)
17 17
 add_executable (lcd st7735.cxx)
18 18
 add_executable (max31855-example max31855.cxx)
19 19
 add_executable (gy65-example gy65.cxx)
20
-add_executable (stepmotor-example step_motor_example.cxx)
20
+add_executable (stepmotor-example stepmotor.cxx)
21 21
 
22 22
 include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l)
23 23
 include_directories (${PROJECT_SOURCE_DIR}/src/grove)
@@ -33,7 +33,7 @@ include_directories (${PROJECT_SOURCE_DIR}/src/mma7455)
33 33
 include_directories (${PROJECT_SOURCE_DIR}/src/st7735)
34 34
 include_directories (${PROJECT_SOURCE_DIR}/src/max31855)
35 35
 include_directories (${PROJECT_SOURCE_DIR}/src/gy65)
36
-include_directories (${PROJECT_SOURCE_DIR}/src/step_motor)
36
+include_directories (${PROJECT_SOURCE_DIR}/src/stepmotor)
37 37
 
38 38
 target_link_libraries (compass hmc5883l ${CMAKE_THREAD_LIBS_INIT})
39 39
 target_link_libraries (groveled grove ${CMAKE_THREAD_LIBS_INIT})
@@ -54,4 +54,4 @@ target_link_libraries (accelerometer mma7455 ${CMAKE_THREAD_LIBS_INIT})
54 54
 target_link_libraries (lcd st7735 ${CMAKE_THREAD_LIBS_INIT})
55 55
 target_link_libraries (max31855-example max31855 ${CMAKE_THREAD_LIBS_INIT})
56 56
 target_link_libraries (gy65-example gy65 ${CMAKE_THREAD_LIBS_INIT})
57
-target_link_libraries (stepmotor-example step_motor ${CMAKE_THREAD_LIBS_INIT})
57
+target_link_libraries (stepmotor-example stepmotor ${CMAKE_THREAD_LIBS_INIT})

examples/step_motor_example.cxx → examples/stepmotor.cxx View File

@@ -25,7 +25,7 @@
25 25
 #include <string.h>
26 26
 #include <unistd.h>
27 27
 #include <iostream>
28
-#include "step_motor.h"
28
+#include "stepmotor.h"
29 29
 #include <signal.h>
30 30
 
31 31
 int doWork = 0;

+ 0
- 7
src/step_motor/jsupm_step_motor.i View File

@@ -1,7 +0,0 @@
1
-%module jsupm_step_motor
2
-
3
-%{
4
-    #include "step_motor.h"
5
-%}
6
-
7
-%include "step_motor.h"

+ 0
- 10
src/step_motor/pyupm_step_motor.i View File

@@ -1,10 +0,0 @@
1
-%module pyupm_step_motor
2
-
3
-%include "stdint.i"
4
-
5
-%feature("autodoc", "3");
6
-
7
-%include "step_motor.h"
8
-%{
9
-    #include "step_motor.h"
10
-%}

src/step_motor/CMakeLists.txt → src/stepmotor/CMakeLists.txt View File

@@ -1,5 +1,5 @@
1
-set (libname "step_motor")
2
-set (libdescription "upm STEP_MOTOR")
1
+set (libname "stepmotor")
2
+set (libdescription "upm STEPMOTOR")
3 3
 set (module_src ${libname}.cxx)
4 4
 set (module_h ${libname}.h)
5 5
 upm_module_init()

+ 7
- 0
src/stepmotor/jsupm_stepmotor.i View File

@@ -0,0 +1,7 @@
1
+%module jsupm_stepmotor
2
+
3
+%{
4
+    #include "stepmotor.h"
5
+%}
6
+
7
+%include "stepmotor.h"

+ 10
- 0
src/stepmotor/pyupm_stepmotor.i View File

@@ -0,0 +1,10 @@
1
+%module pyupm_stepmotor
2
+
3
+%include "stdint.i"
4
+
5
+%feature("autodoc", "3");
6
+
7
+%include "stepmotor.h"
8
+%{
9
+    #include "stepmotor.h"
10
+%}

src/step_motor/step_motor.cxx → src/stepmotor/stepmotor.cxx View File

@@ -26,7 +26,7 @@
26 26
 #include <unistd.h>
27 27
 #include <stdlib.h>
28 28
 
29
-#include "step_motor.h"
29
+#include "stepmotor.h"
30 30
 
31 31
 using namespace upm;
32 32
 

src/step_motor/step_motor.h → src/stepmotor/stepmotor.h View File

@@ -44,9 +44,9 @@ namespace upm {
44 44
 /**
45 45
  * @brief C++ API for StepMotor Drivers
46 46
  *
47
- * This file defines the step_motor C++ interface for libstep_motor
47
+ * This file defines the stepmotor C++ interface for libstepmotor
48 48
  *
49
- * @snippet step_motor_example.cxx Interesting
49
+ * @snippet stepmotor.cxx Interesting
50 50
  */
51 51
 class StepMotor {
52 52
     public: