From f53d8e79cc19e1a1ea27b905a483b5ba8b58c2cb Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Fri, 6 Mar 2015 12:37:45 -0800 Subject: [PATCH] adafruitss: renamed to adafruit pca9685 servo shield Signed-off-by: Mihai Tudor Panu --- examples/c++/CMakeLists.txt | 5 +++-- examples/c++/{pca9685ss.cxx => adafruitss.cxx} | 4 ++-- src/adafruitss/CMakeLists.txt | 5 +++++ .../pca9685ss.cxx => adafruitss/adafruitss.cxx} | 14 +++++++------- .../pca9685ss.h => adafruitss/adafruitss.h} | 12 ++++++------ src/adafruitss/jsupm_adafruitss.i | 7 +++++++ src/adafruitss/pyupm_adafruitss.i | 9 +++++++++ src/pca9685/jsupm_pca9685ss.i | 7 ------- src/pca9685/pyupm_pca9685ss.i | 9 --------- 9 files changed, 39 insertions(+), 33 deletions(-) rename examples/c++/{pca9685ss.cxx => adafruitss.cxx} (96%) create mode 100644 src/adafruitss/CMakeLists.txt rename src/{pca9685/pca9685ss.cxx => adafruitss/adafruitss.cxx} (94%) rename src/{pca9685/pca9685ss.h => adafruitss/adafruitss.h} (92%) create mode 100644 src/adafruitss/jsupm_adafruitss.i create mode 100644 src/adafruitss/pyupm_adafruitss.i delete mode 100644 src/pca9685/jsupm_pca9685ss.i delete mode 100644 src/pca9685/pyupm_pca9685ss.i diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index a8bf8326..ee741377 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -100,7 +100,7 @@ add_executable (at42qt1070-example at42qt1070.cxx) add_executable (grovemd-example grovemd.cxx) add_executable (pca9685-example pca9685.cxx) add_executable (groveeldriver-example groveeldriver.cxx) -add_executable (pca9685ss-example pca9685ss.cxx) +add_executable (adafruitss-example adafruitss.cxx) include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l) include_directories (${PROJECT_SOURCE_DIR}/src/grove) @@ -182,6 +182,7 @@ include_directories (${PROJECT_SOURCE_DIR}/src/at42qt1070) include_directories (${PROJECT_SOURCE_DIR}/src/grovemd) include_directories (${PROJECT_SOURCE_DIR}/src/pca9685) include_directories (${PROJECT_SOURCE_DIR}/src/groveeldriver) +include_directories (${PROJECT_SOURCE_DIR}/src/adafruitss) target_link_libraries (hmc5883l-example hmc5883l ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (groveled-example grove ${CMAKE_THREAD_LIBS_INIT}) @@ -283,4 +284,4 @@ target_link_libraries (at42qt1070-example at42qt1070 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (grovemd-example grovemd ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (pca9685-example pca9685 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (groveeldriver-example groveeldriver ${CMAKE_THREAD_LIBS_INIT}) -target_link_libraries (pca9685ss-example pca9685 ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (adafruitss-example adafruitss ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/c++/pca9685ss.cxx b/examples/c++/adafruitss.cxx similarity index 96% rename from examples/c++/pca9685ss.cxx rename to examples/c++/adafruitss.cxx index c2d32898..f2a7ebf6 100644 --- a/examples/c++/pca9685ss.cxx +++ b/examples/c++/adafruitss.cxx @@ -33,7 +33,7 @@ */ #include -#include "pca9685ss.h" +#include "adafruitss.h" #include using namespace std; @@ -43,7 +43,7 @@ int main() { int n; //! [Interesting] - upm::pca9685ss* servos = new upm::pca9685ss(6,0x40); + upm::adafruitss* servos = new upm::adafruitss(6,0x40); for (;;) { diff --git a/src/adafruitss/CMakeLists.txt b/src/adafruitss/CMakeLists.txt new file mode 100644 index 00000000..40214ce6 --- /dev/null +++ b/src/adafruitss/CMakeLists.txt @@ -0,0 +1,5 @@ +set (libname "adafruitss") +set (libdescription "upm Adafruit pca9685 based 16-channel servo shield") +set (module_src ${libname}.cxx) +set (module_h ${libname}.h) +upm_module_init() diff --git a/src/pca9685/pca9685ss.cxx b/src/adafruitss/adafruitss.cxx similarity index 94% rename from src/pca9685/pca9685ss.cxx rename to src/adafruitss/adafruitss.cxx index 8a57554c..034ae3e1 100644 --- a/src/pca9685/pca9685ss.cxx +++ b/src/adafruitss/adafruitss.cxx @@ -22,13 +22,13 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "pca9685ss.h" +#include "adafruitss.h" #include #include using namespace upm; -pca9685ss::pca9685ss(int bus,int i2c_address) +adafruitss::adafruitss(int bus,int i2c_address) { int n; int result; @@ -44,13 +44,13 @@ pca9685ss::pca9685ss(int bus,int i2c_address) m_rx_tx_buf[1]=0; result=mraa_i2c_write(m_i2c,m_rx_tx_buf,2); - pca9685ss::setPWMFreq(60); + adafruitss::setPWMFreq(60); - pca9685ss::update(); + adafruitss::update(); } -void pca9685ss::setPWMFreq(float freq) { +void adafruitss::setPWMFreq(float freq) { int result; freq *= 0.88; // Correct for overshoot in the frequency setting (see issue #11). float prescaleval = 25000000; @@ -101,13 +101,13 @@ void pca9685ss::setPWMFreq(float freq) { result=mraa_i2c_write(m_i2c,m_rx_tx_buf,2); } -int pca9685ss::update(void) +int adafruitss::update(void) { return MRAA_SUCCESS; } -void pca9685ss::servo(uint8_t port, uint8_t servo_type, uint16_t degrees) { +void adafruitss::servo(uint8_t port, uint8_t servo_type, uint16_t degrees) { // Set Servo values // Degrees is from 0 to 180 // servo_type: 0 = standard 1ms to 2ms diff --git a/src/pca9685/pca9685ss.h b/src/adafruitss/adafruitss.h similarity index 92% rename from src/pca9685/pca9685ss.h rename to src/adafruitss/adafruitss.h index 097eeec0..9f53a0d9 100644 --- a/src/pca9685/pca9685ss.h +++ b/src/adafruitss/adafruitss.h @@ -56,8 +56,8 @@ namespace upm { /** - * @brief pca9685 based servo controller - * @defgroup pca9685 libupm-pca9685 + * @brief Adafruit PCA9685 based servo controller + * @defgroup adafruitss libupm-adafruitss */ /** @@ -66,17 +66,17 @@ namespace upm { * Adafruit do recommend a capacitor be installed on the board which should alleviate the issue. Sizing depends on servos and count. * * @ingroup i2c - * @snippet pca9685ss.cxx Interesting + * @snippet adafruitss.cxx Interesting */ - class pca9685ss { + class adafruitss { public: /** - * Creates a pca9685ss object + * Creates a adafruitss object * * @param bus number of used i2c bus * @param i2c_address address of servo controller on i2c bus */ - pca9685ss(int bus, int i2c_address); + adafruitss(int bus, int i2c_address); int update(void); /** * Sets the frequency for your servos diff --git a/src/adafruitss/jsupm_adafruitss.i b/src/adafruitss/jsupm_adafruitss.i new file mode 100644 index 00000000..cb15aaac --- /dev/null +++ b/src/adafruitss/jsupm_adafruitss.i @@ -0,0 +1,7 @@ +%module jsupm_adafruitss +%include "../upm.i" + +%include "adafruitss.h" +%{ + #include "adafruitss.h" +%} diff --git a/src/adafruitss/pyupm_adafruitss.i b/src/adafruitss/pyupm_adafruitss.i new file mode 100644 index 00000000..65fa1088 --- /dev/null +++ b/src/adafruitss/pyupm_adafruitss.i @@ -0,0 +1,9 @@ +%module pyupm_adafruitss +%include "../upm.i" + +%feature("autodoc", "3"); + +%include "adafruitss.h" +%{ + #include "adafruitss.h" +%} diff --git a/src/pca9685/jsupm_pca9685ss.i b/src/pca9685/jsupm_pca9685ss.i deleted file mode 100644 index 3a7d79b4..00000000 --- a/src/pca9685/jsupm_pca9685ss.i +++ /dev/null @@ -1,7 +0,0 @@ -%module jsupm_pca9685 -%include "../upm.i" - -%include "pca9685ss.h" -%{ - #include "pca9685ss.h" -%} diff --git a/src/pca9685/pyupm_pca9685ss.i b/src/pca9685/pyupm_pca9685ss.i deleted file mode 100644 index f275b27c..00000000 --- a/src/pca9685/pyupm_pca9685ss.i +++ /dev/null @@ -1,9 +0,0 @@ -%module pyupm_pca9685 -%include "../upm.i" - -%feature("autodoc", "3"); - -%include "pca9685ss.h" -%{ - #include "pca9685ss.h" -%}