From: Melissa LeBlanc-Williams <melissa@Melissas-MacBook-Pro.local>
Date: Thu, 6 Jun 2019 20:50:46 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka
X-Git-Tag: 2.1.0^2~2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/64b83c2f5a44aef8d8fef3d32af8259e09a613bf?hp=0de62bd1a61c0d22622c372bd7a44b4bdc779071

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 d0686f7..fa72667 100644
--- 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 5b49669..28379ac 100644
--- 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