Skip to content

Commit 2c1e64a

Browse files
committed
hopefully fixes the ESP32 build.
1 parent 93bc300 commit 2c1e64a

File tree

1 file changed

+1
-20
lines changed

1 file changed

+1
-20
lines changed

builder/esp32.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -962,26 +962,7 @@ def compile(): # NOQA
962962
build_bin_file += '.bin'
963963
build_bin_file = os.path.abspath(build_bin_file)
964964

965-
cmd = f'{python_path} -m {esptool_path} merge_bin -o {build_bin_file} {bin_files}'
966-
967-
cmd = cmd.replace('esptool.py', esptool_path)
968-
cmd = cmd.replace('write_flash', f'')
969-
cmd = cmd.replace('--flash_freq 80m ', '')
970-
cmd = cmd.replace('-p (PORT) ', '')
971-
cmd = cmd.replace('-b 460800 ', '')
972-
cmd = cmd.replace('--before default_reset ', '')
973-
cmd = cmd.replace('--after no_reset ', '')
974-
975-
# if not sys.platform.startswith('win'):
976-
# cmds = [
977-
# # [f'export "IDF_PATH={os.path.abspath(env["IDF_PATH"])}"'],
978-
# # ['cd', 'lib/esp-idf'],
979-
# # ['. ./export.sh'],
980-
# # ['cd ../..'],
981-
# cmd
982-
# ]
983-
# else:
984-
cmds = [cmd]
965+
cmds = [f'{python_path} -m {esptool_path} merge_bin -o {build_bin_file} {bin_files}']
985966

986967
result, _ = spawn(cmds, env=env)
987968
if result:

0 commit comments

Comments
 (0)