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

Fix wstring to string conversion warnings in EpomakerController.cpp

Browse source
This commit is contained in:
Adam Honse 2024-07-29 21:27:41 -05:00
parent b0d2954a56
commit 8b9a5b460f
2 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Controllers/EpomakerController/EpomakerController.cpp
View file

@ -12,34 +12,29 @@
#include <math.h>
#include "EpomakerController.h"
#include "LogManager.h"
#include "StringUtils.h"
EpomakerController::EpomakerController(hid_device* dev_handle, char *_path)
{
const int szTemp = 128;
wchar_t tmpName[szTemp];
dev = dev_handle;
location = _path;
dev = dev_handle;
/*---------------------------------------------------------*\
| Get device name from HID manufacturer and product strings |
\*---------------------------------------------------------*/
wchar_t name_string[HID_MAX_STR];
hid_get_manufacturer_string(dev, tmpName, szTemp);
std::wstring wName = std::wstring(tmpName);
device_name = std::string(wName.begin(), wName.end());
hid_get_manufacturer_string(dev, name_string, HID_MAX_STR);
device_name = StringUtils::wstring_to_string(name_string);
hid_get_product_string(dev, tmpName, szTemp);
wName = std::wstring(tmpName);
device_name.append(" ").append(std::string(wName.begin(), wName.end()));
hid_get_serial_number_string(dev, tmpName, szTemp);
wName = std::wstring(tmpName);
serial = std::string(wName.begin(), wName.end());
location = _path;
current_mode = EPOMAKER_MODE_ALWAYS_ON;
current_speed = EPOMAKER_SPEED_DEFAULT;
current_brightness = EPOMAKER_BRIGHTNESS_DEFAULT;
current_dazzle = EPOMAKER_OPTION_DAZZLE_OFF;
current_option = EPOMAKER_OPTION_DEFAULT;
hid_get_product_string(dev, name_string, HID_MAX_STR);
device_name.append(" ").append(StringUtils::wstring_to_string(name_string));
current_mode = EPOMAKER_MODE_ALWAYS_ON;
current_speed = EPOMAKER_SPEED_DEFAULT;
current_brightness = EPOMAKER_BRIGHTNESS_DEFAULT;
current_dazzle = EPOMAKER_OPTION_DAZZLE_OFF;
current_option = EPOMAKER_OPTION_DEFAULT;
}
EpomakerController::~EpomakerController()
@ -49,17 +44,25 @@ EpomakerController::~EpomakerController()
std::string EpomakerController::GetDeviceName()
{
return (device_name);
return(device_name);
}
std::string EpomakerController::GetSerial()
{
return (serial);
wchar_t serial_string[128];
int ret = hid_get_serial_number_string(dev, serial_string, 128);
if(ret != 0)
{
return("");
}
return(StringUtils::wstring_to_string(serial_string));
}
std::string EpomakerController::GetLocation()
{
return ("HID: " + location);
return("HID: " + location);
}
void EpomakerController::SetMode(unsigned char mode, unsigned char speed, unsigned char brightness)

2
Controllers/EpomakerController/EpomakerController.h
View file

@ -18,6 +18,7 @@
#define EPOMAKER_COMMAND_RGB 0x07
#define EPOMAKER_COMMAND_SET 0xF60A
#define EPOMAKER_COMMAND_PING 0xF7
#define HID_MAX_STR 255
enum
{
@ -107,7 +108,6 @@ public:
private:
std::string device_name;
std::string serial;
std::string location;
hid_device* dev;