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

Add new Controller Nollie1

Browse source
This commit is contained in:
诺诺 2024-03-04 15:10:54 +00:00 • committed by Adam Honse
parent e508f3f4fa
commit beec2c76c9
4 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Controllers/NollieController/NollieController.cpp
View file

@ -128,6 +128,9 @@ void NollieController::SendPacketFS(unsigned char channel,unsigned char packet_i
case NOLLIE8_PID: case NOLLIE8_PID:
packet_interval = 6; packet_interval = 6;
break; break;
case NOLLIE1_PID:
packet_interval = 30;
break;
default: default:
packet_interval = 25; packet_interval = 25;
break; break;
@ -140,7 +143,7 @@ void NollieController::SendPacketFS(unsigned char channel,unsigned char packet_i
usb_buf[0x02 + (color_idx * 3)] = RGBGetRValue(colors[color_idx]); usb_buf[0x02 + (color_idx * 3)] = RGBGetRValue(colors[color_idx]);
usb_buf[0x03 + (color_idx * 3)] = RGBGetGValue(colors[color_idx]); usb_buf[0x03 + (color_idx * 3)] = RGBGetGValue(colors[color_idx]);
usb_buf[0x04 + (color_idx * 3)] = RGBGetBValue(colors[color_idx]); usb_buf[0x04 + (color_idx * 3)] = RGBGetBValue(colors[color_idx]);
if(dev_pid == NOLLIE8_PID) if(dev_pid == NOLLIE8_PID || dev_pid == NOLLIE1_PID )
{ {
usb_buf[0x02 + (color_idx * 3)] = RGBGetGValue(colors[color_idx]); usb_buf[0x02 + (color_idx * 3)] = RGBGetGValue(colors[color_idx]);
usb_buf[0x03 + (color_idx * 3)] = RGBGetRValue(colors[color_idx]); usb_buf[0x03 + (color_idx * 3)] = RGBGetRValue(colors[color_idx]);

1
Controllers/NollieController/NollieControllerDetect.cpp
View file

@ -36,6 +36,7 @@ void DetectNollieControllers(hid_device_info* info, const std::string& name)
REGISTER_HID_DETECTOR("Nollie 32CH", DetectNollieControllers, NOLLIE32_VID, NOLLIE32_PID); REGISTER_HID_DETECTOR("Nollie 32CH", DetectNollieControllers, NOLLIE32_VID, NOLLIE32_PID);
REGISTER_HID_DETECTOR("Nollie 16CH", DetectNollieControllers, NOLLIE16_VID, NOLLIE16_PID); REGISTER_HID_DETECTOR("Nollie 16CH", DetectNollieControllers, NOLLIE16_VID, NOLLIE16_PID);
REGISTER_HID_DETECTOR("Nollie 8CH", DetectNollieControllers, NOLLIE8_VID, NOLLIE8_PID); REGISTER_HID_DETECTOR("Nollie 8CH", DetectNollieControllers, NOLLIE8_VID, NOLLIE8_PID);
REGISTER_HID_DETECTOR("Nollie 1CH", DetectNollieControllers, NOLLIE1_VID, NOLLIE1_PID);
REGISTER_HID_DETECTOR("Nollie 28 12", DetectNollieControllers, NOLLIE28_12_VID, NOLLIE28_12_PID); REGISTER_HID_DETECTOR("Nollie 28 12", DetectNollieControllers, NOLLIE28_12_VID, NOLLIE28_12_PID);
REGISTER_HID_DETECTOR("Nollie 28 L1", DetectNollieControllers, NOLLIE28_12_VID, NOLLIE28_L1_PID); REGISTER_HID_DETECTOR("Nollie 28 L1", DetectNollieControllers, NOLLIE28_12_VID, NOLLIE28_L1_PID);
REGISTER_HID_DETECTOR("Nollie 28 L2", DetectNollieControllers, NOLLIE28_12_VID, NOLLIE28_L2_PID); REGISTER_HID_DETECTOR("Nollie 28 L2", DetectNollieControllers, NOLLIE28_12_VID, NOLLIE28_L2_PID);

4
Controllers/NollieController/RGBController_Nollie.cpp
View file

@ -70,6 +70,10 @@ void RGBController_Nollie::SetupZones()
channels_num = NOLLIE8_CHANNELS_NUM; channels_num = NOLLIE8_CHANNELS_NUM;
ch_led_num = NOLLIE_8_CH_LED_NUM; ch_led_num = NOLLIE_8_CH_LED_NUM;
break; break;
case NOLLIE1_PID:
channels_num = NOLLIE1_CHANNELS_NUM;
ch_led_num = NOLLIE_1_CH_LED_NUM;
break;
default: default:
channels_num = NOLLIE8_CHANNELS_NUM; channels_num = NOLLIE8_CHANNELS_NUM;
ch_led_num = NOLLIE_FS_CH_LED_NUM; ch_led_num = NOLLIE_FS_CH_LED_NUM;

5
Controllers/NollieController/RGBController_Nollie.h
View file

@ -13,6 +13,7 @@
#define NOLLIE_12_CH_LED_NUM 42 #define NOLLIE_12_CH_LED_NUM 42
#define NOLLIE_8_CH_LED_NUM 126 #define NOLLIE_8_CH_LED_NUM 126
#define NOLLIE_1_CH_LED_NUM 630
#define NOLLIE_HS_CH_LED_NUM 256 #define NOLLIE_HS_CH_LED_NUM 256
#define NOLLIE_FS_CH_LED_NUM 525 #define NOLLIE_FS_CH_LED_NUM 525
@ -28,6 +29,10 @@
#define NOLLIE8_PID 0x1F01 #define NOLLIE8_PID 0x1F01
#define NOLLIE8_VID 0x16D2 #define NOLLIE8_VID 0x16D2
#define NOLLIE1_CHANNELS_NUM 1
#define NOLLIE1_PID 0x1F11
#define NOLLIE1_VID 0x16D2
#define NOLLIE28_12_CHANNELS_NUM 12 #define NOLLIE28_12_CHANNELS_NUM 12
#define NOLLIE28_12_VID 0x16D2 #define NOLLIE28_12_VID 0x16D2
#define NOLLIE28_12_PID 0x1616 #define NOLLIE28_12_PID 0x1616