mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2026-04-17 21:42:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #254 from mkinney/force_win_encoding

Browse Source 
specify a code page on windows
This commit is contained in:
mkinney
2022-02-01 12:03:08 -08:00
committed by GitHub
parent 7c8cb375a3 ff5652058d
commit 172f6c577d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meshtastic/supported_device.py
View File

@@ -175,7 +175,8 @@ def detect_windows_port(sd):
system = platform.system()
if system == "Windows":
command = 'powershell.exe "Get-PnpDevice -PresentOnly | Where-Object{ ($_.DeviceId -like '
command = ('powershell.exe "[Console]::OutputEncoding = [Text.UTF8Encoding]::UTF8;'
'Get-PnpDevice -PresentOnly | Where-Object{ ($_.DeviceId -like ')
command += f"'*{sd.usb_vendor_id_in_hex.upper()}*'"
command += ')} | Format-List"'

5
meshtastic/util.py
View File

@@ -297,7 +297,8 @@ def detect_supported_devices():
elif system == "Windows":
# if windows, run Get-PnpDevice
_, sp_output = subprocess.getstatusoutput('powershell.exe "Get-PnpDevice -PresentOnly | Format-List"')
_, sp_output = subprocess.getstatusoutput('powershell.exe "[Console]::OutputEncoding = [Text.UTF8Encoding]::UTF8;'
'Get-PnpDevice -PresentOnly | Format-List"')
#print(f'sp_output:{sp_output}')
vids = get_unique_vendor_ids()
for vid in vids:
@@ -365,7 +366,7 @@ def detect_windows_needs_driver(sd, print_reason=False):
if system == "Windows":
# if windows, see if we can find a DeviceId with the vendor id
# Get-PnpDevice | Where-Object{ ($_.DeviceId -like '*10C4*')} | Format-List
command = 'powershell.exe "Get-PnpDevice | Where-Object{ ($_.DeviceId -like '
command = 'powershell.exe "[Console]::OutputEncoding = [Text.UTF8Encoding]::UTF8; Get-PnpDevice | Where-Object{ ($_.DeviceId -like '
command += f"'*{sd.usb_vendor_id_in_hex.upper()}*'"
command += ')} | Format-List"'