Skip to content

Add GPIO.mode BOARD for usage with BOARD pin numbering #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hasenradball wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add GPIO.mode BOARD for usage with BOARD pin numbering #71

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e80d9a2
added mode BOARD for usage with BOARD pin numbering
hasenradball Apr 14, 2023
3b7a236
create function to set the GPIO mode
hasenradball Apr 14, 2023
d77cdcf
added self to call memberfunction
hasenradball Apr 14, 2023
c5f9cd2
optimise method setMode()
hasenradball Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions rpi_rf/rpi_rf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ class RFDevice:
"""Representation of a GPIO RF device."""

# pylint: disable=too-many-instance-attributes,too-many-arguments
def __init__(self, gpio,
tx_proto=1, tx_pulselength=None, tx_repeat=10, tx_length=24, rx_tolerance=80):
def __init__(self, pin,
mode = 'BCM', tx_proto = 1, tx_pulselength = None, tx_repeat = 10, tx_length = 24, rx_tolerance = 80):
"""Initialize the RF device."""
self.gpio = gpio
self.pin = pin
self.tx_enabled = False
self.tx_proto = tx_proto
if tx_pulselength:
Expand All @@ -56,8 +56,19 @@ def __init__(self, gpio,
self.rx_bitlength = None
self.rx_pulselength = None

GPIO.setmode(GPIO.BCM)
_LOGGER.debug("Using GPIO " + str(gpio))
# set GPIO mode
self.setMode(mode)

def setMode(self, mode):
if (mode.upper() == 'BCM'):
GPIO.setmode(GPIO.BCM)
_LOGGER.debug("Using GPIO(BCM) pin " + str(self.pin))
elif (mode.upper() == 'BOARD'):
GPIO.setmode(GPIO.BOARD)
_LOGGER.debug("Using BOARD pin " + str(self.pin))
else:
_LOGGER.error("Error: using wrong GPIO.mode, only BCM or BOARD allowed!")


def cleanup(self):
"""Disable TX and RX and clean up GPIO."""
Expand All @@ -75,15 +86,15 @@ def enable_tx(self):
return False
if not self.tx_enabled:
self.tx_enabled = True
GPIO.setup(self.gpio, GPIO.OUT)
GPIO.setup(self.pin, GPIO.OUT)
_LOGGER.debug("TX enabled")
return True

def disable_tx(self):
"""Disable TX, reset GPIO."""
if self.tx_enabled:
# set up GPIO pin as input for safety
GPIO.setup(self.gpio, GPIO.IN)
GPIO.setup(self.pin, GPIO.IN)
self.tx_enabled = False
_LOGGER.debug("TX disabled")
return True
Expand Down Expand Up @@ -172,9 +183,9 @@ def tx_waveform(self, highpulses, lowpulses):
if not self.tx_enabled:
_LOGGER.error("TX is not enabled, not sending data")
return False
GPIO.output(self.gpio, GPIO.HIGH)
GPIO.output(self.pin, GPIO.HIGH)
self._sleep((highpulses * self.tx_pulselength) / 1000000)
GPIO.output(self.gpio, GPIO.LOW)
GPIO.output(self.pin, GPIO.LOW)
self._sleep((lowpulses * self.tx_pulselength) / 1000000)
return True

Expand All @@ -185,22 +196,22 @@ def enable_rx(self):
return False
if not self.rx_enabled:
self.rx_enabled = True
GPIO.setup(self.gpio, GPIO.IN)
GPIO.add_event_detect(self.gpio, GPIO.BOTH)
GPIO.add_event_callback(self.gpio, self.rx_callback)
GPIO.setup(self.pin, GPIO.IN)
GPIO.add_event_detect(self.pin, GPIO.BOTH)
GPIO.add_event_callback(self.pin, self.rx_callback)
_LOGGER.debug("RX enabled")
return True

def disable_rx(self):
"""Disable RX, remove GPIO event detection."""
if self.rx_enabled:
GPIO.remove_event_detect(self.gpio)
GPIO.remove_event_detect(self.pin)
self.rx_enabled = False
_LOGGER.debug("RX disabled")
return True

# pylint: disable=unused-argument
def rx_callback(self, gpio):
def rx_callback(self, pin):
"""RX callback for GPIO event detection. Handle basic signal detection."""
timestamp = int(time.perf_counter() * 1000000)
duration = timestamp - self._rx_last_timestamp
Expand Down