Add timout loop after exporting the PWM pin.

This gives udev time to respond to the device event. Without this,
the subsequent attempts to modify pin properties will fail when
depending on udev rules to apply new user permissions.

This code is essentially copied from python-periphery, as was most
of this file (both MIT licenced). Although it appears sergeev added
this loop recently, compared to when this code was originally cloned.

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
index 4fc8e23b0fab29bdafb563476b3c9bb58e2b7a28..e95a1e627c74c4d1ea4e7f10a4343fe5b450821e 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
@@ -5,6 +5,8 @@ License: MIT
 """
 
 import os
 """
 
 import os

+from time import sleep
+from errno import EACCES

 
 try:
     from microcontroller.pin import pwmOuts
 
 try:
     from microcontroller.pin import pwmOuts


@@ -24,6 +26,10 @@ class PWMError(IOError):
 
 class PWMOut:
     """Pulse Width Modulation Output Class"""
 
 class PWMOut:
     """Pulse Width Modulation Output Class"""

+    # Number of retries to check for successful PWM export on open
+    PWM_STAT_RETRIES = 10
+    # Delay between check for scucessful PWM export on open (100ms)
+    PWM_STAT_DELAY = 0.1

 
     # Sysfs paths
     _sysfs_path = "/sys/class/pwm/"
 
     # Sysfs paths
     _sysfs_path = "/sys/class/pwm/"


@@ -109,6 +115,22 @@ class PWMOut:
         except IOError as e:
             raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror) from IOError
 
         except IOError as e:
             raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror) from IOError
 

+        # Loop until 'period' is writable, because application of udev rules
+        # after the above pin export is asynchronous.
+        # Without this loop, the following properties may not be writable yet.
+        for i in range(PWMOut.PWM_STAT_RETRIES):
+            try:
+                with open(
+                    os.path.join(channel_path, self._pin_path.format(self._pwmpin), "period"), 'w'
+                ):
+                    print('#### okay ####')
+                    break
+            except IOError as e:
+                if e.errno != EACCES or (e.errno == EACCES and i == PWMOut.PWM_STAT_RETRIES - 1):
+                    print('#### catch ####')
+                    raise PWMError(e.errno, "Opening PWM period: " + e.strerror)
+            sleep(PWMOut.PWM_STAT_DELAY)
+

         # self._set_enabled(False) # This line causes a write error when trying to enable
 
         # Look up the period, for fast duty cycle updates
         # self._set_enabled(False) # This line causes a write error when trying to enable
 
         # Look up the period, for fast duty cycle updates