hidapi: log device's manufacturer and name (#5177)

Fedr · web-flow · commit 0ccd2898eebf · 2025-10-01T13:51:47.000+03:00
diff --git a/source/MRViewer/MRSpaceMouseHandlerHidapi.cpp b/source/MRViewer/MRSpaceMouseHandlerHidapi.cpp
@@ -68,10 +68,12 @@ bool SpaceMouseHandlerHidapi::findAndAttachDevice_( bool verbose )
         {
             if ( verbose )
             {
-                spdlog::info( "HID API device found: {:04x}:{:04x}, path={}, usage={}, usage_page={}",
-                    vendorId, localDevicesIt->product_id, localDevicesIt->path, localDevicesIt->usage, localDevicesIt->usage_page );
+                spdlog::info( "HID API device found: {:04x}:{:04x}, path={}, usage={}, usage_page={}, name={}:{}",
+                    vendorId, localDevicesIt->product_id, localDevicesIt->path, localDevicesIt->usage, localDevicesIt->usage_page,
+                    wideToUtf8( localDevicesIt->manufacturer_string ), wideToUtf8( localDevicesIt->product_string ) );
                 if ( deviceSignal_ && localDevicesIt->usage == HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER && localDevicesIt->usage_page == HID_USAGE_PAGE_GENERIC )
-                    deviceSignal_( fmt::format( "HID API device {:04x}:{:04x} found", vendorId, localDevicesIt->product_id ) );
+                    deviceSignal_( fmt::format( "HID API device {:04x}:{:04x} found: {}:{}", vendorId, localDevicesIt->product_id,
+                        wideToUtf8( localDevicesIt->manufacturer_string ), wideToUtf8( localDevicesIt->product_string ) ) );
             }
             for ( ProductId deviceId : supportedDevicesId )
             {

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,12 @@ bool SpaceMouseHandlerHidapi::findAndAttachDevice_( bool verbose )`
`68`	`68`	`{`
`69`	`69`	`if ( verbose )`
`70`	`70`	`{`
`71`		`- spdlog::info( "HID API device found: {:04x}:{:04x}, path={}, usage={}, usage_page={}",`
`72`		`- vendorId, localDevicesIt->product_id, localDevicesIt->path, localDevicesIt->usage, localDevicesIt->usage_page );`
	`71`	`+ spdlog::info( "HID API device found: {:04x}:{:04x}, path={}, usage={}, usage_page={}, name={}:{}",`
	`72`	`+ vendorId, localDevicesIt->product_id, localDevicesIt->path, localDevicesIt->usage, localDevicesIt->usage_page,`
	`73`	`+ wideToUtf8( localDevicesIt->manufacturer_string ), wideToUtf8( localDevicesIt->product_string ) );`
`73`	`74`	`if ( deviceSignal_ && localDevicesIt->usage == HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER && localDevicesIt->usage_page == HID_USAGE_PAGE_GENERIC )`
`74`		`- deviceSignal_( fmt::format( "HID API device {:04x}:{:04x} found", vendorId, localDevicesIt->product_id ) );`
	`75`	`+ deviceSignal_( fmt::format( "HID API device {:04x}:{:04x} found: {}:{}", vendorId, localDevicesIt->product_id,`
	`76`	`+ wideToUtf8( localDevicesIt->manufacturer_string ), wideToUtf8( localDevicesIt->product_string ) ) );`
`75`	`77`	`}`
`76`	`78`	`for ( ProductId deviceId : supportedDevicesId )`
`77`	`79`	`{`