✨ Port selection (#326)

* Found a typo * add feature on selecting brain based on brains' unique ID
purduesigbots · Feb 16, 2024 · 3998579 · 3998579
1 parent 18fb090
commit 3998579
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pros/cli/common.py b/pros/cli/common.py
@@ -253,11 +253,13 @@ def resolve_v5_port(port: Optional[str], type: str, quiet: bool = False) -> Tupl
             return None, False
         if len(ports) > 1:
             if not quiet:
-                port = click.prompt('Multiple {} ports were found. Please choose one: [{}]'
-                                    .format('v5', '|'.join([p.device for p in ports])),
-                                    default=ports[0].device,
+                brain_id = click.prompt('Multiple {} Brains were found. Please choose one to upload the program: [{}]'
+                                    .format('v5', ' | '.join([p.product.split(' ')[-1] for p in ports])),
+                                    default=ports[0].product.split(' ')[-1],
                                     show_default=False,
-                                    type=click.Choice([p.device for p in ports]))
+                                    type=click.Choice([p.description.split(' ')[-1] for p in ports]))
+                port = [p.device for p in ports if p.description.split(' ')[-1] == brain_id][0]
+
                 assert port in [p.device for p in ports]
             else:
                 return None, False

diff --git a/pros/cli/upload.py b/pros/cli/upload.py
@@ -192,7 +192,7 @@ def __str__(self):
         result.append(PortReport('VEX EDR V5 System Ports', ports, 'v5/system'))
 
         ports = find_v5_ports('User')
-        result.append(PortReport('VEX EDR V5 User ports', ports, 'v5/user'))
+        result.append(PortReport('VEX EDR V5 User Ports', ports, 'v5/user'))
     if target == 'cortex' or target is None:
         ports = find_cortex_ports()
         result.append(PortReport('VEX EDR Cortex Microcontroller Ports', ports, 'cortex'))