Merge branch 'gpiozero'

mcarr823 · Dec 20, 2023 · 789cad4 · 789cad4
2 parents 23d73e1 + 0dac6cc
commit 789cad4
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 9 deletions.
diff --git a/papertty/drivers/driver_it8951.py b/papertty/drivers/driver_it8951.py
@@ -4,10 +4,10 @@
 import time
 
 from papertty.drivers.drivers_base import DisplayDriver
+from papertty.drivers.drivers_base import GPIO
 
 try:
     import spidev
-    import RPi.GPIO as GPIO
 except ImportError:
     pass
 except RuntimeError as e:

diff --git a/papertty/drivers/drivers_4in2.py b/papertty/drivers/drivers_4in2.py
@@ -17,16 +17,10 @@
 
 from PIL import Image
 
+from papertty.drivers.drivers_base import GPIO
 from papertty.drivers.drivers_consts import EPD4in2const
 from papertty.drivers.drivers_partial import WavesharePartial
 
-try:
-    import RPi.GPIO as GPIO
-except ImportError:
-    pass
-except RuntimeError as e:
-    print(str(e))
-
 # The driver works as follows:
 #
 # This driver is for the following display:

diff --git a/papertty/drivers/drivers_base.py b/papertty/drivers/drivers_base.py
@@ -23,12 +23,64 @@
 # using them
 try:
     import spidev
-    import RPi.GPIO as GPIO
+    import RPi.GPIO as rpiGPIO
 except ImportError:
     pass
 except RuntimeError as e:
     print(str(e))
 
+# Optional dependency
+try:
+    from gpiozero import OutputDevice, InputDevice
+    print("gpiozero found - using that instead of RPi.GPIO")
+except ImportError:
+    print("gpiozero not found - defaulting to RPi.GPIO")
+    pass
+
+class GPIO:
+
+    OUT = rpiGPIO.OUT
+    IN = rpiGPIO.IN
+    BCM = rpiGPIO.BCM
+    LOW = rpiGPIO.LOW
+    HIGH = rpiGPIO.HIGH
+
+    pins = {}
+
+    @staticmethod
+    def setmode(value):
+        rpiGPIO.setmode(value)
+
+    @staticmethod
+    def setwarnings(value):
+        rpiGPIO.setwarnings(value)
+
+    @staticmethod
+    def setup(pin, ioType):
+        try:
+            if ioType == GPIO.OUT:
+                GPIO.pins[str(pin)] = OutputDevice(pin)
+            else:
+                GPIO.pins[str(pin)] = InputDevice(pin)
+        except Exception as e:
+            GPIO.pins[str(pin)] = False
+            rpiGPIO.setup(pin, ioType)
+
+    @staticmethod
+    def input(pinNo):
+        pin = GPIO.pins[str(pinNo)]
+        if pin == False:
+            return rpiGPIO.input(pinNo)
+        else:
+            return pin.value
+
+    @staticmethod
+    def output(pinNo, value):
+        pin = GPIO.pins[str(pinNo)]
+        if pin == False:
+            rpiGPIO.output(pinNo, value)
+        else:
+            pin.on() if value == 1 else pin.off()
 
 class DisplayDriver(ABC):
     """Abstract base class for a display driver - be it Waveshare e-Paper, PaPiRus, OLED..."""