Customize device name for RtkArgbController

- Adopt manufacturer + uuid as device name when the specified bit is ON.

Author: Jerry Fan

Controllers/RtkArgbController/RGBController_RtkArgb.cpp

@@ -26,7 +26,7 @@ RGBController_RtkArgb::RGBController_RtkArgb(RtkArgbWrapper *_wrapper)
 {
     this->wrapper = _wrapper;
 
-    name        = wrapper->get_product_name();
+    name        = wrapper->get_dev_name();
     vendor      = wrapper->get_manu_name();
     location    = wrapper->get_dev_loc();
     serial      = wrapper->get_sn();

Controllers/RtkArgbController/RtkArgbControllerDetect.cpp

@@ -17,6 +17,7 @@
 void DetectRtkArgbControllers(hid_device_info *info, const std::string &name)
 {
     RGBController_RtkArgb *controller = NULL;
+    RtkArgbWrapper *wrapper = NULL;
     static struct argb_device *dev = NULL;
     argbCtl *argb_ctl = NULL;
     int ret = -1;
@@ -46,7 +47,7 @@ void DetectRtkArgbControllers(hid_device_info *info, const std::string &name)
     }
     argb_ctl->sync_method = SYNC_METHOD_OPENRGB;
 
-    RtkArgbWrapper *wrapper = new RtkArgbWrapper(dev, argb_ctl, info);
+    wrapper = new RtkArgbWrapper(dev, argb_ctl, info);
     controller = new RGBController_RtkArgb(wrapper);
     if(controller->type != DEVICE_TYPE_UNKNOWN)
     {

Controllers/RtkArgbController/RtkArgbWrapper.cpp

@@ -102,6 +102,13 @@ void RtkArgbWrapper::argb_reinit()
     return;
 }
 
+static std::string int_to_hex_str(uint32_t value)
+{
+    char hex_str[20] = {0};
+    snprintf(hex_str, sizeof(hex_str), "%X", value);
+    return std::string(hex_str);
+}
+
 std::string RtkArgbWrapper::get_manu_name()
 {
     return wcharToString(hidinfo->manufacturer_string);
@@ -134,6 +141,34 @@ std::string RtkArgbWrapper::get_fw_ver()
     return ver;
 }
 
+std::string RtkArgbWrapper::get_ic_uuid()
+{
+    uint32_t uuid = 0;
+    std::string uuid_str = "";
+
+    if (bridge_get_uuid(adev, (uint8_t *)&uuid))
+        goto exit;
+
+    uuid_str = int_to_hex_str(uuid);
+exit:
+    return uuid_str;
+}
+
+std::string RtkArgbWrapper::get_dev_name()
+{
+    PGINFO info = { 0 };
+    std::string devname = get_product_name();
+
+    if (!pg_read(adev, &info))
+    {
+        if (info.customized_led[5] == CUST_DEVNAME_MANU_UUID)
+        {
+            devname = get_manu_name() + get_ic_uuid();
+        }
+    }
+    return devname;
+}
+
 int RtkArgbWrapper::get_fix_grps()
 {
     int fix_grps = 0;
@@ -219,7 +254,7 @@ int RtkArgbWrapper::set_argb_num(int grp_num, int new_num)
         if (led_argb_set_pos(adev, argb_ctl, group, poses, true))
             continue;
     }
-exit:
+
     if (poses)
     {
         free(poses);
@@ -232,13 +267,13 @@ int RtkArgbWrapper::set_argb_num(int grp_num, int new_num)
 int RtkArgbWrapper::set_argb_direct(int grp_num, std::vector<RGBColor> color_buf, unsigned short brightness)
 {
     int ret = -1;
-    int color_num = color_buf.size();
+    size_t color_num = color_buf.size();
     int buf_len = color_num * ARGB_COLOR_DEPTH;
     static unsigned short prev_bright = 0xFFFF;
     uint8_t *buf;
     std::lock_guard<std::mutex> lock(my_mutex);
 
-    if (color_num <= 0)
+    if (color_num == 0)
         goto exit;
 
     if (appctl[grp_num] != LED_CTL_APP)
@@ -259,7 +294,7 @@ int RtkArgbWrapper::set_argb_direct(int grp_num, std::vector<RGBColor> color_buf
 
     buf = (uint8_t*)malloc(buf_len);
     memset(buf, 0, buf_len);
-    for (int i = 0; i < color_num; i++)
+    for (size_t i = 0; i < color_num; i++)
     {
         buf[i * ARGB_COLOR_DEPTH + 0] = RGBGetRValue(color_buf[i]);
         buf[i * ARGB_COLOR_DEPTH + 1] = RGBGetGValue(color_buf[i]);

Controllers/RtkArgbController/RtkArgbWrapper.h

@@ -37,6 +37,12 @@ enum RTK_ARGB_CYCLE_MS
     RTK_ARGB_CYCLE_MAX = 10000,
 };
 
+enum RTK_ARGB_CUST_DEVNAME
+{
+    CUST_DEVNAME_NULL = 0x0,
+    CUST_DEVNAME_MANU_UUID = 0x1,
+};
+
 class RtkArgbWrapper
 {
 public:
@@ -49,6 +55,8 @@ class RtkArgbWrapper
     std::string get_sn();
     std::string get_dev_loc();
     std::string get_fw_ver();
+    std::string get_ic_uuid();
+    std::string get_dev_name();
     int get_fix_grps();
     int get_argb_num(int grp_num);
     int get_argb_brightness(int grp_num);