feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Minor improvements // Issue #4699

Browse Source
This commit is contained in:
Ivan Kravets
2023-12-30 18:27:40 +02:00
parent 125be4bfd4
commit dc16f80ffc
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
platformio/debug/cli.py
View File

@ -54,8 +54,8 @@ from platformio.project.options import ProjectOptions
@click.option("--environment", "-e", metavar="<environment>") @click.option("--environment", "-e", metavar="<environment>")
@click.option("--load-mode", type=ProjectOptions["env.debug_load_mode"].type) @click.option("--load-mode", type=ProjectOptions["env.debug_load_mode"].type)
@click.option("--verbose", "-v", is_flag=True) @click.option("--verbose", "-v", is_flag=True)
@click.option("--interface", type=click.Choice(["gdb"]), default="gdb") @click.option("--interface", type=click.Choice(["gdb"]))
@click.argument("__unprocessed", nargs=-1, type=click.UNPROCESSED) @click.argument("client_extra_args", nargs=-1, type=click.UNPROCESSED)
@click.pass_context @click.pass_context
def cli( def cli(
ctx, ctx,
@ -65,10 +65,13 @@ def cli(
load_mode, load_mode,
verbose, verbose,
interface, interface,
__unprocessed, client_extra_args,
): ):
app.set_session_var("custom_project_conf", project_conf) app.set_session_var("custom_project_conf", project_conf)
if not interface and client_extra_args:
raise click.UsageError("Please specify debugging interface")
# use env variables from Eclipse or CLion # use env variables from Eclipse or CLion
for name in ("CWD", "PWD", "PLATFORMIO_PROJECT_DIR"): for name in ("CWD", "PWD", "PLATFORMIO_PROJECT_DIR"):
if is_platformio_project(project_dir): if is_platformio_project(project_dir):
@ -92,7 +95,7 @@ def cli(
env_name, env_name,
load_mode, load_mode,
verbose, verbose,
__unprocessed, client_extra_args,
) )
if helpers.is_gdbmi_mode(): if helpers.is_gdbmi_mode():
os.environ["PLATFORMIO_DISABLE_PROGRESSBAR"] = "true" os.environ["PLATFORMIO_DISABLE_PROGRESSBAR"] = "true"
@ -103,19 +106,19 @@ def cli(
else: else:
debug_config = _configure(*configure_args) debug_config = _configure(*configure_args)
_run(project_dir, debug_config, __unprocessed) _run(project_dir, debug_config, client_extra_args)
return None return None
def _configure(ctx, project_config, env_name, load_mode, verbose, __unprocessed): def _configure(ctx, project_config, env_name, load_mode, verbose, client_extra_args):
platform = PlatformFactory.from_env(env_name, autoinstall=True) platform = PlatformFactory.from_env(env_name, autoinstall=True)
debug_config = DebugConfigFactory.new( debug_config = DebugConfigFactory.new(
platform, platform,
project_config, project_config,
env_name, env_name,
) )
if "--version" in __unprocessed: if "--version" in client_extra_args:
raise ReturnErrorCode( raise ReturnErrorCode(
subprocess.run( subprocess.run(
[debug_config.client_executable_path, "--version"], check=True [debug_config.client_executable_path, "--version"], check=True
@ -161,12 +164,12 @@ def _configure(ctx, project_config, env_name, load_mode, verbose, __unprocessed)
return debug_config return debug_config
def _run(project_dir, debug_config, __unprocessed): def _run(project_dir, debug_config, client_extra_args):
loop = asyncio.ProactorEventLoop() if IS_WINDOWS else asyncio.get_event_loop() loop = asyncio.ProactorEventLoop() if IS_WINDOWS else asyncio.get_event_loop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
client = GDBClientProcess(project_dir, debug_config) client = GDBClientProcess(project_dir, debug_config)
coro = client.run(__unprocessed) coro = client.run(client_extra_args)
try: try:
signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGINT, signal.SIG_IGN)
loop.run_until_complete(coro) loop.run_until_complete(coro)