Merge pull request #457 from timonsku/patch-1

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / pico_u2if / pico_u2if.py

diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/pico_u2if.py b/src/adafruit_blinka/microcontroller/pico_u2if/pico_u2if.py
index f5f3945ba3403ffca9fe23a13702a7f700fd957b..687bfc033585b4212b5bd44945fee65c4140461f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/pico_u2if/pico_u2if.py
+++ b/src/adafruit_blinka/microcontroller/pico_u2if/pico_u2if.py
@@ -1,9 +1,13 @@
 """Chip Definition for Pico with u2if firmware"""
 # https://github.com/execuc/u2if
 
+import os
 import time
 import hid
 
+# Use to set delay between reset and device reopen. if negative, don't reset at all
+PICO_U2IF_RESET_DELAY = float(os.environ.get("PICO_U2IF_RESET_DELAY", 1))
+
 # pylint: disable=import-outside-toplevel,too-many-branches,too-many-statements
 # pylint: disable=too-many-arguments,too-many-function-args, too-many-public-methods
 
@@ -67,12 +71,15 @@ class Pico_u2if:
     PWM_GET_DUTY_NS = 0x37
 
     def __init__(self):
+        self._hid = hid.device()
+        self._hid.open(Pico_u2if.VID, Pico_u2if.PID)
+        if PICO_U2IF_RESET_DELAY >= 0:
+            self._reset()
         self._i2c_index = None
         self._spi_index = None
         self._serial = None
         self._neopixel_initialized = False
         self._uart_rx_buffer = None
-        self._reset()
 
     def _hid_xfer(self, report, response=True):
         """Perform HID Transfer"""
@@ -86,26 +93,17 @@ class Pico_u2if:
         return None
 
     def _reset(self):
-        # get a HID device
-        self._hid = hid.device()
-        # open and reset
-        self._hid.open(Pico_u2if.VID, Pico_u2if.PID)
-        resp = self._hid_xfer(bytes([self.SYS_RESET]), True)
-        if resp[1] != self.RESP_OK:
-            raise RuntimeError("Reset error.")
-        # reopen
-        max_retry = 10
-        retries = 0
-        while True:
+        self._hid_xfer(bytes([self.SYS_RESET]), False)
+        time.sleep(PICO_U2IF_RESET_DELAY)
+        start = time.monotonic()
+        while time.monotonic() - start < 5:
             try:
                 self._hid.open(Pico_u2if.VID, Pico_u2if.PID)
-                return True
             except OSError:
-                if retries >= max_retry:
-                    break
                 time.sleep(0.1)
-                retries += 1
-        return False
+                continue
+            return
+        raise OSError("Pico open error.")
 
     # ----------------------------------------------------------------
     # GPIO
@@ -395,6 +393,8 @@ class Pico_u2if:
                 raise RuntimeError("Neopixel init error")
             self._neopixel_initialized = True
 
+        self._serial.reset_output_buffer()
+
         # write
         # command is done over HID
         remain_bytes = len(buf)
@@ -409,14 +409,24 @@ class Pico_u2if:
                     "Neopixel write error : too many pixel for the firmware."
                 )
             elif resp[2] == 0x02:
+                print(resp[0:10])
                 raise RuntimeError(
                     "Neopixel write error : transfer already in progress."
                 )
             else:
-                raise RuntimeError("Neopixel write error")
+                raise RuntimeError("Neopixel write error.")
         # buffer is sent over serial
         self._serial.write(buf)
+        # hack (see u2if)
+        if len(buf) % 64 == 0:
+            self._serial.write([0])
         self._serial.flush()
+        # polling loop to wait for write complete?
+        resp = self._hid.read(64)
+        while resp[0] != self.WS2812B_WRITE:
+            resp = self._hid.read(64)
+        if resp[1] != self.RESP_OK:
+            raise RuntimeError("Neopixel write (flush) error.")
 
     # ----------------------------------------------------------------
     # PWM