From 85458eb769ade90bf81546aa05238064fe281cd9 Mon Sep 17 00:00:00 2001 From: Pim van den Berg Date: Sun, 18 Oct 2020 13:44:14 +0200 Subject: [PATCH] feat(itho-wpu): option to slave via event_callback() Argument "--type [callback,wait]" is added to be able to switch between "wait_for_event()" (previous functionality) and "event_callback()" in the I2C slave functionality. In a thread set_callback() executes event_callback() and just (very dirty) sleeps 2 seconds to get a response or else cancels the event and stops pigpio. To get the most reliable output pigpiod is started with -s 2 (sample rate 2 microseconds). Still most of the time too few bytes are received on the "getdatalog" action (153 bytes expected). --- itho-wpu.py | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/itho-wpu.py b/itho-wpu.py index 19b8674..14134cc 100755 --- a/itho-wpu.py +++ b/itho-wpu.py @@ -7,6 +7,7 @@ import pigpio import queue import sys import threading +import time consolelogformatter = logging.Formatter("%(asctime)-15s %(levelname)s: %(message)s") logger = logging.getLogger('stdout') @@ -27,6 +28,9 @@ def parse_args(): ] parser.add_argument('--action', nargs='?', required=True, choices=actions, help="Execute an action") + parser.add_argument('--type', nargs='?', required=True, + choices=["callback", "wait"], + help="Pigpio slave type") parser.add_argument('--loglevel', nargs='?', choices=["debug", "info", "warning", "error", "critical"], help="Loglevel") @@ -43,7 +47,27 @@ class I2CSlave(): logger.error("not pi.connected") return - def run(self, q): + def set_callback(self, q): + logger.debug("set_callback()") + e = self.pi.event_callback(pigpio.EVENT_BSC, self.callback) + self.pi.bsc_i2c(self.address) + time.sleep(2) + e.cancel() + self.pi.bsc_i2c(0) # Disable BSC peripheral + self.pi.stop() + + def callback(self, id, tick): + logger.debug(f"callback({id}, {tick})") + s, b, d = self.pi.bsc_i2c(self.address) + result = None + if b: + logger.debug(f"Received {b} bytes! Status {s}") + result = [hex(c) for c in d] + logger.info(f"Response: {result}") + else: + logger.error(f"Received number of bytes was {b}") + + def wait(self, q): try: self.pi.bsc_i2c(self.address) if self.pi.wait_for_event(pigpio.EVENT_BSC, 5): @@ -94,7 +118,10 @@ if __name__ == "__main__": q = queue.Queue() slave = I2CSlave(address=0x40) - slave_thread = threading.Thread(target=slave.run, args=[q]) + if args.type == 'callback': + slave_thread = threading.Thread(target=slave.set_callback, args=[q]) + elif args.type == 'wait': + slave_thread = threading.Thread(target=slave.wait, args=[q]) slave_thread.start() master = I2CMaster(address=0x41, bus=1) @@ -102,5 +129,6 @@ if __name__ == "__main__": master.execute_action(args.action) master.close() - result = q.get() - logger.info(f"Response: {result}") + if args.type == 'wait': + result = q.get() + logger.info(f"Response: {result}")