Salastil/OpenRGB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix startup crash and other issues in VialRGB controller

Browse Source
This commit is contained in:
Richard Harris
2026-08-19 22:42:22 -05:00
committed by Adam Honse
parent 2df162408e
commit 15b784f6c6
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/QMKController/QMKVialRGBController/QMKVialRGBController.cpp
+9 -6
View File
@@ -150,7 +150,10 @@ std::string QMKVialRGBController::GetVersion()
| Format UID string |
\*-----------------------------------------------------*/
char uid_buf[17];
snprintf(uid_buf, sizeof(uid_buf), "%016llX", keyboard_uid);
unsigned char* uid_bytes = (unsigned char*)&keyboard_uid;
snprintf(uid_buf, sizeof(uid_buf), "%02X%02X%02X%02X%02X%02X%02X%02X",
uid_bytes[0], uid_bytes[1], uid_bytes[2], uid_bytes[3],
uid_bytes[4], uid_bytes[5], uid_bytes[6], uid_bytes[7]);
/*-----------------------------------------------------*\
| Format multi-line version text |
@@ -333,9 +336,9 @@ void QMKVialRGBController::CmdGetVialInfo
SendCommand(CMD_VIAL_COMMAND, VIAL_GET_KEYBOARD_ID, NULL, 0, data, sizeof(data));
memcpy(vial_protocol, &data[0], sizeof(int));
memcpy(keyboard_uid, &data[sizeof(int)], sizeof(unsigned long long));
memcpy(vialrgb_flag, &data[sizeof(int) + sizeof(unsigned long long)], sizeof(unsigned char));
memcpy(vial_protocol, &data[0], sizeof(unsigned int));
memcpy(keyboard_uid, &data[sizeof(unsigned int)], sizeof(unsigned long long));
memcpy(vialrgb_flag, &data[sizeof(unsigned int) + sizeof(unsigned long long)], sizeof(unsigned char));
}
void QMKVialRGBController::CmdGetVialRGBInfo
@@ -346,10 +349,10 @@ void QMKVialRGBController::CmdGetVialRGBInfo
{
unsigned char data[sizeof(unsigned short) + sizeof(unsigned char)];
SendCommand(CMD_VIAL_COMMAND, VIAL_GET_KEYBOARD_ID, NULL, 0, data, sizeof(data));
SendCheckCommand(CMD_LIGHTING_GET_VALUE, VIALRGB_GET_INFO, NULL, 0, data, sizeof(data));
memcpy(vialrgb_protocol_version, &data[0], sizeof(unsigned short));
memcpy(maximum_brightness, &data[sizeof(unsigned char)], sizeof(unsigned short));
memcpy(maximum_brightness, &data[sizeof(unsigned short)], sizeof(unsigned char));
}
void QMKVialRGBController::CmdGetViaProtocolVersion
Controllers/QMKController/QMKVialRGBController/QMKVialRGBControllerDetect.cpp
+4
View File
@@ -23,6 +23,9 @@
#define RASPBERRY_PI_VID 0x2E8A
#define RASPBERRY_PI_500_PLUS_PID 0x0011
#define YMDK_84_VID 0x20A0
#define YMDK_84_PID 0x422D
/*-----------------------------------------------------*\
| Usage and Usage Page |
\*-----------------------------------------------------*/
@@ -88,3 +91,4 @@ void RegisterQMKVialRGBDetectors()
REGISTER_DYNAMIC_DETECTOR("QMK VialRGB Devices", RegisterQMKVialRGBDetectors);
REGISTER_HID_DETECTOR_PU( "Raspberry Pi 500+", DetectQMKVialRGBControllers, RASPBERRY_PI_VID, RASPBERRY_PI_500_PLUS_PID, QMK_USAGE_PAGE, QMK_USAGE );
REGISTER_HID_DETECTOR_PU( "YMDK 84", DetectQMKVialRGBControllers, YMDK_84_VID, YMDK_84_PID, QMK_USAGE_PAGE, QMK_USAGE );
Controllers/QMKController/QMKVialRGBController/RGBController_QMKVialRGB.cpp
+10
View File
@@ -175,6 +175,11 @@ void RGBController_QMKVialRGB::SetupZones()
{
qmk_rgb_matrix_led_info info = controller->GetLEDInfo(led_index);
if(info.row == 0xFF || info.col == 0xFF)
{
continue;
}
if(info.col > max_col)
{
max_col = info.col;
@@ -197,6 +202,11 @@ void RGBController_QMKVialRGB::SetupZones()
{
qmk_rgb_matrix_led_info info = controller->GetLEDInfo(led_index);
if(info.row == 0xFF || info.col == 0xFF)
{
continue;
}
matrix_map[(width * info.row) + info.col] = (unsigned int)led_index;
}