From 8160f5359f70cc5b7454b2cefe4c64176aca953b Mon Sep 17 00:00:00 2001 From: Peter Hinch Date: Mon, 26 Sep 2022 10:31:04 +0100 Subject: [PATCH] Pico setup examples: specify SPI pins. --- gui/primitives/delay_ms.py | 6 ++++-- hardware_setup.py | 4 ++-- setup_examples/ili9341_pico.py | 2 +- setup_examples/ili9341_pico_encoder.py | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gui/primitives/delay_ms.py b/gui/primitives/delay_ms.py index d5306ba..bfed02d 100644 --- a/gui/primitives/delay_ms.py +++ b/gui/primitives/delay_ms.py @@ -1,8 +1,8 @@ # delay_ms.py Now uses ThreadSafeFlag and has extra .wait() API # Usage: -# from primitives.delay_ms import Delay_ms +# from primitives import Delay_ms -# Copyright (c) 2018-2021 Peter Hinch +# Copyright (c) 2018-2022 Peter Hinch # Released under the MIT License (MIT) - see LICENSE file import uasyncio as asyncio @@ -27,6 +27,7 @@ class Delay_ms: self._tout = asyncio.Event() # Timeout event self.wait = self._tout.wait # Allow: await wait_ms.wait() self.clear = self._tout.clear + self.set = self._tout.set self._ttask = self._fake # Timer task self._mtask = asyncio.create_task(self._run()) #Main task @@ -59,6 +60,7 @@ class Delay_ms: self._ttask.cancel() self._ttask = self._fake self._busy = False + self._tout.clear() def __call__(self): # Current running status return self._busy diff --git a/hardware_setup.py b/hardware_setup.py index 5efa06e..7bc0f1b 100644 --- a/hardware_setup.py +++ b/hardware_setup.py @@ -36,10 +36,10 @@ import gc from drivers.ili93xx.ili9341 import ILI9341 as SSD freq(250_000_000) # RP2 overclock # Create and export an SSD instance -pdc = Pin(8, Pin.OUT, value=0) # Arbitrary pins prst = Pin(9, Pin.OUT, value=1) pcs = Pin(10, Pin.OUT, value=1) -spi = SPI(0, baudrate=30_000_000) +pdc = Pin(8, Pin.OUT, value=0) # Arbitrary pins +spi = SPI(0, sck=Pin(6), mosi=Pin(7), miso=Pin(4), baudrate=30_000_000) gc.collect() # Precaution before instantiating framebuf ssd = SSD(spi, pcs, pdc, prst, usd=True) gc.collect() diff --git a/setup_examples/ili9341_pico.py b/setup_examples/ili9341_pico.py index df02c1b..6729ac6 100644 --- a/setup_examples/ili9341_pico.py +++ b/setup_examples/ili9341_pico.py @@ -39,7 +39,7 @@ freq(250_000_000) # RP2 overclock pdc = Pin(8, Pin.OUT, value=0) # Arbitrary pins prst = Pin(9, Pin.OUT, value=1) pcs = Pin(10, Pin.OUT, value=1) -spi = SPI(0, baudrate=30_000_000) +spi = SPI(0, sck=Pin(6), mosi=Pin(7), miso=Pin(4), baudrate=30_000_000) gc.collect() # Precaution before instantiating framebuf ssd = SSD(spi, pcs, pdc, prst, usd=True) diff --git a/setup_examples/ili9341_pico_encoder.py b/setup_examples/ili9341_pico_encoder.py index 222ec1d..6d16332 100644 --- a/setup_examples/ili9341_pico_encoder.py +++ b/setup_examples/ili9341_pico_encoder.py @@ -39,7 +39,7 @@ freq(250_000_000) # RP2 overclock pdc = Pin(8, Pin.OUT, value=0) # Arbitrary pins prst = Pin(9, Pin.OUT, value=1) pcs = Pin(10, Pin.OUT, value=1) -spi = SPI(0, baudrate=30_000_000) +spi = SPI(0, sck=Pin(6), mosi=Pin(7), miso=Pin(4), baudrate=30_000_000) gc.collect() # Precaution before instantiating framebuf ssd = SSD(spi, pcs, pdc, prst, usd=True)