Revision 2:429b0b439bc1, committed 2017-01-13

Comitter:

Asimov

Date:

Fri Jan 13 21:00:21 2017 +0000

Parent:

1:7f3c3ac6b20b

Commit message:

Just a copy

Changed in this revision

diff -r 7f3c3ac6b20b -r 429b0b439bc1 MicroBitPCA9685.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MicroBitPCA9685.cpp	Fri Jan 13 21:00:21 2017 +0000
@@ -0,0 +1,77 @@
+#include "MicroBit.h"
+#include "MicroBitPCA9685.h"
+
+MicroBitPCA9685::MicroBitPCA9685(MicroBitI2C& _i2c, uint8_t addr) : i2c(_i2c), _i2caddr(addr) {}
+
+void MicroBitPCA9685::begin(void)
+{
+    reset();
+}
+
+void MicroBitPCA9685::frequencyI2C(int freq)
+{
+    i2c.frequency(freq);
+}
+int MicroBitPCA9685::write8(uint8_t address, uint8_t data)
+{
+    char cmd[2];
+    cmd[0] = address;
+    cmd[1] = data;
+    return i2c.write(_i2caddr, cmd, 2);
+}
+
+char MicroBitPCA9685::read8(char address)
+{
+    i2c.write(_i2caddr, &address, 1);
+    char rtn;
+    i2c.read(_i2caddr, &rtn, 1);
+    return rtn;
+}
+
+void MicroBitPCA9685::reset(void)
+{
+    write8(PCA9685_MODE1, 0x0);
+}
+void MicroBitPCA9685::setPrescale(uint8_t prescale) {
+    uint8_t oldmode = read8(PCA9685_MODE1);
+    uint8_t newmode = (oldmode&0x7F) | 0x10; // sleep
+    write8(PCA9685_MODE1, newmode); // go to sleep
+    wait_ms(5);
+    write8(PCA9685_PRESCALE, prescale); // set the prescaler
+    write8(PCA9685_MODE1, oldmode);
+    wait_ms(5);
+    write8(PCA9685_MODE1, oldmode | 0xa1);
+}
+void MicroBitPCA9685::setPWMFreq(float freq)
+{
+    float prescaleval = 25000000;
+    prescaleval /= 4096;
+    prescaleval /= freq;
+    uint8_t prescale = floor(prescaleval  + 0.5) - 1;
+    setPrescale(prescale);
+}
+
+int MicroBitPCA9685::setPWM(uint8_t num, uint16_t on, uint16_t off)
+{
+    char cmd[5];
+    cmd[0] = LED0_ON_L + 4 * num;
+    cmd[1] = on;
+    cmd[2] = on >> 8;
+    cmd[3] = off;
+    cmd[4] = off >> 8;
+    return i2c.write(_i2caddr, cmd, 5);
+}
+
+
+ 
+
+int MicroBitPCA9685::setAllPWM(uint16_t on, uint16_t off)
+{
+    char cmd[5];
+    cmd[0] = ALLLED_ON_L;
+    cmd[1] = on;
+    cmd[2] = on >> 8;
+    cmd[3] = off;
+    cmd[4] = off >> 8;
+    return i2c.write(_i2caddr, cmd, 5);
+}
\ No newline at end of file

diff -r 7f3c3ac6b20b -r 429b0b439bc1 MicroBitPCA9685.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MicroBitPCA9685.h	Fri Jan 13 21:00:21 2017 +0000
@@ -0,0 +1,110 @@
+/**Library for PCA9685 16-channel, 12-bit PWM Fm+ I²C-bus LED controller
+* Example code
+* @code
+*
+*#include"PCA9685.h"
+*#include"mbed.h"
+*
+*
+*
+*PCA9685 pwm(D14,D15);
+* 
+*void setServoPulse(uint8_t n, float pulse) {
+*    float pulselength = 10000;   // 10,000 units per seconds
+*    pulse = 4094 * pulse / pulselength;
+*    pwm.setPWM(n, 0, pulse);
+*}
+* 
+*void initServoDriver() {
+*    pwm.begin();
+*    pwm.setPrescale(64);    //This value is decided for 10ms interval.
+*    pwm.frequencyI2C(400000); //400kHz
+*}
+* 
+* int main() {
+*
+*    while(1){
+*    initServoDriver();
+*    wait(0.2);
+*    setServoPulse(0, 2300);
+*    setServoPulse(1, 500);    
+*    wait(0.5);//delay necessary to perform the action
+*    setServoPulse(0, 1350);
+*    setServoPulse(1, 1350);
+*    wait(0.5);
+*    setServoPulse(0,550);
+*    setServoPulse(1, 2250);
+*    wait(0.5);
+*    setServoPulse(0, 2300);
+*    wait(2);
+*    for (int mov = 550; mov < 2300; mov++){
+*    setServoPulse(0, mov);
+*    wait(0.001); 
+*    }  
+*    for (int mov = 500; mov < 2200; mov++){
+*    setServoPulse(1, mov);
+*    wait(0.001); 
+*    }     
+*   }
+*}
+*@endcode
+*
+*/
+#ifndef MicroBitPCA9685_H
+#define MicroBitPCA9685_H
+
+#include <cmath>
+//register definitions
+#define PCA9685_SUBADR1 0x2
+#define PCA9685_SUBADR2 0x3
+#define PCA9685_SUBADR3 0x4
+
+#define PCA9685_MODE1 0x0
+#define PCA9685_PRESCALE 0xFE
+
+#define LED0_ON_L 0x6
+#define LED0_ON_H 0x7
+#define LED0_OFF_L 0x8
+#define LED0_OFF_H 0x9
+
+#define ALLLED_ON_L 0xFA
+#define ALLLED_ON_H 0xFB
+#define ALLLED_OFF_L 0xFC
+#define ALLLED_OFF_H 0xFD
+
+
+class MicroBitPCA9685
+{
+public:
+    MicroBitPCA9685(MicroBitI2C& _i2c, uint8_t addr = 0x40);
+    void frequencyI2C(int freq);
+    void begin(void); //Initialize the controller
+    void reset(void); //Reset the controller
+    void setPrescale(uint8_t prescale);//setPrescale(prescale)
+    /** Set prescale
+     *
+     *  @param prescale: set scale for the PWM frequency
+     *
+     */
+    void setPWMFreq(float freq);//Set the pwm frequency
+    /** Set frequency
+      *
+      * @param frequency in Hz
+      *
+      */
+    int setPWM(uint8_t num, uint16_t on, uint16_t off);//SetPWM(channel, on, off)
+    /** Set the start (on) and the end (off) of the part of the PWM pulse of the channel
+     *  @param channel : from 0 to 15 the channel the should be update
+     *  @param  on: from 0 to 4095 the tick when the signal should pass from low to high
+     *  @param off: from 0 to 4095 the tick when the signal should pass from high to low
+     */
+     
+     int setAllPWM(uint16_t on, uint16_t off);
+private:
+    int write8(uint8_t address, uint8_t data);
+    char read8(char address);
+    uint8_t _i2caddr;
+    MicroBitI2C& i2c;
+};
+
+#endif
\ No newline at end of file

diff -r 7f3c3ac6b20b -r 429b0b439bc1 PCA9685.cpp
--- a/PCA9685.cpp	Fri Jul 24 09:03:58 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-#include "PCA9685.h"
-#include "mbed.h"
-PCA9685::PCA9685(PinName sda, PinName scl, int addr) : i2c(sda, scl), _i2caddr(addr) {}
-
-void PCA9685::begin(void)
-{
-    reset();
-}
-
-void PCA9685::frequencyI2C(int freq)
-{
-    i2c.frequency(freq);
-}
-void PCA9685::write8(uint8_t address, uint8_t data)
-{
-    char cmd[2];
-    cmd[0] = address;
-    cmd[1] = data;
-    i2c.write(_i2caddr, cmd, 2);
-}
-
-char PCA9685::read8(char address)
-{
-    i2c.write(_i2caddr, &address, 1);
-    char rtn;
-    i2c.read(_i2caddr, &rtn, 1);
-    return rtn;
-}
-
-void PCA9685::reset(void)
-{
-    write8(PCA9685_MODE1, 0x0);
-}
-void PCA9685::setPrescale(uint8_t prescale) {
-    uint8_t oldmode = read8(PCA9685_MODE1);
-    uint8_t newmode = (oldmode&0x7F) | 0x10; // sleep
-    write8(PCA9685_MODE1, newmode); // go to sleep
-    wait_ms(5);
-    write8(PCA9685_PRESCALE, prescale); // set the prescaler
-    write8(PCA9685_MODE1, oldmode);
-    wait_ms(5);
-    write8(PCA9685_MODE1, oldmode | 0xa1);
-}
-void PCA9685::setPWMFreq(float freq)
-{
-    float prescaleval = 25000000;
-    prescaleval /= 4096;
-    prescaleval /= freq;
-    uint8_t prescale = floor(prescaleval  + 0.5) - 1;
-    setPrescale(prescale);
-}
-
-void PCA9685::setPWM(uint8_t num, uint16_t on, uint16_t off)
-{
-    char cmd[5];
-    cmd[0] = LED0_ON_L + 4 * num;
-    cmd[1] = on;
-    cmd[2] = on >> 8;
-    cmd[3] = off;
-    cmd[4] = off >> 8;
-    i2c.write(_i2caddr, cmd, 5);
-}

diff -r 7f3c3ac6b20b -r 429b0b439bc1 PCA9685.h
--- a/PCA9685.h	Fri Jul 24 09:03:58 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/**Library for PCA9685 16-channel, 12-bit PWM Fm+ I²C-bus LED controller
-* Example code
-* @code
-*
-*#include"PCA9685.h"
-*#include"mbed.h"
-*
-*
-*
-*PCA9685 pwm(D14,D15);
-* 
-*void setServoPulse(uint8_t n, float pulse) {
-*    float pulselength = 10000;   // 10,000 units per seconds
-*    pulse = 4094 * pulse / pulselength;
-*    pwm.setPWM(n, 0, pulse);
-*}
-* 
-*void initServoDriver() {
-*    pwm.begin();
-*    pwm.setPrescale(64);    //This value is decided for 10ms interval.
-*    pwm.frequencyI2C(400000); //400kHz
-*}
-* 
-* int main() {
-*
-*    while(1){
-*    initServoDriver();
-*    wait(0.2);
-*    setServoPulse(0, 2300);
-*    setServoPulse(1, 500);    
-*    wait(0.5);//delay necessary to perform the action
-*    setServoPulse(0, 1350);
-*    setServoPulse(1, 1350);
-*    wait(0.5);
-*    setServoPulse(0,550);
-*    setServoPulse(1, 2250);
-*    wait(0.5);
-*    setServoPulse(0, 2300);
-*    wait(2);
-*    for (int mov = 550; mov < 2300; mov++){
-*    setServoPulse(0, mov);
-*    wait(0.001); 
-*    }  
-*    for (int mov = 500; mov < 2200; mov++){
-*    setServoPulse(1, mov);
-*    wait(0.001); 
-*    }     
-*   }
-*}
-*@endcode
-*
-*/
-#ifndef PCA9685_H
-#define PCA9685_H
-
-#include "mbed.h"
-#include <cmath>
-//register definitions
-#define PCA9685_SUBADR1 0x2
-#define PCA9685_SUBADR2 0x3
-#define PCA9685_SUBADR3 0x4
-
-#define PCA9685_MODE1 0x0
-#define PCA9685_PRESCALE 0xFE
-
-#define LED0_ON_L 0x6
-#define LED0_ON_H 0x7
-#define LED0_OFF_L 0x8
-#define LED0_OFF_H 0x9
-
-#define ALLLED_ON_L 0xFA
-#define ALLLED_ON_H 0xFB
-#define ALLLED_OFF_L 0xFC
-#define ALLLED_OFF_H 0xFD
-
-
-class PCA9685
-{
-public:
-    PCA9685(PinName sda, PinName scl, int addr = 0x80);
-    void frequencyI2C(int freq);
-    void begin(void); //Initialize the controller
-    void reset(void); //Reset the controller
-    void setPrescale(uint8_t prescale);//setPrescale(prescale)
-    /** Set prescale
-     *
-     *  @param prescale: set scale for the PWM frequency
-     *
-     */
-    void setPWMFreq(float freq);//Set the pwm frequency
-    /** Set frequency
-      *
-      * @param frequency in Hz
-      *
-      */
-    void setPWM(uint8_t num, uint16_t on, uint16_t off);//SetPWM(channel, on, off)
-    /** Set the start (on) and the end (off) of the part of the PWM pulse of the channel
-     *  @param channel : from 0 to 15 the channel the should be update
-     *  @param  on: from 0 to 4095 the tick when the signal should pass from low to high
-     *  @param off: from 0 to 4095 the tick when the signal should pass from high to low
-     */
-private:
-    void write8(uint8_t address, uint8_t data);
-    char read8(char address);
-    int _i2caddr;
-    I2C i2c;
-};
-
-#endif
\ No newline at end of file

diff -r 7f3c3ac6b20b -r 429b0b439bc1 mbed.bld
--- a/mbed.bld	Fri Jul 24 09:03:58 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/mbed_official/code/mbed/builds/bad568076d81
\ No newline at end of file