Fixed usb prioritization

wintrmvte · Sep 18, 2021 · 5aad5b2 · 5aad5b2
1 parent 85f8f2b
commit 5aad5b2
Showing 1 changed file with 35 additions and 38 deletions.
diff --git a/pm3 b/pm3
@@ -135,19 +135,8 @@ function get_pm3_list_macOS {
 function get_pm3_list_Windows {
     N=$1
     PM3LIST=()
-    # Need to look for this first,  the call to Win32_serialport "crashes" then native bt serial port.  Don't ask why.
-    #BT direct SERIAL PORTS (COM)
-    if $FINDBTRFCOMM; then
-        for DEV in $(wmic /locale:ms_409 path Win32_PnPEntity Where "Caption LIKE '%Bluetooth%(COM%'" Get Name 2> /dev/null | awk -b 'match($0,/(COM[0-9]+)/,m){print m[1]}'); do
-            DEV=${DEV/ */}
-            PM3LIST+=("$DEV")
-            if [ ${#PM3LIST[*]} -ge "$N" ]; then
-                return
-            fi
-        done
-    fi
-
-    # Normal SERIAL PORTS (COM)
+
+	# Normal SERIAL PORTS (COM)
     for DEV in $(wmic /locale:ms_409 path Win32_SerialPort Where "PNPDeviceID LIKE '%VID_9AC4&PID_4B8F%' Or PNPDeviceID LIKE '%VID_2D2D&PID_504D%'" Get DeviceID 2>/dev/null | awk -b '/^COM/{print $1}'); do
         DEV=${DEV/ */}
         #prevent soft bricking when using pm3-flash-all on an outdated bootloader
@@ -157,12 +146,22 @@ function get_pm3_list_Windows {
                 exit 1
             fi
         fi
-        #Prioritise USB connections
-        PM3LIST=("$DEV" "${PM3LIST[@]}")
+        PM3LIST+=("$DEV")
         if [ ${#PM3LIST[*]} -ge "$N" ]; then
             return
         fi
     done
+
+    #BT direct SERIAL PORTS (COM)
+    if $FINDBTRFCOMM; then
+        for DEV in $(wmic /locale:ms_409 path Win32_PnPEntity Where "Caption LIKE '%Bluetooth%(COM%'" Get Name 2> /dev/null | awk -b 'match($0,/(COM[0-9]+)/,m){print m[1]}'); do
+            DEV=${DEV/ */}
+            PM3LIST+=("$DEV")
+            if [ ${#PM3LIST[*]} -ge "$N" ]; then
+                return
+            fi
+        done
+    fi
 
     #white BT dongle SERIAL PORTS (COM)
     if $FINDBTDONGLE; then
@@ -179,27 +178,8 @@ function get_pm3_list_Windows {
 function get_pm3_list_WSL {
     N=$1
     PM3LIST=()
-
-    # Need to look for this first,  the call to Win32_serialport "crashes" then native bt serial port.  Don't ask why.
-    #BT direct SERIAL PORTS (COM)
-    if $FINDBTRFCOMM; then
-        for DEV in $($PSHEXE -command "Get-CimInstance -ClassName Win32_PnPEntity | Where-Object Caption -like 'Standard Serial over Bluetooth link (COM*' | Select Name" 2> /dev/null | sed -nr 's#.*\bCOM([0-9]+)\b.*#/dev/ttyS\1#p'); do
-            # ttyS counterpart takes some more time to appear
-            if [ -e "$DEV" ]; then
-                PM3LIST+=("$DEV")
-                if [ ! -w "$DEV" ]; then
-                    echo "[!] Let's give users read/write access to $DEV"
-                    sudo chmod 666 "$DEV"
-                fi
-                if [ ${#PM3LIST[*]} -ge "$N" ]; then
-                    return
-                fi
-            fi
-
-        done
-    fi
-
-    # Normal SERIAL PORTS (COM)
+
+	# Normal SERIAL PORTS (COM)
     for DEV in $($PSHEXE -command "Get-CimInstance -ClassName Win32_serialport | Where-Object {\$_.PNPDeviceID -like '*VID_9AC4&PID_4B8F*' -or \$_.PNPDeviceID -like '*VID_2D2D&PID_504D*'} | Select -expandproperty DeviceID" 2>/dev/null | tr -dc '[:print:]'); do
         _comport=$DEV
         DEV=$(echo $DEV | sed -nr 's#^COM([0-9]+)\b#/dev/ttyS\1#p')
@@ -212,8 +192,7 @@ function get_pm3_list_WSL {
                     exit 1
                 fi
             fi
-            #Prioritise USB connections
-            PM3LIST=("$DEV" "${PM3LIST[@]}")
+            PM3LIST+=("$DEV")
             if [ ! -w "$DEV" ]; then
                 echo "[!] Let's give users read/write access to $DEV"
                 sudo chmod 666 "$DEV"
@@ -224,6 +203,24 @@ function get_pm3_list_WSL {
         fi
     done
 
+    #BT direct SERIAL PORTS (COM)
+    if $FINDBTRFCOMM; then
+        for DEV in $($PSHEXE -command "Get-CimInstance -ClassName Win32_PnPEntity | Where-Object Caption -like 'Standard Serial over Bluetooth link (COM*' | Select Name" 2> /dev/null | sed -nr 's#.*\bCOM([0-9]+)\b.*#/dev/ttyS\1#p'); do
+            # ttyS counterpart takes some more time to appear
+            if [ -e "$DEV" ]; then
+                PM3LIST+=("$DEV")
+                if [ ! -w "$DEV" ]; then
+                    echo "[!] Let's give users read/write access to $DEV"
+                    sudo chmod 666 "$DEV"
+                fi
+                if [ ${#PM3LIST[*]} -ge "$N" ]; then
+                    return
+                fi
+            fi
+
+        done
+    fi
+
     #white BT dongle SERIAL PORTS (COM)
     if $FINDBTDONGLE; then
         for DEV in $($PSHEXE -command "Get-CimInstance -ClassName Win32_serialport | Where-Object PNPDeviceID -like '*VID_10C4&PID_EA60*' | Select DeviceID" 2>/dev/null | sed -nr 's#^COM([0-9]+)\b#/dev/ttyS\1#p'); do