diff --git a/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp b/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp index 3c445333..40d18656 100644 --- a/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp +++ b/Controllers/DuckyKeyboardController/DuckyKeyboardController.cpp @@ -10,9 +10,10 @@ #include #include "DuckyKeyboardController.h" -DuckyKeyboardController::DuckyKeyboardController(hid_device* dev_handle) +DuckyKeyboardController::DuckyKeyboardController(hid_device* dev_handle, const char* path) { - dev = dev_handle; + dev = dev_handle; + location = path; SendInitialize(); } @@ -22,6 +23,11 @@ DuckyKeyboardController::~DuckyKeyboardController() } +std::string DuckyKeyboardController::GetDeviceLocation() +{ + return(location); +} + void DuckyKeyboardController::SendColors ( unsigned char* color_data, @@ -184,4 +190,4 @@ void DuckyKeyboardController::SendTerminateColorPacket() | Send packet | \*-----------------------------------------------------*/ hid_write(dev, (unsigned char *)usb_buf, 65); -} \ No newline at end of file +} diff --git a/Controllers/DuckyKeyboardController/DuckyKeyboardController.h b/Controllers/DuckyKeyboardController/DuckyKeyboardController.h index f0aec3d4..019b6c57 100644 --- a/Controllers/DuckyKeyboardController/DuckyKeyboardController.h +++ b/Controllers/DuckyKeyboardController/DuckyKeyboardController.h @@ -17,9 +17,11 @@ class DuckyKeyboardController { public: - DuckyKeyboardController(hid_device* dev_handle); + DuckyKeyboardController(hid_device* dev_handle, const char* path); ~DuckyKeyboardController(); + std::string GetDeviceLocation(); + void SendColors ( unsigned char* color_data, @@ -28,6 +30,7 @@ public: private: hid_device* dev; + std::string location; void SendInitialize(); void SendInitializeColorPacket(); @@ -38,4 +41,4 @@ private: unsigned int color_size ); void SendTerminateColorPacket(); -}; \ No newline at end of file +}; diff --git a/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp b/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp index b0a6b0bd..16ea3aae 100644 --- a/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp +++ b/Controllers/DuckyKeyboardController/DuckyKeyboardControllerDetect.cpp @@ -67,7 +67,7 @@ void DetectDuckyKeyboardControllers(std::vector& rgb_controllers if( dev ) { - DuckyKeyboardController* controller = new DuckyKeyboardController(dev); + DuckyKeyboardController* controller = new DuckyKeyboardController(dev, info->path); RGBController_DuckyKeyboard* rgb_controller = new RGBController_DuckyKeyboard(controller); diff --git a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp index 5d620298..0d72588b 100644 --- a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp +++ b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp @@ -178,6 +178,7 @@ RGBController_DuckyKeyboard::RGBController_DuckyKeyboard(DuckyKeyboardController name = "Ducky Keyboard Device"; type = DEVICE_TYPE_KEYBOARD; description = "Ducky Keyboard Device"; + location = ducky->GetDeviceLocation(); mode Direct; Direct.name = "Direct";