From 84f7f32ec28d21ee5846e09de87cebeeaa802d8d Mon Sep 17 00:00:00 2001 From: denk_mal Date: Fri, 19 Feb 2021 10:10:03 +0100 Subject: [PATCH] reformat code --- .../DasKeyboardController.cpp | 36 ++++++++++--------- .../DasKeyboardController.h | 6 ++-- .../DasKeyboardControllerDetect.cpp | 2 +- .../RGBController_DasKeyboard.cpp | 6 ++-- .../RGBController_DasKeyboard.h | 15 ++++---- 5 files changed, 35 insertions(+), 30 deletions(-) diff --git a/Controllers/DasKeyboardController/DasKeyboardController.cpp b/Controllers/DasKeyboardController/DasKeyboardController.cpp index b22a75f0..582c068f 100644 --- a/Controllers/DasKeyboardController/DasKeyboardController.cpp +++ b/Controllers/DasKeyboardController/DasKeyboardController.cpp @@ -14,10 +14,10 @@ using namespace std::chrono_literals; DasKeyboardController::DasKeyboardController(hid_device *dev_handle, const char *path) { - dev = dev_handle; - location = path; - version = ""; - useTraditionalSendData = false; + dev = dev_handle; + location = path; + version = ""; + useTraditionalSendData = false; SendInitialize(); } @@ -34,8 +34,8 @@ std::string DasKeyboardController::GetDeviceLocation() std::string DasKeyboardController::GetSerialString() { - wchar_t serial_string[128] = {}; - int err = hid_get_serial_number_string(dev, serial_string, 128); + wchar_t serial_string[128] = {}; + int err = hid_get_serial_number_string(dev, serial_string, 128); std::string return_string; if(!err) @@ -91,7 +91,7 @@ std::string DasKeyboardController::GetLayoutString() void DasKeyboardController::SendColors(unsigned char key_id, unsigned char mode, unsigned char red, unsigned char green, unsigned char blue) { - if (key_id < 130) + if(key_id < 130) { unsigned char usb_buf[] = {0xEA, 0x08, @@ -196,7 +196,7 @@ void DasKeyboardController::SendDataModern(const unsigned char *data, const unsi unsigned char usb_buf[65]; unsigned int err_cnt = 3; - int res = -1; + int res = -1; while(res == -1) { /*-----------------------------------------------------*\ @@ -210,9 +210,9 @@ void DasKeyboardController::SendDataModern(const unsigned char *data, const unsi usb_buf[idx + 1] = data[idx]; chk_sum ^= data[idx]; } - usb_buf[length+1] = chk_sum; + usb_buf[length + 1] = chk_sum; - res = hid_send_feature_report(dev, usb_buf, length+2); + res = hid_send_feature_report(dev, usb_buf, length + 2); if(res == -1) { if(!err_cnt--) @@ -244,17 +244,19 @@ void DasKeyboardController::SendDataTraditional(const unsigned char *data, const for(unsigned int idx = 0; idx < length + 1; idx += 7) { usb_buf[0] = 1; - for (unsigned int fld_idx = 1; fld_idx < 8; fld_idx++) + for(unsigned int fld_idx = 1; fld_idx < 8; fld_idx++) { unsigned int tmp_idx = idx + fld_idx - 1; - if (tmp_idx < length) + if(tmp_idx < length) { usb_buf[fld_idx] = data[tmp_idx]; chk_sum ^= data[tmp_idx]; - } else if (tmp_idx == length) + } + else if(tmp_idx == length) { usb_buf[fld_idx] = chk_sum; - } else + } + else { usb_buf[fld_idx] = 0; } @@ -278,8 +280,8 @@ void DasKeyboardController::SendDataTraditional(const unsigned char *data, const int DasKeyboardController::ReceiveData(unsigned char *data, const unsigned int max_length) { - unsigned char usb_buf[9]; - std::vectorreceive_buf; + unsigned char usb_buf[9]; + std::vector receive_buf; /*-----------------------------------------------------*\ | Fill data from receive buffer | @@ -310,7 +312,7 @@ int DasKeyboardController::ReceiveData(unsigned char *data, const unsigned int m /*-----------------------------------------------------*\ | clean up data buffer | \*-----------------------------------------------------*/ - for (unsigned int ii = 0; ii < max_length; ii++) + for(unsigned int ii = 0; ii < max_length; ii++) { data[ii] = 0; } diff --git a/Controllers/DasKeyboardController/DasKeyboardController.h b/Controllers/DasKeyboardController/DasKeyboardController.h index 9940eb5f..72bdc1bb 100644 --- a/Controllers/DasKeyboardController/DasKeyboardController.h +++ b/Controllers/DasKeyboardController/DasKeyboardController.h @@ -35,15 +35,17 @@ public: void SendApply(); private: - hid_device *dev; + hid_device *dev; std::string location; std::string version; - bool useTraditionalSendData; + bool useTraditionalSendData; void SendInitialize(); void SendData(const unsigned char *data, unsigned int length); + void SendDataTraditional(const unsigned char *data, unsigned int length); + void SendDataModern(const unsigned char *data, unsigned int length); int ReceiveData(unsigned char *data, unsigned int max_length); diff --git a/Controllers/DasKeyboardController/DasKeyboardControllerDetect.cpp b/Controllers/DasKeyboardController/DasKeyboardControllerDetect.cpp index a51f4376..001efaad 100644 --- a/Controllers/DasKeyboardController/DasKeyboardControllerDetect.cpp +++ b/Controllers/DasKeyboardController/DasKeyboardControllerDetect.cpp @@ -48,7 +48,7 @@ void DetectDasKeyboardControllers(hid_device_info *info_in, const std::string &n if(dev) { - DasKeyboardController* controller = new DasKeyboardController(dev, info->path); + DasKeyboardController *controller = new DasKeyboardController(dev, info->path); if(controller->GetLayoutString() == "NONE") { diff --git a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp index 27949995..a5e2ab39 100644 --- a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp +++ b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp @@ -193,7 +193,7 @@ RGBController_DasKeyboard::RGBController_DasKeyboard(DasKeyboardController *das_ { das = das_ptr; - for(unsigned int ii=0; ii < zone_sizes[0]; ii++) + for(unsigned int ii = 0; ii < zone_sizes[0]; ii++) { double_buffer.push_back(-1); } @@ -272,7 +272,7 @@ void RGBController_DasKeyboard::SetupZones() { new_zone.matrix_map->map = (unsigned int *) &matrix_map_eu; } - + zones.push_back(new_zone); total_led_count += zone_sizes[zone_idx]; @@ -281,7 +281,7 @@ void RGBController_DasKeyboard::SetupZones() for(unsigned int led_idx = 0; led_idx < total_led_count; led_idx++) { led new_led; - new_led.name = led_names[led_idx]; + new_led.name = led_names[led_idx]; leds.push_back(new_led); } diff --git a/Controllers/DasKeyboardController/RGBController_DasKeyboard.h b/Controllers/DasKeyboardController/RGBController_DasKeyboard.h index 7832098d..eeb41c81 100644 --- a/Controllers/DasKeyboardController/RGBController_DasKeyboard.h +++ b/Controllers/DasKeyboardController/RGBController_DasKeyboard.h @@ -14,10 +14,10 @@ enum { - DAS_KEYBOARD_MODE_DIRECT = 0x01, - DAS_KEYBOARD_MODE_FLASHING = 0x1F, - DAS_KEYBOARD_MODE_BREATHING = 0x08, - DAS_KEYBOARD_MODE_SPECTRUM_CYCLE = 0x14 + DAS_KEYBOARD_MODE_DIRECT = 0x01, + DAS_KEYBOARD_MODE_FLASHING = 0x1F, + DAS_KEYBOARD_MODE_BREATHING = 0x08, + DAS_KEYBOARD_MODE_SPECTRUM_CYCLE = 0x14 }; @@ -25,6 +25,7 @@ class RGBController_DasKeyboard : public RGBController { public: RGBController_DasKeyboard(DasKeyboardController *das_ptr); + ~RGBController_DasKeyboard(); void SetupZones(); @@ -42,8 +43,8 @@ public: void DeviceUpdateMode(); private: - DasKeyboardController* das; + DasKeyboardController *das; - std::vector double_buffer; - bool updateDevice; + std::vector double_buffer; + bool updateDevice; };