feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

IDF release/v3.3 (#3339)

Browse Source 
* IDF release/v3.3 46b12a560

* fix build

* IDF release/v3.3 367c3c09c
This commit is contained in:
Me No Dev
2020-01-20 22:07:04 +02:00
committed by GitHub
parent 307b1368dd
commit 1977370e6f
282 changed files with 13004 additions and 4377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/esptool.py
View File

@ -60,7 +60,7 @@ except ImportError:
"Check the README for installation instructions." % (sys.VERSION, sys.executable))
raise
__version__ = "2.8-dev"
__version__ = "2.8"
MAX_UINT32 = 0xffffffff
MAX_UINT24 = 0xffffff
@ -1904,7 +1904,8 @@ class ESP32FirmwareImage(BaseFirmwareImage):
chip_id = fields[4]
if chip_id != self.ROM_LOADER.IMAGE_CHIP_ID:
print("Unexpected chip id in image. Expected %d but value was %d. Is this image for a different chip model?" % (self.ROM_LOADER.IMAGE_CHIP_ID, chip_id))
print(("Unexpected chip id in image. Expected %d but value was %d. " +
"Is this image for a different chip model?") % (self.ROM_LOADER.IMAGE_CHIP_ID, chip_id))
# reserved fields in the middle should all be zero
if any(f for f in fields[6:-1] if f != 0):
@ -1916,7 +1917,6 @@ class ESP32FirmwareImage(BaseFirmwareImage):
else:
raise RuntimeError("Invalid value for append_digest field (0x%02x). Should be 0 or 1.", append_digest)
def save_extended_header(self, save_file):
def join_byte(ln,hn):
return (ln & 0x0F) + ((hn & 0x0F) << 4)