From 436194e6c79ce143dee9ee25f3581812908cd346 Mon Sep 17 00:00:00 2001
From: hedger <hedger@users.noreply.github.com>
Date: Thu, 8 Jun 2023 08:47:27 +0400
Subject: [PATCH] [FL-3346] fbt: added Flipper selection when multiple are
 connected over USB (#2723)

* fbt: added Flipper selection when multiple are connected over USB
* scripts: serial_cli: added --port (-p) option
---
 SConstruct                       | 6 ++++--
 scripts/fbt_tools/fbt_dist.py    | 2 +-
 scripts/fbt_tools/fbt_extapps.py | 3 +--
 scripts/flipper/utils/cdc.py     | 2 +-
 scripts/serial_cli.py            | 6 +++++-
 scripts/ufbt/SConstruct          | 4 ++--
 scripts/ufbt/commandline.scons   | 5 +++++
 site_scons/commandline.scons     | 5 +++++
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/SConstruct b/SConstruct
index e2568287dff..b51154f7032 100644
--- a/SConstruct
+++ b/SConstruct
@@ -171,7 +171,7 @@ distenv.Depends(firmware_env["FW_RESOURCES"], external_apps_artifacts.resources_
 
 fap_deploy = distenv.PhonyTarget(
     "fap_deploy",
-    "${PYTHON3} ${ROOT_DIR}/scripts/storage.py send ${SOURCE} /ext/apps",
+    "${PYTHON3} ${FBT_SCRIPT_DIR}/storage.py -p ${FLIP_PORT} send ${SOURCE} /ext/apps",
     source=Dir("#/assets/resources/apps"),
 )
 
@@ -323,7 +323,9 @@ distenv.PhonyTarget(
 )
 
 # Start Flipper CLI via PySerial's miniterm
-distenv.PhonyTarget("cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py")
+distenv.PhonyTarget(
+    "cli", "${PYTHON3} ${FBT_SCRIPT_DIR}/serial_cli.py  -p ${FLIP_PORT}"
+)
 
 
 # Find blackmagic probe
diff --git a/scripts/fbt_tools/fbt_dist.py b/scripts/fbt_tools/fbt_dist.py
index a43d62e9dc9..e47898bd9ed 100644
--- a/scripts/fbt_tools/fbt_dist.py
+++ b/scripts/fbt_tools/fbt_dist.py
@@ -132,7 +132,7 @@ def generate(env):
             "UsbInstall": Builder(
                 action=[
                     Action(
-                        '${PYTHON3} "${SELFUPDATE_SCRIPT}" ${UPDATE_BUNDLE_DIR}/update.fuf'
+                        '${PYTHON3} "${SELFUPDATE_SCRIPT}" -p ${FLIP_PORT} ${UPDATE_BUNDLE_DIR}/update.fuf'
                     ),
                     Touch("${TARGET}"),
                 ]
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 1a1bad29e71..16d5dcbabd3 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -431,7 +431,7 @@ def _add_host_app_to_targets(host_app):
     # print(deploy_sources, flipp_dist_paths)
     env.PhonyTarget(
         launch_target_name,
-        '${PYTHON3} "${APP_RUN_SCRIPT}" ${EXTRA_ARGS} -s ${SOURCES} -t ${FLIPPER_FILE_TARGETS}',
+        '${PYTHON3} "${APP_RUN_SCRIPT}" -p ${FLIP_PORT} ${EXTRA_ARGS} -s ${SOURCES} -t ${FLIPPER_FILE_TARGETS}',
         source=deploy_sources,
         FLIPPER_FILE_TARGETS=flipp_dist_paths,
         EXTRA_ARGS=run_script_extra_ars,
@@ -443,7 +443,6 @@ def generate(env, **kw):
     env.SetDefault(
         EXT_APPS_WORK_DIR="${FBT_FAP_DEBUG_ELF_ROOT}",
         APP_RUN_SCRIPT="${FBT_SCRIPT_DIR}/runfap.py",
-        STORAGE_SCRIPT="${FBT_SCRIPT_DIR}/storage.py",
     )
     if not env["VERBOSE"]:
         env.SetDefault(
diff --git a/scripts/flipper/utils/cdc.py b/scripts/flipper/utils/cdc.py
index 7c735167029..9564088598e 100644
--- a/scripts/flipper/utils/cdc.py
+++ b/scripts/flipper/utils/cdc.py
@@ -6,7 +6,7 @@ def resolve_port(logger, portname: str = "auto"):
     if portname != "auto":
         return portname
     # Try guessing
-    flippers = list(list_ports.grep("flip"))
+    flippers = list(list_ports.grep("flip_"))
     if len(flippers) == 1:
         flipper = flippers[0]
         logger.info(f"Using {flipper.serial_number} on {flipper.device}")
diff --git a/scripts/serial_cli.py b/scripts/serial_cli.py
index 6dae68be6fa..8e35d57facd 100644
--- a/scripts/serial_cli.py
+++ b/scripts/serial_cli.py
@@ -1,3 +1,4 @@
+import argparse
 import logging
 import os
 import subprocess
@@ -8,7 +9,10 @@
 
 def main():
     logger = logging.getLogger()
-    if not (port := resolve_port(logger, "auto")):
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-p", "--port", help="CDC Port", default="auto")
+    args = parser.parse_args()
+    if not (port := resolve_port(logger, args.port)):
         logger.error("Is Flipper connected via USB and not in DFU mode?")
         return 1
     subprocess.call(
diff --git a/scripts/ufbt/SConstruct b/scripts/ufbt/SConstruct
index a1acd270a7a..8812a4e5592 100644
--- a/scripts/ufbt/SConstruct
+++ b/scripts/ufbt/SConstruct
@@ -342,7 +342,7 @@ else:
 
 appenv.PhonyTarget(
     "cli",
-    '${PYTHON3} "${FBT_SCRIPT_DIR}/serial_cli.py"',
+    '${PYTHON3} "${FBT_SCRIPT_DIR}/serial_cli.py" -p ${FLIP_PORT}',
 )
 
 # Linter
@@ -469,7 +469,7 @@ if dolphin_src_dir.exists():
     )
     dist_env.PhonyTarget(
         "dolphin_ext",
-        '${PYTHON3} ${FBT_SCRIPT_DIR}/storage.py send "${SOURCE}" /ext/dolphin',
+        '${PYTHON3} ${FBT_SCRIPT_DIR}/storage.py -p ${FLIP_PORT} send "${SOURCE}" /ext/dolphin',
         source=ufbt_build_dir.Dir("dolphin"),
     )
 else:
diff --git a/scripts/ufbt/commandline.scons b/scripts/ufbt/commandline.scons
index a9b91bbca97..349b4ef2524 100644
--- a/scripts/ufbt/commandline.scons
+++ b/scripts/ufbt/commandline.scons
@@ -71,6 +71,11 @@ vars.AddVariables(
         validator=PathVariable.PathIsDir,
         default="",
     ),
+    (
+        "FLIP_PORT",
+        "CDC Port of Flipper to use, if multiple are connected",
+        "auto",
+    ),
 )
 
 Return("vars")
diff --git a/site_scons/commandline.scons b/site_scons/commandline.scons
index e31927c5942..b70b5cff56f 100644
--- a/site_scons/commandline.scons
+++ b/site_scons/commandline.scons
@@ -243,6 +243,11 @@ vars.AddVariables(
         " app can check what version it is being built for.",
         "Official",
     ),
+    (
+        "FLIP_PORT",
+        "Full port name of Flipper to use, if multiple Flippers are connected",
+        "auto",
+    ),
 )
 
 Return("vars")