Skip to content

Commit

Permalink
fix update_fw scripts to not fail on evt bots (#12259)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanthecoder authored Mar 9, 2023
1 parent a31ee78 commit 10fa3ce
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
13 changes: 9 additions & 4 deletions hardware/opentrons_hardware/scripts/update_fw.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import asyncio
import logging
from logging.config import dictConfig
from typing import Dict, Any
from typing import Dict, Any, Optional

from typing_extensions import Final

Expand Down Expand Up @@ -57,10 +57,15 @@ async def run(args: argparse.Namespace) -> None:
retry_count = args.retry_count
timeout_seconds = args.timeout_seconds
erase = not args.no_erase
usb_messenger: Optional[BinaryMessenger] = None
try:
usb_driver: SerialUsbDriver = await (build_rear_panel_driver())
usb_messenger = build_rear_panel_messenger(usb_driver)
usb_messenger.start()
except IOError as e:
if args.target == "rear-panel":
raise e

usb_driver: SerialUsbDriver = await (build_rear_panel_driver())
usb_messenger: BinaryMessenger = build_rear_panel_messenger(usb_driver)
usb_messenger.start()
update_details = {
TARGETS[args.target]: args.file,
}
Expand Down
14 changes: 9 additions & 5 deletions hardware/opentrons_hardware/scripts/update_fws.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import logging
import json
from logging.config import dictConfig
from typing import Dict, Any, TextIO
from typing import Dict, Any, TextIO, Optional
from opentrons_hardware.drivers.binary_usb import (
SerialUsbDriver,
BinaryMessenger,
Expand Down Expand Up @@ -58,10 +58,14 @@ async def run(args: argparse.Namespace) -> None:
): filepath
for target, filepath in update_dict.items()
}

usb_driver: SerialUsbDriver = await (build_rear_panel_driver())
usb_messenger: BinaryMessenger = build_rear_panel_messenger(usb_driver)
usb_messenger.start()
usb_messenger: Optional[BinaryMessenger] = None
try:
usb_driver: SerialUsbDriver = await (build_rear_panel_driver())
usb_messenger = build_rear_panel_messenger(usb_driver)
usb_messenger.start()
except IOError as e:
if USBTarget.rear_panel in update_details.keys():
raise e

async with build.can_messenger(build_settings(args)) as can_messenger:
updater = RunUpdate(
Expand Down

0 comments on commit 10fa3ce

Please sign in to comment.