alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

tools: set baudrate and port with otatool.

Browse Source 
Bugfix: Allow setting options port -p and baudrate -b, with idf.py otatool commands.

Closes https://github.com/espressif/esp-idf/issues/8317
This commit is contained in:
Marek Fiala 2022-03-07 14:46:13 +01:00
parent b02ac9cab9
commit 3f6add5964
2 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/idf_py_actions/core_ext.py
View File

@ -455,28 +455,6 @@ def action_extensions(base_actions, project_path):
'order_dependencies': ['reconfigure'],
'options': global_options,
},
'erase_otadata': {
'callback': build_target,
'hidden': True,
'help': 'Erase otadata partition.',
'options': global_options,
},
'erase-otadata': {
'callback': build_target,
'help': 'Erase otadata partition. Deprecated alias: "erase_otadata".',
'options': global_options,
},
'read_otadata': {
'callback': build_target,
'hidden': True,
'help': 'Read otadata partition.',
'options': global_options,
},
'read-otadata': {
'callback': build_target,
'help': 'Read otadata partition. Deprecated alias: "read_otadata".',
'options': global_options,
},
'build-system-targets': {
'callback': list_build_system_targets,
'help': 'Print list of build system targets.',

48
tools/idf_py_actions/serial_ext.py
View File

@ -172,6 +172,17 @@ def action_extensions(base_actions, project_path):
task.action_args['encrypted'] = True
break
def ota_targets(target_name, ctx, args):
"""
Execute the target build system to build target 'target_name'.
Additionally set global variables for baud and port.
Calls ensure_build_directory() which will run cmake to generate a build
directory (with the specified generator) as needed.
"""
args.port = args.port or _get_default_serial_port(args)
ensure_build_directory(args, ctx.info_name)
run_target(target_name, args, {'ESPBAUD': str(args.baud), 'ESPPORT': args.port})
baud_rate = {
'names': ['-b', '--baud'],
'help': 'Baud rate for flashing. It can imply monitor baud rate as well if it hasn\'t been defined locally.',
@ -188,19 +199,20 @@ def action_extensions(base_actions, project_path):
'default': None,
}
BAUD_AND_PORT = [baud_rate, port]
serial_actions = {
'global_action_callbacks': [global_callback],
'actions': {
'flash': {
'callback': flash,
'help': 'Flash the project.',
'options': global_options + [baud_rate, port],
'options': global_options + BAUD_AND_PORT,
'order_dependencies': ['all', 'erase-flash'],
},
'erase-flash': {
'callback': erase_flash,
'help': 'Erase entire flash chip. Deprecated alias: "erase_flash"',
'options': [baud_rate, port],
'options': BAUD_AND_PORT,
},
'erase_flash': {
'callback': erase_flash,
@ -210,7 +222,7 @@ def action_extensions(base_actions, project_path):
},
'hidden': True,
'help': 'Erase entire flash chip.',
'options': [baud_rate, port],
'options': BAUD_AND_PORT,
},
'monitor': {
'callback':
@ -272,26 +284,26 @@ def action_extensions(base_actions, project_path):
'partition-table-flash': {
'callback': flash,
'help': 'Flash partition table only. Deprecated alias: "partition_table-flash".',
'options': [baud_rate, port],
'options': BAUD_AND_PORT,
'order_dependencies': ['partition-table', 'erase-flash'],
},
'partition_table-flash': {
'callback': flash,
'hidden': True,
'help': 'Flash partition table only.',
'options': [baud_rate, port],
'options': BAUD_AND_PORT,
'order_dependencies': ['partition-table', 'erase-flash'],
},
'bootloader-flash': {
'callback': flash,
'help': 'Flash bootloader only.',
'options': [baud_rate, port],
'options': BAUD_AND_PORT,
'order_dependencies': ['bootloader', 'erase-flash'],
},
'app-flash': {
'callback': flash,
'help': 'Flash the app only.',
'options': [baud_rate, port],
'options': BAUD_AND_PORT,
'order_dependencies': ['app', 'erase-flash'],
},
'encrypted-app-flash': {
@ -304,6 +316,28 @@ def action_extensions(base_actions, project_path):
'help': 'Flash the encrypted project.',
'order_dependencies': ['all', 'erase-flash'],
},
'erase_otadata': {
'callback': ota_targets,
'hidden': True,
'help': 'Erase otadata partition.',
'options': global_options + BAUD_AND_PORT,
},
'erase-otadata': {
'callback': ota_targets,
'help': 'Erase otadata partition. Deprecated alias: "erase_otadata".',
'options': global_options + BAUD_AND_PORT,
},
'read_otadata': {
'callback': ota_targets,
'hidden': True,
'help': 'Read otadata partition.',
'options': global_options + BAUD_AND_PORT,
},
'read-otadata': {
'callback': ota_targets,
'help': 'Read otadata partition. Deprecated alias: "read_otadata".',
'options': global_options + BAUD_AND_PORT,
},
},
}