From 9e5552719d7381d27d9fc6d91f925bec824f5e4f Mon Sep 17 00:00:00 2001
From: PipeItToDevNull <piper@dev0.sh>
Date: Sun, 23 Oct 2022 08:18:59 -0400
Subject: [PATCH] change how pnp devices are called and add generic USB device
 output

---
 files/src/data.ps1         | 2 +-
 files/src/functions.ps1    | 8 +++++---
 files/src/outfunctions.ps1 | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/files/src/data.ps1 b/files/src/data.ps1
index 419e046..ba0b36b 100644
--- a/files/src/data.ps1
+++ b/files/src/data.ps1
@@ -37,7 +37,7 @@ $runningProcesses = Get-Process
 $volumes = Get-Volume
 $dns = Get-DnsClientGlobalSetting
 $netAdapters = Get-NetADapter
-$issueDevices = Get-PnpDevice -PresentOnly -Status ERROR,DEGRADED,UNKNOWN -ErrorAction SilentlyContinue
+$pnpDevices = Get-PnpDevice -PresentOnly -ErrorAction SilentlyContinue
 
 # janky check for msconfig core setting
 $bcdedit = bcdedit | Select-String numproc
diff --git a/files/src/functions.ps1 b/files/src/functions.ps1
index 4b87954..91b8895 100644
--- a/files/src/functions.ps1
+++ b/files/src/functions.ps1
@@ -369,10 +369,12 @@ function getDrivers {
     Write-Host 'Getting driver information...'
     $1 = "<h2 id='Drivers'>Drivers and device versions</h2>"
     $2 = $(gwmi Win32_PnPSignedDriver | Select devicename,driverversion | ConvertTo-Html -Fragment)
-    $3 = "<h2 id='issueDevices'>Devices with issues</h2>"
-    $4 = $issueDevices | Select Status,Name,InstanceID | ConvertTo-HTML -Fragment
+    $3 = "<h2 id='usbDevices'>USB Devices</h2>"
+    $4 = $pnpDevices | ? { $_.InstanceId -match '^USB' } | Select FriendlyName,Description,Class,InstanceID,Status,Service | ConvertTo-Html -Fragment
+    $5 = "<h2 id='issueDevices'>Devices with issues</h2>"
+    $6 = $pnpDevices | ? { $_.Status -Match "Error|Warning|Degraded|Unknown" } | Select Status,Name,InstanceID | ConvertTo-HTML -Fragment
     Write-Host 'Got driver information' -ForegroundColor Green
-    Return $1,$2,$3,$4
+    Return $1,$2,$3,$4,$5,$6
 }
 function getAudio {
     Write-Host 'Getting audio devices...'
diff --git a/files/src/outfunctions.ps1 b/files/src/outfunctions.ps1
index 1eac3cd..ce144d7 100644
--- a/files/src/outfunctions.ps1
+++ b/files/src/outfunctions.ps1
@@ -84,6 +84,7 @@ $1 = '<a name="top"></a>
 <p><a href="#NetConfig">Network Configuration</a></p>
 <p><a href="#NetConnections">Network Connections</a></p>
 <p><a href="#Drivers">Drivers and device versions</a></p>
+<p><a href="#usbDevices">USB Devices</a></p>
 <p><a href="#issueDevices">Devices with issues</a></p>
 <p><a href="#Audio">Audio Devices</a></p>
 <p><a href="#Disks">Disk Layouts</a></p>