Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
index d0686f71cdf3ae4b1646b690940d07ec22732e26..fa7266710cbec98c61b5772757e11a29f0a5437c 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
@@ -179,6 +179,8 @@ class PWMOut(object):
         # Update our cached period
         self._period = float(period)
 
+    period = property(_get_period, _set_period)
+
     """Get or set the PWM's output period in seconds.
 
     Raises:

diff --git a/src/adafruit_blinka/microcontroller/sama5/pin.py b/src/adafruit_blinka/microcontroller/sama5/pin.py
index 5b496692c140edbd07e4185347b5daf4e7ca1c5d..28379acea0bbce0f211fc3b3ebce50e8578de9a0 100644 (file)
--- a/src/adafruit_blinka/microcontroller/sama5/pin.py
+++ b/src/adafruit_blinka/microcontroller/sama5/pin.py
@@ -27,7 +27,7 @@ PD13 = Pin(109)
 PD31 = Pin(127)
 PB0 = Pin(32)
 PWM1 = PB0
-PB7 = Pin(38)
+PB7 = Pin(39)
 PWM3 = PB7
 PB1 = Pin(33)
 PWML1 = PB1