espressif/esptool
1
0
Fork 0
mirror of https://github.com/espressif/esptool.git synced 2025-10-21 23:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(write_flash): retry flashing if chip disconnects

Browse Source
This commit is contained in:
Peter Dragun
2024-04-25 10:54:48 +02:00
parent 1deb1c65c1
commit a15089a6d5
2 changed files with 86 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
esptool/cmds.py
View File

@@ -13,6 +13,7 @@ import zlib
import itertools import itertools
from intelhex import IntelHex from intelhex import IntelHex
from serial import SerialException
from .bin_image import ELFFile, ImageSegment, LoadFirmwareImage from .bin_image import ELFFile, ImageSegment, LoadFirmwareImage
from .bin_image import ( from .bin_image import (
@@ -579,12 +580,19 @@ def write_flash(esp, args):
if compress: if compress:
uncimage = image uncimage = image
image = zlib.compress(uncimage, 9) image = zlib.compress(uncimage, 9)
original_image = image # Save the whole image in case retry is needed
# Try again if reconnect was successful
for attempt in range(1, esp.WRITE_FLASH_ATTEMPTS + 1):
try:
if compress:
# Decompress the compressed binary a block at a time, # Decompress the compressed binary a block at a time,
# to dynamically calculate the timeout based on the real write size # to dynamically calculate the timeout based on the real write size
decompress = zlib.decompressobj() decompress = zlib.decompressobj()
blocks = esp.flash_defl_begin(uncsize, len(image), address) blocks = esp.flash_defl_begin(uncsize, len(image), address)
else: else:
blocks = esp.flash_begin(uncsize, address, begin_rom_encrypted=encrypted) blocks = esp.flash_begin(
uncsize, address, begin_rom_encrypted=encrypted
)
argfile.seek(0) # in case we need it again argfile.seek(0) # in case we need it again
seq = 0 seq = 0
bytes_sent = 0 # bytes sent on wire bytes_sent = 0 # bytes sent on wire
@@ -607,12 +615,12 @@ def write_flash(esp, args):
bytes_written += block_uncompressed bytes_written += block_uncompressed
block_timeout = max( block_timeout = max(
DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
timeout_per_mb(ERASE_WRITE_TIMEOUT_PER_MB, block_uncompressed), timeout_per_mb(
ERASE_WRITE_TIMEOUT_PER_MB, block_uncompressed
),
) )
if not esp.IS_STUB: if not esp.IS_STUB:
timeout = ( timeout = block_timeout # ROM code writes block to flash before ACKing
block_timeout # ROM code writes block to flash before ACKing
)
esp.flash_defl_block(block, seq, timeout=timeout) esp.flash_defl_block(block, seq, timeout=timeout)
if esp.IS_STUB: if esp.IS_STUB:
# Stub ACKs when block is received, # Stub ACKs when block is received,
@@ -629,6 +637,32 @@ def write_flash(esp, args):
bytes_sent += len(block) bytes_sent += len(block)
image = image[esp.FLASH_WRITE_SIZE :] image = image[esp.FLASH_WRITE_SIZE :]
seq += 1 seq += 1
break
except SerialException:
if attempt == esp.WRITE_FLASH_ATTEMPTS or encrypted:
# Already retried once or encrypted mode is disabled because of security reasons
raise
print("\nLost connection, retrying...")
esp._port.close()
print("Waiting for the chip to reconnect", end="")
for _ in range(DEFAULT_CONNECT_ATTEMPTS):
try:
time.sleep(1)
esp._port.open()
print() # Print new line which was suppressed by print(".")
esp.connect()
if esp.IS_STUB:
# Hack to bypass the stub overwrite check
esp.IS_STUB = False
# Reflash stub because chip was reset
esp = esp.run_stub()
image = original_image
break
except SerialException:
print(".", end="")
sys.stdout.flush()
else:
raise # Reconnect limit reached
if esp.IS_STUB: if esp.IS_STUB:
# Stub only writes each block to flash after 'ack'ing the receive, # Stub only writes each block to flash after 'ack'ing the receive,

3
esptool/loader.py
View File

@@ -278,6 +278,9 @@ class ESPLoader(object):
# Chip IDs that are no longer supported by esptool # Chip IDs that are no longer supported by esptool
UNSUPPORTED_CHIPS = {6: "ESP32-S3(beta 3)"} UNSUPPORTED_CHIPS = {6: "ESP32-S3(beta 3)"}
# Number of attempts to write flash data
WRITE_FLASH_ATTEMPTS = 2
def __init__(self, port=DEFAULT_PORT, baud=ESP_ROM_BAUD, trace_enabled=False): def __init__(self, port=DEFAULT_PORT, baud=ESP_ROM_BAUD, trace_enabled=False):
"""Base constructor for ESPLoader bootloader interaction """Base constructor for ESPLoader bootloader interaction