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

Removed duplicate GetKeyboardMappingLayoutType(int) declaration

Browse source 
* Refactored ValkyrieKeyboardController to fix pipeline
This commit is contained in:
Chris M 2024-02-02 07:54:59 +11:00
parent 249aa81423
commit e4fa1013f5
4 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp
View file

@ -268,10 +268,9 @@ static const char *normal_led_names[] =
@comment
\*-------------------------------------------------------------------*/
RGBController_ValkyrieKeyboard::RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr, ValkyrieKeyboardMappingLayoutType keyboard_layout)
RGBController_ValkyrieKeyboard::RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr)
{
controller = controller_ptr;
layout = keyboard_layout;
name = "Valkyrie Keyboard Device";
vendor = "Valkyrie";
@ -309,6 +308,15 @@ RGBController_ValkyrieKeyboard::~RGBController_ValkyrieKeyboard()
void RGBController_ValkyrieKeyboard::SetupZones()
{
ValkyrieKeyboardMappingLayoutType layout;
switch(controller->GetInterfaceNum())
{
case 3:
layout = PRO_LAYOUT;
default:
layout = NORMAL_LAYOUT;
}
/*---------------------------------------------------------*\
| Set up zones |
\*---------------------------------------------------------*/

3
Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h
View file

@ -21,7 +21,7 @@ enum ValkyrieKeyboardMappingLayoutType
class RGBController_ValkyrieKeyboard : public RGBController
{
public:
RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr, ValkyrieKeyboardMappingLayoutType keyboard_layout);
RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr);
~RGBController_ValkyrieKeyboard();
void SetupZones();
@ -33,5 +33,4 @@ public:
private:
ValkyrieKeyboardController* controller;
ValkyrieKeyboardMappingLayoutType layout;
};

1
Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp
View file

@ -57,7 +57,6 @@ int ValkyrieKeyboardController::GetInterfaceNum()
void ValkyrieKeyboardController::SendColors(unsigned char* color_data,unsigned int color_data_size)
{
// unsigned char* color_data_ptr = color_data;
unsigned char usb_buf_pro[392];
unsigned char usb_buf_normal[408];
int led_num = 0;

23
Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp
View file

@ -1,19 +1,7 @@
#include "Detector.h"
#include "ValkyrieKeyboardController.h"
#include <hidapi/hidapi.h>
#include "Detector.h"
#include "RGBController.h"
#include "RGBController_ValkyrieKeyboard.h"
#include <hidapi/hidapi.h>
ValkyrieKeyboardMappingLayoutType GetKeyboardMappingLayoutType(int interface)
{
switch(interface)
{
case 3:
return PRO_LAYOUT;
default:
return NORMAL_LAYOUT;
}
}
void DetectValkyrieKeyboardControllers(hid_device_info* info, const std::string& name)
{
@ -21,10 +9,9 @@ void DetectValkyrieKeyboardControllers(hid_device_info* info, const std::string&
if(dev)
{
ValkyrieKeyboardController* controller = new ValkyrieKeyboardController(dev, info->path, info->product_id, info->interface_number);
ValkyrieKeyboardMappingLayoutType layout = GetKeyboardMappingLayoutType(info->interface_number);
RGBController_ValkyrieKeyboard* rgb_controller = new RGBController_ValkyrieKeyboard(controller, layout);
rgb_controller->name = name;
ValkyrieKeyboardController* controller = new ValkyrieKeyboardController(dev, info->path, info->product_id, info->interface_number);
RGBController_ValkyrieKeyboard* rgb_controller = new RGBController_ValkyrieKeyboard(controller);
rgb_controller->name = name;
ResourceManager::get()->RegisterRGBController(rgb_controller);
}
}