Merge branch 'EyeTrackVR:master' into master

This commit is contained in:
Physics-Dude 2023-10-27 12:30:49 -04:00 committed by GitHub
commit 1d33b29f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 86 additions and 8 deletions

View File

@ -3,6 +3,27 @@
[![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org)
> All notable changes to this project will be documented in this file
## [2.2.7](https://github.com/EyeTrackVR/OpenIris/compare/v2.2.6...v2.2.7) (2023-10-27)
### 🔁 Continuous Integration
* **ci-fix:** fix build bug related to esp32s3 ([1478b4f](https://github.com/EyeTrackVR/OpenIris/commit/1478b4fddb8ea2f110de2624024c8ef7ad6ddcee))
## [2.2.6](https://github.com/EyeTrackVR/OpenIris/compare/v2.2.5...v2.2.6) (2023-10-27)
### 🔁 Continuous Integration
* **ci-fix:** fix build bug related to esp32s3 ([1a39c35](https://github.com/EyeTrackVR/OpenIris/commit/1a39c35534fd8e87b8f02e978e8a46faf8cc1d51))
## [2.2.5](https://github.com/EyeTrackVR/OpenIris/compare/v2.2.4...v2.2.5) (2023-10-27)
### 🔁 Continuous Integration
* **ci-fix:** fix build bug related to esp32s3 ([a4ccca6](https://github.com/EyeTrackVR/OpenIris/commit/a4ccca6e2a07624c02c9b4d6a4fdfd259193c9e7))
## [2.2.4](https://github.com/EyeTrackVR/OpenIris/compare/v2.2.3...v2.2.4) (2023-10-19)

View File

@ -11,7 +11,10 @@
],
"settings": {
"cSpell.words": [
"bootloader",
"branchcmd",
"cctype",
"checkgit",
"cinttypes",
"clocale",
"cmath",
@ -25,17 +28,25 @@
"cwctype",
"deque",
"ESPS",
"esptool",
"esptoolpy",
"fstream",
"iomanip",
"iosfwd",
"iostream",
"istream",
"JTAG",
"mfile",
"ostream",
"PIOENV",
"projcmd",
"PYTHONEXE",
"revcmd",
"sccb",
"sstream",
"stdexcept",
"streambuf",
"tagcmd",
"txpower",
"typeinfo",
"XIAO"

2
ESP/.gitignore vendored
View File

@ -3,5 +3,7 @@
build/
*.log
/tools/firmware_name.txt
/tools/env_dump.txt
/tools/env_dump.json
/tools/version.txt
/tools/__pycache__/

View File

@ -5,7 +5,7 @@
platform = https://github.com/platformio/platform-espressif32.git
framework = arduino
monitor_speed = 115200
custom_firmware_version = 2.2.4
custom_firmware_version = 2.2.7
monitor_rts = 0
monitor_dtr = 0
monitor_filters =

View File

@ -20,7 +20,7 @@
"include": "/lib/src"
},
"dependencies": {},
"version": "2.2.4",
"version": "2.2.7",
"frameworks": "arduino",
"platforms": "espressif32"
}

View File

@ -53,13 +53,49 @@ def createZip(source, target, env):
# join the offset and path into a space separated string
temp.append("{} {}".format(offset, path))
# detect if the PIOENV has QIO flash mode
flash_mode = env["BOARD_FLASH_MODE"]
flash_freq = env["BOARD_F_FLASH"]
if flash_freq == "80000000L":
flash_freq = "80m"
elif flash_freq == "40000000L":
flash_freq = "40m"
# detect the chip type
chip_type = env["BOARD_MCU"]
flash_size = '4'
# TODO: detect the flash size from the board manifest
if chip_type == "esp32s3":
flash_size = '8'
# capitalize the chip type
chip_type = chip_type.upper()
# add hyphen between ESP32 and the suffix (WROOM, WROVER, etc)
chip_type = chip_type.replace("ESP32", "ESP32-")
print("Flash Mode: %s" % flash_mode)
print("Chip Type: %s" % chip_type)
print("Flash Frequency: %s" % flash_freq)
print("Flash Size: %s" % flash_size)
"""
python esptool.py --chip ESP32 merge_bin -o merged-firmware.bin --flash_mode dio --flash_freq 40m --flash_size 4MB
0x1000 bootloader.bin 0x8000 partitions.bin 0xe000 boot.bin 0x10000 OpenIris-v1.3.0-esp32AIThinker-8229a3a-master.bin
"""
execute_cmd = "$PYTHONEXE $PROJECT_PACKAGES_DIR/tool-esptoolpy/esptool.py --chip {chip} merge_bin -o merged-firmware.bin --flash_mode {flash_mode} --flash_freq {flash_freq} --flash_size {flash_size}MB %s" % (
" ".join(temp)
)
print("Executing: %s" % execute_cmd)
env.Execute(
"$PYTHONEXE $PROJECT_PACKAGES_DIR/tool-esptoolpy/esptool.py --chip ESP32 merge_bin -o merged-firmware.bin --flash_mode dio --flash_freq 40m --flash_size 4MB %s"
% (" ".join(temp))
execute_cmd.format(
chip=chip_type, flash_mode=flash_mode, flash_freq=flash_freq, flash_size=flash_size)
)
filename = basename("merged-firmware.bin")
@ -77,7 +113,7 @@ def createZip(source, target, env):
"new_install_prompt_erase": new_install_prompt_erase,
"builds": [
{
"chipFamily": "ESP32",
"chipFamily": chip_type,
"parts": parts,
}
],

View File

@ -152,10 +152,18 @@ try:
flags = env["BUILD_FLAGS"]
my_flags = env.ParseFlags(flags)
# detect if the PIOENV has QIO flash mode
flash_mode = env["BOARD_FLASH_MODE"]
# detect the chip type
chip_type = env["BOARD_MCU"]
print("Flash Mode: %s" % flash_mode)
print("Chip Type: %s" % chip_type)
# Dump global construction environment (for debug purpose)
# write env.Dump() to a file
# with open("env_dump.txt", "w") as f:
# f.write(env.Dump())
with open("./tools/env_dump.txt", "w") as f:
f.write(env.Dump())
handleGit()
except ValueError as ex:
@ -165,6 +173,6 @@ except ValueError as ex:
"[Warning]: Apostrophes are not allowed in the build flags. Please remove them from the \033[;1m\033[1;36m`user-config.ini` \033[1;31mfile and try again."
)
raise Exception(
"Could not parse BUILD_FLAGS - Possible apostrophy used in user configuration",
"Could not parse BUILD_FLAGS - Possible apostrophe used in user configuration",
ex,
)