From 241c534514730af6f987c6bd96fa8491f03fe004 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Sat, 15 May 2021 12:21:30 +0200
Subject: [PATCH] flash: Patch City Hub on Windows

Workaround for https://github.com/pybricks/support/issues/256
---
 pybricksdev/flash.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pybricksdev/flash.py b/pybricksdev/flash.py
index 327fe83..57283a0 100644
--- a/pybricksdev/flash.py
+++ b/pybricksdev/flash.py
@@ -234,13 +234,6 @@ class BootloaderConnection(BLERequestsConnection):
         0x11, 'Erase', ['result'], '<B', write_with_response=False
     )
 
-    # City hub bootloader always sends write response for most commands even
-    # when write without response is used which confuses Bluetooth stacks, so
-    # we always have to do write with response.
-    ERASE_FLASH_CITY_HUB = BootloaderRequest(
-        0x11, 'Erase', ['result'], '<B'
-    )
-
     # Only the final flash message receives a reply.
     PROGRAM_FLASH = BootloaderRequest(
         0x22, 'Flash', [], '', request_reply=False, write_with_response=False
@@ -319,16 +312,19 @@ async def flash(self, firmware, metadata):
         # Erase existing firmware
         logger.debug("Erasing flash.")
         try:
-            response = await self.bootloader_request(
-                self.ERASE_FLASH_CITY_HUB
-                if info.type_id == HubTypeId.CITY_HUB
-                else self.ERASE_FLASH,
-                timeout=5
-            )
+            response = await self.bootloader_request(self.ERASE_FLASH, timeout=5)
             logger.debug(response)
         except asyncio.TimeoutError:
             logger.info("did not receive erase reply, continuing anyway")
 
+        # On City Hub with some Windows versions, the reply to the flash command is not
+        # received by this script until after the next message is sent. This confuses
+        # messages that come after. Here we send a bogus message without checking what
+        # comes back to flush that response.
+        if info.type_id == HubTypeId.CITY_HUB:
+            response = await self.write(bytearray((self.GET_CHECKSUM.command,)), True)
+            await asyncio.sleep(2)
+
         # Get the bootloader ready to accept the firmware
         logger.debug('Request begin update.')
         response = await self.bootloader_request(