Skip to content

Commit

Permalink
feat: remove call esptool.detect_chip everytime
Browse files Browse the repository at this point in the history
  • Loading branch information
horw committed Jan 2, 2024
1 parent e58749a commit 8147ee5
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions pytest-embedded-serial-esp/pytest_embedded_serial_esp/serial.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,30 +101,30 @@ def __init__(
)

with contextlib.redirect_stdout(msg_queue):
esp = esptool.get_default_connected_device(
self.esp = esptool.get_default_connected_device(
ports,
port=port,
connect_attempts=3,
initial_baud=baud,
chip=esptool_target,
)

if not esp:
if not self.esp:
raise ValueError('Couldn\'t auto detect chip. Please manually specify with "--port"')

self.esp: esptool.ESPLoader = None # type: ignore
self.stub: esptool.ESPLoader = None # type: ignore

target = esp.CHIP_NAME.lower().replace('-', '')
logging.info('Target: %s, Port: %s', target, esp.serial_port)
target = self.esp.CHIP_NAME.lower().replace('-', '')
logging.info('Target: %s, Port: %s', target, self.esp.serial_port)

self.target = target

self.skip_autoflash = skip_autoflash
self.erase_all = erase_all
self.esptool_baud = esptool_baud

super().__init__(msg_queue=msg_queue, port=esp._port, baud=baud, meta=meta, **kwargs)
super().__init__(msg_queue=msg_queue, port=self.esp._port, baud=baud, meta=meta, **kwargs)

def _post_init(self):
if self._meta:
Expand Down Expand Up @@ -157,8 +157,6 @@ def decorator(func):
def wrapper(self, *args, **kwargs):
with self.disable_redirect_thread():
with contextlib.redirect_stdout(self._q):
self.esp = esptool.detect_chip(self.proc, self.baud)
self.esp.connect('hard_reset')
ret = func(self, *args, **kwargs)
return ret

Expand Down

0 comments on commit 8147ee5

Please sign in to comment.