]> Repositories - Adafruit_Blinka-hackapet.git/commitdiff
working libgpiod_pulsein on pi: add sysv_ipc dep; add pulseio to py_modules
authorBrennen Bearnes <bbearnes@gmail.com>
Tue, 15 Jan 2019 21:44:54 +0000 (14:44 -0700)
committerBrennen Bearnes <bbearnes@gmail.com>
Tue, 15 Jan 2019 21:44:54 +0000 (14:44 -0700)
The included libgpiod_pulsein binary wasn't being used on the Pi,
specifically with Adafruit_CircuitPython_DHT.  It turns out that
`pulseio` was missing from the list of modules to install, we weren't
installing `sysv_ipc` as a dependency, and `libgpiod_pulsein` itself
wasn't marked as executable.

This is now tested and working on a Pi 3B+ with a DHT22.

requirements.txt
setup.py
src/adafruit_blinka/microcontroller/bcm283x/pulseio/libgpiod_pulsein [changed mode: 0644->0755]

index 68d49f0fa748a48d423d22d06dd8c55e3789115b..daaff66ff22ca347f955b8c6ba0195d62ea8be12 100755 (executable)
@@ -3,3 +3,4 @@ Adafruit-PureIO
 RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'
 rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l'
 spidev; sys_platform == 'linux'
+sysv_ipc
index 3c151a7135f78a04523d40d4080475f9e8b1a89e..bc5c0918334103aee05060e6426fe11bc5fafeaa 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -30,14 +30,16 @@ setup(
     url='https://github.com/adafruit/Adafruit_Blinka',
     package_dir={'': 'src'},
     packages=find_packages("src"),
-    # If your package is a single module, use this instead of 'packages':
-    py_modules=['bitbangio', 'board', 'busio', 'digitalio', 'micropython', 'neopixel_write'],
+    # This seems to override find_packages above - I suspect but don't know for sure that
+    # we're doing this for a reason -- bpb 2019-01-15:
+    py_modules=['bitbangio', 'board', 'busio', 'digitalio', 'micropython', 'pulseio', 'neopixel_write'],
     install_requires=[
         "Adafruit-PlatformDetect",
         "Adafruit-PureIO",
         "RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'",
         "rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l'",
-        "spidev; sys_platform=='linux'"
+        "spidev; sys_platform=='linux'",
+        "sysv_ipc"
     ],
     license='MIT',
     classifiers=[