Merge branch 'master' into feat/gallagher-encoding

This commit is contained in:
DarkMatterMatt 2021-02-11 18:57:13 +13:00
commit a75bba6ca7

2
pm3
View file

@ -192,7 +192,7 @@ function get_pm3_list_WSL {
fi 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 DeviceID" 2>/dev/null | sed -nr 's#^COM([0-9]+)\b#/dev/ttyS\1#p'); do 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 DeviceID" 2>/dev/null | sed -nr 's#^COM([0-9]+)\b#/dev/ttyS\1#p'); do
# ttyS counterpart takes some more time to appear # ttyS counterpart takes some more time to appear
if [ -e "$DEV" ]; then if [ -e "$DEV" ]; then
PM3LIST+=("$DEV") PM3LIST+=("$DEV")