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

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / microcontroller / generic_linux / sysfs_pwmout.py

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
index 4c975c37e0e7acce335bc2a724c352978013de94..e7d64a0ab066510d6dbe406dc30c0b3a8476847d 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py
@@ -55,16 +55,13 @@ class PWMOut(object):
         self._open(pin, duty_cycle, frequency, variable_frequency)
 
     def __del__(self):
-        self.close()
+        self.deinit()
 
     def __enter__(self):
         return self
 
     def __exit__(self, t, value, traceback):
-        self.close()
-
-    def deinit(self):
-        self.close()
+        self.deinit()
 
     def _open(self, pin, duty=0, freq=500, variable_frequency=False):
         self._channel = None
@@ -93,12 +90,12 @@ class PWMOut(object):
         except IOError as e:
             raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror)
 
-        self._set_enabled(False)
+        #self._set_enabled(False) # This line causes a write error when trying to enable
 
         # Look up the period, for fast duty cycle updates
         self._period = self._get_period()
 
-        self.duty_cycle = 0
+        #self.duty_cycle = 0  # This line causes a write error when trying to enable
 
         # set frequency
         self.frequency = freq
@@ -107,8 +104,8 @@ class PWMOut(object):
 
         self._set_enabled(True)
 
-    def close(self):
-        """Close the sysfs PWM."""
+    def deinit(self):
+        """Deinit the sysfs PWM."""
         if self._channel is not None:
             self.duty_cycle = 0
             try: