make more friendly with ESP8266 & Zero

Author: ladyada

Adafruit_PWMServoDriver.cpp

@@ -17,14 +17,13 @@
 
 #include <Adafruit_PWMServoDriver.h>
 #include <Wire.h>
-#if defined(__AVR__)
- #define WIRE Wire
-#elif defined(CORE_TEENSY) // Teensy boards
- #define WIRE Wire
-#else // Arduino Due
+#if defined(ARDUINO_SAM_DUE)
  #define WIRE Wire1
+#else
+ #define WIRE Wire
 #endif
 
+
 // Set to true to print some debug messages, or false to disable them.
 #define ENABLE_DEBUG_OUTPUT false
 

examples/pwmtest/pwmtest.pde

@@ -24,22 +24,31 @@ Adafruit_PWMServoDriver pwm = Adafruit_PWMServoDriver();
 // you can also call it with a different address you want
 //Adafruit_PWMServoDriver pwm = Adafruit_PWMServoDriver(0x41);
 
+#if defined(ARDUINO_ARCH_SAMD)  
+// for Zero, output on USB Serial console, remove line below if using programming port to program the Zero!
+   #define Serial SerialUSB
+#endif
+
 void setup() {
+#ifdef ESP8266
+  Wire.pins(2, 14);   // ESP8266 can use any two pins, such as SDA to #2 and SCL to #14
+#endif
+  
   Serial.begin(9600);
   Serial.println("16 channel PWM test!");
 
+  pwm.begin();
+  pwm.setPWMFreq(1600);  // This is the maximum PWM frequency
+
   // if you want to really speed stuff up, you can go into 'fast 400khz I2C' mode
   // some i2c devices dont like this so much so if you're sharing the bus, watch
   // out for this!
-
-  pwm.begin();
-  pwm.setPWMFreq(1600);  // This is the maximum PWM frequency
-    
+#ifdef TWBR    
   // save I2C bitrate
   uint8_t twbrbackup = TWBR;
   // must be changed after calling Wire.begin() (inside pwm.begin())
   TWBR = 12; // upgrade to 400KHz!
-    
+#endif
 }
 
 void loop() {
@@ -49,4 +58,4 @@ void loop() {
       pwm.setPWM(pwmnum, 0, (i + (4096/16)*pwmnum) % 4096 );
     }
   }
-}
+}

examples/servo/servo.pde

@@ -38,9 +38,15 @@ void setup() {
   Serial.begin(9600);
   Serial.println("16 channel Servo test!");
 
+#ifdef ESP8266
+  Wire.pins(2, 14);   // ESP8266 can use any two pins, such as SDA to #2 and SCL to #14
+#endif
+
   pwm.begin();
 
   pwm.setPWMFreq(60);  // Analog servos run at ~60 Hz updates
+
+  yield();
 }
 
 // you can use this function if you'd like to set the pulse length in seconds
@@ -65,12 +71,14 @@ void loop() {
   for (uint16_t pulselen = SERVOMIN; pulselen < SERVOMAX; pulselen++) {
     pwm.setPWM(servonum, 0, pulselen);
   }
+
   delay(500);
   for (uint16_t pulselen = SERVOMAX; pulselen > SERVOMIN; pulselen--) {
     pwm.setPWM(servonum, 0, pulselen);
   }
+
   delay(500);
 
   servonum ++;
-  if (servonum > 15) servonum = 0;
+  if (servonum > 7) servonum = 0;
 }