jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix wstring to string conversion warnings in EVisionV2KeyboardController.cpp

Browse source
This commit is contained in:
Adam Honse 2024-07-29 22:42:59 -05:00
parent 564d817b1c
commit 2805476fb8
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Controllers/EVisionKeyboardController/EVisionV2KeyboardController.cpp
View file

@ -50,32 +50,35 @@ static uint8_t endorfy_map[EVISION_V2_MATRIX_WIDTH * EVISION_V2_MATRIX_HEIGHT] =
EVisionV2KeyboardController::EVisionV2KeyboardController(hid_device* dev_handle, const char* path, EVisionV2KeyboardLayout layout_) EVisionV2KeyboardController::EVisionV2KeyboardController(hid_device* dev_handle, const char* path, EVisionV2KeyboardLayout layout_)
{ {
const uint8_t sz = HID_MAX_STR;
wchar_t tmp[sz];
layout = layout_; layout = layout_;
dev = dev_handle; dev = dev_handle;
location = path; location = path;
hid_get_manufacturer_string(dev, tmp, sz); /*---------------------------------------------------------*\
std::wstring wName = std::wstring(tmp); | Get device name from HID manufacturer and product strings |
device_name = std::string(wName.begin(), wName.end()); \*---------------------------------------------------------*/
wchar_t name_string[HID_MAX_STR];
hid_get_product_string(dev, tmp, sz); hid_get_manufacturer_string(dev, name_string, HID_MAX_STR);
wName = std::wstring(tmp); device_name = StringUtils::wstring_to_string(name_string);
device_name.append(" ").append(std::string(wName.begin(), wName.end()));
hid_get_product_string(dev, name_string, HID_MAX_STR);
device_name.append(" ").append(StringUtils::wstring_to_string(name_string));
/*---------------------------------------------------------*\
| Get capabilities and layout |
\*---------------------------------------------------------*/
uint8_t buffer[7]; uint8_t buffer[7];
if(Read(EVISION_V2_CMD_READ_CAPABILITIES, 0, sizeof(buffer), buffer) < 0) if(Read(EVISION_V2_CMD_READ_CAPABILITIES, 0, sizeof(buffer), buffer) < 0)
{ {
return; return;
} }
if(buffer[0] != 0xaa && buffer[1] != 0x55) if(buffer[0] != 0xAA && buffer[1] != 0x55)
{ {
return; return;
} }
map_size = buffer[5]; map_size = buffer[5];
macros_size = buffer[6] * 0x80; macros_size = buffer[6] * 0x80;
switch(layout) switch(layout)