Merge branch 'master' of github.com:hoffmannjan/Adafruit-PWM-Servo-Driver-Library

Author: hoffmannjan

Adafruit_PWMServoDriver.cpp

@@ -33,11 +33,11 @@
 /*!
  *  @brief  Instantiates a new PCA9685 PWM driver chip with the I2C address on a
  * TwoWire interface
+ *  @param  addr The 7-bit I2C address to locate this chip, default is 0x40
  *  @param  i2c  A pointer to a 'Wire' compatible object that we'll use to
  * communicate with
- *  @param  addr The 7-bit I2C address to locate this chip, default is 0x40
  */
-Adafruit_PWMServoDriver::Adafruit_PWMServoDriver(TwoWire *i2c, uint8_t addr) {
+Adafruit_PWMServoDriver::Adafruit_PWMServoDriver(uint8_t addr, TwoWire *i2c) {
   _i2c = i2c;
   _i2caddr = addr;
 }
@@ -46,7 +46,7 @@ Adafruit_PWMServoDriver::Adafruit_PWMServoDriver(TwoWire *i2c, uint8_t addr) {
  *  @brief  Setups the I2C interface and hardware
  *  @param  prescale
  *          Sets External Clock (Optional)
- *          
+ *
  */
 void Adafruit_PWMServoDriver::begin(uint8_t prescale) {
   _i2c->begin();
@@ -158,13 +158,38 @@ void Adafruit_PWMServoDriver::setPWMFreq(float freq) {
 #endif
 }
 
+/*!
+ *  @brief  Sets the output mode of the PCA9685 to either 
+ *  open drain or push pull / totempole. 
+ *  Warning: LEDs with integrated zener diodes should
+ *  only be driven in open drain mode. 
+ *  @param  totempole Totempole if true, open drain if false. 
+ */
+void Adafruit_PWMServoDriver::setOutputMode(bool totempole) {  
+  uint8_t oldmode = read8(PCA9685_MODE2); 
+  uint8_t newmode;
+  if (totempole) {
+    newmode = (oldmode&0x7F) | 0x04;
+  }
+  else {
+    newmode = (oldmode&0x7F) & ~0x04;
+  }
+  write8(PCA9685_MODE2, newmode); 
+#ifdef ENABLE_DEBUG_OUTPUT
+  Serial.print("Setting output mode: ");
+  Serial.print(totempole ? "totempole" : "open drain");
+  Serial.print(" by setting MODE2 to ");
+  Serial.println(newmode);
+#endif
+}
+
 /*!
  *  @brief  Gets the PWM output of one of the PCA9685 pins
  *  @param  num One of the PWM output pins, from 0 to 15
  *  @return requested PWM output value
  */
 uint8_t Adafruit_PWMServoDriver::getPWM(uint8_t num) {
-  _i2c->requestFrom((uint8_t)_i2caddr, LED0_ON_L + 4 * num, (uint8_t)4);
+  _i2c->requestFrom((int)_i2caddr, LED0_ON_L + 4 * num, (int)4);
   return _i2c->read();
 }
 

Adafruit_PWMServoDriver.h

@@ -19,7 +19,6 @@
  *
  *  BSD license, all text above must be included in any redistribution
  */
-
 #ifndef _ADAFRUIT_PWMServoDriver_H
 #define _ADAFRUIT_PWMServoDriver_H
 
@@ -31,6 +30,7 @@
 #define PCA9685_SUBADR3 0x4 /**< i2c bus address 3 */
 
 #define PCA9685_MODE1 0x0 /**< Mode Register 1 */
+#define PCA9685_MODE2 0x1 /**< Mode Register 2 */
 #define PCA9685_PRESCALE 0xFE /**< Prescaler for PWM output frequency */
 
 #define LED0_ON_L 0x6 /**< LED0 output and brightness control byte 0 */
@@ -48,13 +48,14 @@
  */
 class Adafruit_PWMServoDriver {
  public:
-  Adafruit_PWMServoDriver(TwoWire *I2C = &Wire, uint8_t addr = 0x40);
+  Adafruit_PWMServoDriver(uint8_t addr = 0x40, TwoWire *I2C = &Wire);
   void begin(uint8_t prescale = 0);
   void reset();
   void sleep();
   void wakeup();
   void setExtClk(uint8_t prescale);
   void setPWMFreq(float freq);
+  void setOutputMode(bool totempole);
   uint8_t getPWM(uint8_t num);
   void setPWM(uint8_t num, uint16_t on, uint16_t off);
   void setPin(uint8_t num, uint16_t val, bool invert=false);

README.md

@@ -1,4 +1,4 @@
-# Adafruit PCA9685 PWM Servo Driver Library [![Build Status](https://travis-ci.org/adafruit/Adafruit_PWMServoDriver.svg?branch=master)](https://travis-ci.org/adafruit/Adafruit_PWMServoDriver)
+# Adafruit PCA9685 PWM Servo Driver Library [![Build Status](https://travis-ci.com/adafruit/Adafruit-PWM-Servo-Driver-Library.svg?branch=master)](https://travis-ci.com/adafruit/Adafruit-PWM-Servo-Driver-Library)
 
 This is a library for our Adafruit 16-channel PWM & Servo driver, shield or FeatherWing
 

library.properties

@@ -1,5 +1,5 @@
 name=Adafruit PWM Servo Driver Library
-version=1.0.2
+version=1.0.4
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=Adafruit PWM Servo Driver Library