Singleton pigpio.pi() in own module

diff --git a/graphit_pin/__init__.py b/graphit_pin/__init__.py
index ade938acdb11c642009192c01b3c6dfb7a05a232..34d0b74e91e8cd123d432caf364d7256dcd2b6f6 100644 (file)
--- a/graphit_pin/__init__.py
+++ b/graphit_pin/__init__.py
@@ -11,12 +11,3 @@ from .composition import InvertingPin, SwitchPin, GuardedPin, TimerPin,\
                          OrAggregatePin, AndAggregatePin
 from .gpio import GPIOInputPin, GPIOOutputPin
 from .pcf8574 import PCF8574Input, PCF8574Output
-
-import pigpio
-
-_pigpio_pi
-
-def get_pigpio_pi():
-    if _pigipio_pi is None:
-        _pigpio_pi = pigpio.pi()
-    return _pigpio_pi

diff --git a/graphit_pin/gpio.py b/graphit_pin/gpio.py
index 0b2fb2e4e8aceaf6a1ab82ce42ecf6ec4997463e..e3b5520e12b4a7dd4fe822ec2d9fae2cd2d5755e 100644 (file)
--- a/graphit_pin/gpio.py
+++ b/graphit_pin/gpio.py
@@ -2,7 +2,7 @@ import asyncio
 import pigpio
 import graphit_event
 
-from . import get_pigpio_pi
+from .pigpio import get_pigpio_pi
 from .interface import PinInterface
 
 

diff --git a/graphit_pin/pcf8574.py b/graphit_pin/pcf8574.py
index 2d81876132249feddd8699ec5e4a2882f7269a40..184e3e7f7e42152f3445353168416f961d854fdd 100644 (file)
--- a/graphit_pin/pcf8574.py
+++ b/graphit_pin/pcf8574.py
@@ -1,7 +1,7 @@
 import graphit_event
 from typing import Callable
 
-from . import get_pigpio_pi
+from .pigpio import get_pigpio_pi
 from .interface import PinInterface
 
 PCF_ADDRESSES = tuple(range(32, 40)) + tuple(range(56, 64))

diff --git a/graphit_pin/pigpio.py b/graphit_pin/pigpio.py
new file mode 100644 (file)
index 0000000..caddbf0
--- /dev/null
+++ b/graphit_pin/pigpio.py
@@ -0,0 +1,8 @@
+import pigpio
+
+_pigpio_pi = None
+
+def get_pigpio_pi():
+    if _pigipio_pi is None:
+        _pigpio_pi = pigpio.pi()
+    return _pigpio_pi