Merge branch 'master' into master

Author: TheKitty

.gitignore

@@ -1,3 +1,5 @@
 *~
 Hue_Controller/secrets.h
 .idea
+*.DS_Store
+CircuitPython_Logger/secrets\.py

.travis.yml

@@ -5,10 +5,31 @@ python:
     - "3.6"
 
 cache:
-    pip: true
+
+cache:
+  pip: true
+  directories:
+    - ~/arduino_ide
+    - ~/.arduino15/packages/
+    - ~/Arduino
+
+env:
+  global:
+    - ARDUINO_IDE_VERSION="1.8.7"
+    - PRETTYNAME="Adafruit Learning System Guides"
+    - PLATFORM_CHECK_ONLY_ON_FILE=true
+
+before_install:
+  - source <(curl -SLs https://raw.githubusercontent.com/adafruit/travis-ci-arduino/master/install.sh)
 
 install:
+  - ./arduino_libinstall
   - pip install --force-reinstall pylint==1.9.2
 
 script:
   - ./pylint_check
+  - build_main_platforms
+  - build_aux_platforms
+  - build_cplay_platforms
+  - build_m4_platforms
+  - build_io_platforms

3D_Printed_Bionic_Eye/.trinket.test

@@ -0,0 +1,73 @@
+/*******************************************************************
+  Bionic Eye sketch for Adafruit Trinket.  
+
+  by Bill Earl
+  for Adafruit Industries
+ 
+  Required library is the Adafruit_SoftServo library
+  available at https://github.com/adafruit/Adafruit_SoftServo
+  The standard Arduino IDE servo library will not work with 8 bit
+  AVR microcontrollers like Trinket and Gemma due to differences
+  in available timer hardware and programming. We simply refresh
+  by piggy-backing on the timer0 millis() counter
+ 
+  Trinket:        Bat+    Gnd       Pin #0  Pin #1
+  Connection:     Servo+  Servo-    Tilt    Rotate
+                  (Red)   (Brown)   Servo   Servo
+                                    (Orange)(Orange)
+ 
+ *******************************************************************/
+ 
+#include <Adafruit_SoftServo.h>  // SoftwareServo (works on non PWM pins)
+ 
+#define TILTSERVOPIN 0    // Servo control line (orange) on Trinket Pin #0
+#define ROTATESERVOPIN 1  // Servo control line (orange) on Trinket Pin #1
+ 
+Adafruit_SoftServo TiltServo, RotateServo;  //create TWO servo objects
+   
+void setup() 
+{
+  // Set up the interrupt that will refresh the servo for us automagically
+  OCR0A = 0xAF;            // any number is OK
+  TIMSK |= _BV(OCIE0A);    // Turn on the compare interrupt (below!)
+  
+  TiltServo.attach(TILTSERVOPIN);   // Attach the servo to pin 0 on Trinket
+  RotateServo.attach(ROTATESERVOPIN);   // Attach the servo to pin 1 on Trinket
+  delay(15);                    // Wait 15ms for the servo to reach the position
+}
+ 
+void loop()  
+{
+  delay(100);  
+  TiltServo.detach();   // release the servo
+  RotateServo.detach();   // release the servo
+ 
+  if(random(100) > 80)  // on average, move once every 500ms
+  {
+    TiltServo.attach(TILTSERVOPIN);   // Attach the servo to pin 0 on Trinket
+    TiltServo.write(random(120, 180));    // Tell servo to go to position
+  }
+  if(random(100) > 90)  // on average, move once every 500ms
+  {
+    RotateServo.attach(ROTATESERVOPIN);   // Attach the servo to pin 1 on Trinket
+    RotateServo.write(random(0, 180));    // Tell servo to go to position
+  }
+}
+ 
+// We'll take advantage of the built in millis() timer that goes off
+// to keep track of time, and refresh the servo every 20 milliseconds
+// The SIGNAL(TIMER0_COMPA_vect) function is the interrupt that will be
+// Called by the microcontroller every 2 milliseconds
+volatile uint8_t counter = 0;
+SIGNAL(TIMER0_COMPA_vect) 
+{
+  // this gets called every 2 milliseconds
+  counter += 2;
+  // every 20 milliseconds, refresh the servos!
+  if (counter >= 20) 
+  {
+    counter = 0;
+    TiltServo.refresh();
+    RotateServo.refresh();
+  }
+}

3D_Printed_Bionic_Eye/3D_Printed_Bionic_Eye.ino

@@ -0,0 +1,50 @@
+# Bionic Eye sketch for Adafruit Trinket.
+#
+# written by Bill Earl for Arduino
+# ported to CircuitPython by Mikey Sklar
+# for Adafruit Industries
+#
+# Required library is the Adafruit_SoftServo library
+# available at https://github.com/adafruit/Adafruit_SoftServo
+# The standard Arduino IDE servo library will not work with 8 bit
+# AVR microcontrollers like Trinket and Gemma due to differences
+# in available timer hardware and programming. We simply refresh
+# by piggy-backing on the timer0 millis() counter
+#
+# Trinket:        Bat+    Gnd       Pin #0  Pin #2
+# Connection:     Servo+  Servo-    Tilt    Rotate
+#                 (Red)   (Black)   Servo   Servo
+#                                   (Orange)(Orange)
+
+import time
+import random
+import board
+import pulseio
+from adafruit_motor import servo
+
+# we are intentionally avoiding Trinket Pin #1 (board.A0)
+# as it does not have PWM capability
+tilt_servo_pin = board.A2   # servo control line (orange) Trinket Pin #0
+rotate_servo_pin = board.A1 # servo control line (orange) Trinket Pin #2
+
+# servo object setup for the M0 boards:
+tilt_pwm = pulseio.PWMOut(tilt_servo_pin, duty_cycle=2 ** 15, frequency=50)
+rotate_pwm = pulseio.PWMOut(rotate_servo_pin, duty_cycle=2 ** 15, frequency=50)
+tilt_servo = servo.Servo(tilt_pwm)
+rotate_servo = servo.Servo(rotate_pwm)
+
+# servo timing and angle range
+tilt_min = 120      # lower limit to tilt rotation range
+max_rotate = 180    # rotation range limited to half circle
+
+while True:
+
+    # servo tilt - on average move every 500ms
+    if random.randint(0,100) > 80:
+        tilt_servo.angle = random.randint(tilt_min, max_rotate)
+        time.sleep(.25)
+
+    # servo rotate - on average move every 500ms
+    if random.randint(0,100) > 90:
+        rotate_servo.angle = random.randint(0, max_rotate)
+        time.sleep(.25)

3D_Printed_Bionic_Eye/3D_Printed_Bionic_Eye.py

@@ -0,0 +1,4 @@
+# 3D_Printed_Bionic_Eye
+
+Code to accompany this Adafruit tutorial:
+https://learn.adafruit.com/3d-printed-bionic-eye

3D_Printed_Bionic_Eye/README.md

@@ -0,0 +1,128 @@
+// Fiery demon horns (rawr!) for Adafruit Trinket/Gemma.
+// Adafruit invests time and resources providing this open source code, 
+// please support Adafruit and open-source hardware by purchasing 
+// products from Adafruit!
+#include <Adafruit_NeoPixel.h>
+#include <avr/power.h>
+
+#define N_HORNS 1
+#define N_LEDS 30 // Per horn
+#define PIN     0
+Adafruit_NeoPixel pixels = Adafruit_NeoPixel(N_HORNS * N_LEDS, PIN);
+
+//      /\  ->   Fire-like effect is the sum of multiple triangle
+// ____/  \____  waves in motion, with a 'warm' color map applied.
+#define N_WAVES 6     // Number of simultaneous waves (per horn)
+// Coordinate space for waves is 16x the pixel spacing,
+// allowing fixed-point math to be used instead of floats.
+struct {
+  int16_t  lower;     // Lower bound of wave
+  int16_t  upper;     // Upper bound of wave
+  int16_t  mid;       // Midpoint (peak) ((lower+upper)/2)
+  uint8_t  vlower;    // Velocity of lower bound
+  uint8_t  vupper;    // Velocity of upper bound
+  uint16_t intensity; // Brightness at peak
+} wave[N_HORNS][N_WAVES];
+long fade; // Decreases brightness as wave moves
+
+// Gamma correction improves appearance of midrange colors
+uint8_t gamma[] PROGMEM = {
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  1,  1,
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,
+    2,  3,  3,  3,  3,  3,  3,  3,  4,  4,  4,  4,  4,  5,  5,  5,
+    5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  9,  9,  9, 10,
+   10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16,
+   17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25,
+   25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36,
+   37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50,
+   51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68,
+   69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89,
+   90, 92, 93, 95, 96, 98, 99,101,102,104,105,107,109,110,112,114,
+  115,117,119,120,122,124,126,127,129,131,133,135,137,138,140,142,
+  144,146,148,150,152,154,156,158,160,162,164,167,169,171,173,175,
+  177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213,
+  215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 };
+
+static void random_wave(uint8_t h,uint8_t w) {          // Randomize one wave struct
+  wave[h][w].upper     = -1;                            // Always start just below head of strip
+  wave[h][w].lower     = -16 * (3 + random(4));         // Lower end starts ~3-7 pixels back
+  wave[h][w].mid       = (wave[h][w].lower + wave[h][w].upper) / 2;
+  wave[h][w].vlower    = 3 + random(4);                 // Lower end moves at ~1/8 to 1/4 pixel/frame
+  wave[h][w].vupper    = wave[h][w].vlower + random(4); // Upper end moves a bit faster, spreading wave
+  wave[h][w].intensity = 300 + random(600);
+}
+
+void setup() {
+  uint8_t h, w;
+
+  randomSeed(analogRead(1));
+  pixels.begin();
+  for(h=0; h<N_HORNS; h++) {
+    for(w=0; w<N_WAVES; w++) random_wave(h, w);
+  }
+  fade = 234 + N_LEDS / 2;
+  if(fade > 255) fade = 255;
+
+  // A ~100 Hz timer interrupt on Timer/Counter1 makes everything run
+  // at regular intervals, regardless of current amount of motion.
+#if F_CPU == 16000000L
+  clock_prescale_set(clock_div_1);
+  TCCR1  = _BV(PWM1A) | _BV(CS13) | _BV(CS11) | _BV(CS10); // 1:1024 prescale
+  OCR1C  = F_CPU / 1024 / 100 - 1;
+#else
+  TCCR1  = _BV(PWM1A) | _BV(CS13) | _BV(CS11); // 1:512 prescale
+  OCR1C  = F_CPU / 512 / 100 - 1;
+#endif
+  GTCCR  = 0;          // No PWM out
+  TIMSK |= _BV(TOIE1); // Enable overflow interrupt
+}
+
+void loop() { } // Not used -- everything's in interrupt below
+
+ISR(TIMER1_OVF_vect) {
+  uint8_t  h, w, i, r, g, b;
+  int16_t  x;
+  uint16_t sum;
+
+  for(h=0; h<N_HORNS; h++) {              // For each horn...
+    for(x=7, i=0; i<N_LEDS; i++, x+=16) { // For each LED along horn...
+      for(sum=w=0; w<N_WAVES; w++) {      // For each wave of horn...
+        if((x < wave[h][w].lower) || (x > wave[h][w].upper)) continue; // Out of range
+        if(x <= wave[h][w].mid) { // Lower half of wave (ramping up to peak brightness)
+          sum += wave[h][w].intensity * (x - wave[h][w].lower) / (wave[h][w].mid - wave[h][w].lower);
+        } else {               // Upper half of wave (ramping down from peak)
+          sum += wave[h][w].intensity * (wave[h][w].upper - x) / (wave[h][w].upper - wave[h][w].mid);
+        }
+      }
+      // Now the magnitude (sum) is remapped to color for the LEDs.
+      // A blackbody palette is used - fades white-yellow-red-black.
+      if(sum < 255) {        // 0-254 = black to red-1
+        r = pgm_read_byte(&gamma[sum]);
+        g = b = 0;
+      } else if(sum < 510) { // 255-509 = red to yellow-1
+        r = 255;
+        g = pgm_read_byte(&gamma[sum - 255]);
+        b = 0;
+      } else if(sum < 765) { // 510-764 = yellow to white-1
+        r = g = 255;
+        b = pgm_read_byte(&gamma[sum - 510]);
+      } else {               // 765+ = white
+        r = g = b = 255;
+      }
+      pixels.setPixelColor(h * N_LEDS + i, r, g, b);
+    }
+
+    for(w=0; w<N_WAVES; w++) { // Update wave positions for each horn
+      wave[h][w].lower += wave[h][w].vlower;  // Advance lower position
+      if(wave[h][w].lower >= (N_LEDS * 16)) { // Off end of strip?
+        random_wave(h, w);                    // Yes, 'reboot' wave
+      } else {                                // No, adjust other values...
+        wave[h][w].upper    +=  wave[h][w].vupper;
+        wave[h][w].mid       = (wave[h][w].lower + wave[h][w].upper) / 2;
+        wave[h][w].intensity = (wave[h][w].intensity * fade) / 256; // Dimmer
+      }
+    }
+  }
+  pixels.show();
+}