From 155ad165b12fd8ea8a3b2c5708186ba3847f5aee Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 22 Aug 2019 18:43:17 -0500 Subject: [PATCH] Reorganization! Move all controllers into their own folders, move all RGBController wrappers into one folder, move i2c_smbus and serial_port dependencies into folders, and move main application/UI stuff into folders. Should help lead into creating a proper library --- .../AuraController}/AuraController.cpp | 0 .../AuraController}/AuraController.h | 0 .../AuraController}/AuraControllerDetect.cpp | 0 .../CorsairController}/CorsairController.cpp | 0 .../CorsairController}/CorsairController.h | 0 .../CorsairControllerDetect.cpp | 0 .../CorsairProController.cpp | 0 .../CorsairProController.h | 0 .../CorsairProControllerDetect.cpp | 0 .../HyperXController}/HyperXController.cpp | 0 .../HyperXController}/HyperXController.h | 0 .../HyperXControllerDetect.cpp | 0 .../LEDStripController.cpp | 0 .../LEDStripController}/LEDStripController.h | 0 .../LEDStripControllerDetect.cpp | 0 .../OpenAuraSDK.cpp => OpenAuraSDK.cpp | 0 OpenAuraSDK/OpenAuraSDK.h => OpenAuraSDK.h | 0 OpenAuraSDK.pro | 91 ++++++++++-------- ...OpenAuraSDK.vcxproj => OpenAuraSDK.vcxproj | 0 ...roj.filters => OpenAuraSDK.vcxproj.filters | 0 OpenAuraSDK/dllmain.cpp | Bin 906 -> 0 bytes .../OpenRazerDetect.cpp | 0 .../RGBController.h | 0 .../RGBController_AorusGPU.cpp | 0 .../RGBController_AorusGPU.h | 0 .../RGBController_Aura.cpp | 0 .../RGBController_Aura.h | 0 .../RGBController_Corsair.cpp | 0 .../RGBController_Corsair.h | 0 .../RGBController_CorsairPro.cpp | 0 .../RGBController_CorsairPro.h | 0 .../RGBController_HyperX.cpp | 0 .../RGBController_HyperX.h | 0 .../RGBController_LEDStrip.cpp | 0 .../RGBController_LEDStrip.h | 0 .../RGBController_OpenRazer.cpp | 0 .../RGBController_OpenRazer.h | 0 {OpenAuraSDK => i2c_smbus}/i2c_smbus.cpp | 0 {OpenAuraSDK => i2c_smbus}/i2c_smbus.h | 0 {OpenAuraSDK => i2c_smbus}/i2c_smbus_i801.cpp | 0 {OpenAuraSDK => i2c_smbus}/i2c_smbus_i801.h | 0 .../i2c_smbus_linux.cpp | 0 {OpenAuraSDK => i2c_smbus}/i2c_smbus_linux.h | 0 .../i2c_smbus_nuvoton_nct6793d.cpp | 0 .../i2c_smbus_nuvoton_nct6793d.h | 0 .../i2c_smbus_piix4.cpp | 0 {OpenAuraSDK => i2c_smbus}/i2c_smbus_piix4.h | 0 OpenAuraSDK/main.cpp => main.cpp | 0 {OpenAuraSDK => qt}/OpenAuraSDKQtDialog.cpp | 0 {OpenAuraSDK => qt}/OpenAuraSDKQtDialog.h | 0 {OpenAuraSDK => qt}/openaurasdk.ui | 0 {OpenAuraSDK => serial_port}/serial_port.cpp | 0 {OpenAuraSDK => serial_port}/serial_port.h | 0 {OpenAuraSDK => vc}/I2CDetectDialog.cpp | 0 {OpenAuraSDK => vc}/I2CDetectDialog.h | 0 {OpenAuraSDK => vc}/OpenAuraSDKDialog.cpp | 0 {OpenAuraSDK => vc}/OpenAuraSDKDialog.h | 0 {OpenAuraSDK => vc}/Resource.rc | Bin {OpenAuraSDK => vc}/resource.h | 0 {OpenAuraSDK => wmi}/wmi.cpp | 0 {OpenAuraSDK => wmi}/wmi.h | 0 61 files changed, 51 insertions(+), 40 deletions(-) rename {OpenAuraSDK => Controllers/AuraController}/AuraController.cpp (100%) rename {OpenAuraSDK => Controllers/AuraController}/AuraController.h (100%) rename {OpenAuraSDK => Controllers/AuraController}/AuraControllerDetect.cpp (100%) rename {OpenAuraSDK => Controllers/CorsairController}/CorsairController.cpp (100%) rename {OpenAuraSDK => Controllers/CorsairController}/CorsairController.h (100%) rename {OpenAuraSDK => Controllers/CorsairController}/CorsairControllerDetect.cpp (100%) rename {OpenAuraSDK => Controllers/CorsairProController}/CorsairProController.cpp (100%) rename {OpenAuraSDK => Controllers/CorsairProController}/CorsairProController.h (100%) rename {OpenAuraSDK => Controllers/CorsairProController}/CorsairProControllerDetect.cpp (100%) rename {OpenAuraSDK => Controllers/HyperXController}/HyperXController.cpp (100%) rename {OpenAuraSDK => Controllers/HyperXController}/HyperXController.h (100%) rename {OpenAuraSDK => Controllers/HyperXController}/HyperXControllerDetect.cpp (100%) rename {OpenAuraSDK => Controllers/LEDStripController}/LEDStripController.cpp (100%) rename {OpenAuraSDK => Controllers/LEDStripController}/LEDStripController.h (100%) rename {OpenAuraSDK => Controllers/LEDStripController}/LEDStripControllerDetect.cpp (100%) rename OpenAuraSDK/OpenAuraSDK.cpp => OpenAuraSDK.cpp (100%) rename OpenAuraSDK/OpenAuraSDK.h => OpenAuraSDK.h (100%) rename OpenAuraSDK/OpenAuraSDK.vcxproj => OpenAuraSDK.vcxproj (100%) rename OpenAuraSDK/OpenAuraSDK.vcxproj.filters => OpenAuraSDK.vcxproj.filters (100%) delete mode 100644 OpenAuraSDK/dllmain.cpp rename {OpenAuraSDK => RGBController}/OpenRazerDetect.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController.h (100%) rename {OpenAuraSDK => RGBController}/RGBController_AorusGPU.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController_AorusGPU.h (100%) rename {OpenAuraSDK => RGBController}/RGBController_Aura.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController_Aura.h (100%) rename {OpenAuraSDK => RGBController}/RGBController_Corsair.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController_Corsair.h (100%) rename {OpenAuraSDK => RGBController}/RGBController_CorsairPro.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController_CorsairPro.h (100%) rename {OpenAuraSDK => RGBController}/RGBController_HyperX.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController_HyperX.h (100%) rename {OpenAuraSDK => RGBController}/RGBController_LEDStrip.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController_LEDStrip.h (100%) rename {OpenAuraSDK => RGBController}/RGBController_OpenRazer.cpp (100%) rename {OpenAuraSDK => RGBController}/RGBController_OpenRazer.h (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus.cpp (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus.h (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_i801.cpp (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_i801.h (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_linux.cpp (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_linux.h (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_nuvoton_nct6793d.cpp (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_nuvoton_nct6793d.h (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_piix4.cpp (100%) rename {OpenAuraSDK => i2c_smbus}/i2c_smbus_piix4.h (100%) rename OpenAuraSDK/main.cpp => main.cpp (100%) rename {OpenAuraSDK => qt}/OpenAuraSDKQtDialog.cpp (100%) rename {OpenAuraSDK => qt}/OpenAuraSDKQtDialog.h (100%) rename {OpenAuraSDK => qt}/openaurasdk.ui (100%) rename {OpenAuraSDK => serial_port}/serial_port.cpp (100%) rename {OpenAuraSDK => serial_port}/serial_port.h (100%) rename {OpenAuraSDK => vc}/I2CDetectDialog.cpp (100%) rename {OpenAuraSDK => vc}/I2CDetectDialog.h (100%) rename {OpenAuraSDK => vc}/OpenAuraSDKDialog.cpp (100%) rename {OpenAuraSDK => vc}/OpenAuraSDKDialog.h (100%) rename {OpenAuraSDK => vc}/Resource.rc (100%) rename {OpenAuraSDK => vc}/resource.h (100%) rename {OpenAuraSDK => wmi}/wmi.cpp (100%) rename {OpenAuraSDK => wmi}/wmi.h (100%) diff --git a/OpenAuraSDK/AuraController.cpp b/Controllers/AuraController/AuraController.cpp similarity index 100% rename from OpenAuraSDK/AuraController.cpp rename to Controllers/AuraController/AuraController.cpp diff --git a/OpenAuraSDK/AuraController.h b/Controllers/AuraController/AuraController.h similarity index 100% rename from OpenAuraSDK/AuraController.h rename to Controllers/AuraController/AuraController.h diff --git a/OpenAuraSDK/AuraControllerDetect.cpp b/Controllers/AuraController/AuraControllerDetect.cpp similarity index 100% rename from OpenAuraSDK/AuraControllerDetect.cpp rename to Controllers/AuraController/AuraControllerDetect.cpp diff --git a/OpenAuraSDK/CorsairController.cpp b/Controllers/CorsairController/CorsairController.cpp similarity index 100% rename from OpenAuraSDK/CorsairController.cpp rename to Controllers/CorsairController/CorsairController.cpp diff --git a/OpenAuraSDK/CorsairController.h b/Controllers/CorsairController/CorsairController.h similarity index 100% rename from OpenAuraSDK/CorsairController.h rename to Controllers/CorsairController/CorsairController.h diff --git a/OpenAuraSDK/CorsairControllerDetect.cpp b/Controllers/CorsairController/CorsairControllerDetect.cpp similarity index 100% rename from OpenAuraSDK/CorsairControllerDetect.cpp rename to Controllers/CorsairController/CorsairControllerDetect.cpp diff --git a/OpenAuraSDK/CorsairProController.cpp b/Controllers/CorsairProController/CorsairProController.cpp similarity index 100% rename from OpenAuraSDK/CorsairProController.cpp rename to Controllers/CorsairProController/CorsairProController.cpp diff --git a/OpenAuraSDK/CorsairProController.h b/Controllers/CorsairProController/CorsairProController.h similarity index 100% rename from OpenAuraSDK/CorsairProController.h rename to Controllers/CorsairProController/CorsairProController.h diff --git a/OpenAuraSDK/CorsairProControllerDetect.cpp b/Controllers/CorsairProController/CorsairProControllerDetect.cpp similarity index 100% rename from OpenAuraSDK/CorsairProControllerDetect.cpp rename to Controllers/CorsairProController/CorsairProControllerDetect.cpp diff --git a/OpenAuraSDK/HyperXController.cpp b/Controllers/HyperXController/HyperXController.cpp similarity index 100% rename from OpenAuraSDK/HyperXController.cpp rename to Controllers/HyperXController/HyperXController.cpp diff --git a/OpenAuraSDK/HyperXController.h b/Controllers/HyperXController/HyperXController.h similarity index 100% rename from OpenAuraSDK/HyperXController.h rename to Controllers/HyperXController/HyperXController.h diff --git a/OpenAuraSDK/HyperXControllerDetect.cpp b/Controllers/HyperXController/HyperXControllerDetect.cpp similarity index 100% rename from OpenAuraSDK/HyperXControllerDetect.cpp rename to Controllers/HyperXController/HyperXControllerDetect.cpp diff --git a/OpenAuraSDK/LEDStripController.cpp b/Controllers/LEDStripController/LEDStripController.cpp similarity index 100% rename from OpenAuraSDK/LEDStripController.cpp rename to Controllers/LEDStripController/LEDStripController.cpp diff --git a/OpenAuraSDK/LEDStripController.h b/Controllers/LEDStripController/LEDStripController.h similarity index 100% rename from OpenAuraSDK/LEDStripController.h rename to Controllers/LEDStripController/LEDStripController.h diff --git a/OpenAuraSDK/LEDStripControllerDetect.cpp b/Controllers/LEDStripController/LEDStripControllerDetect.cpp similarity index 100% rename from OpenAuraSDK/LEDStripControllerDetect.cpp rename to Controllers/LEDStripController/LEDStripControllerDetect.cpp diff --git a/OpenAuraSDK/OpenAuraSDK.cpp b/OpenAuraSDK.cpp similarity index 100% rename from OpenAuraSDK/OpenAuraSDK.cpp rename to OpenAuraSDK.cpp diff --git a/OpenAuraSDK/OpenAuraSDK.h b/OpenAuraSDK.h similarity index 100% rename from OpenAuraSDK/OpenAuraSDK.h rename to OpenAuraSDK.h diff --git a/OpenAuraSDK.pro b/OpenAuraSDK.pro index d8530e87..0fa601c8 100644 --- a/OpenAuraSDK.pro +++ b/OpenAuraSDK.pro @@ -5,47 +5,58 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = OpenAuraSDK.bin TEMPLATE = app -SOURCES += \ - OpenAuraSDK/i2c_smbus.cpp \ - OpenAuraSDK/AuraController.cpp \ - OpenAuraSDK/AuraControllerDetect.cpp \ - OpenAuraSDK/OpenAuraSDK.cpp \ - OpenAuraSDK/i2c_smbus_linux.cpp \ - OpenAuraSDK/OpenAuraSDKQtDialog.cpp \ - OpenAuraSDK/CorsairController.cpp \ - OpenAuraSDK/CorsairControllerDetect.cpp \ - OpenAuraSDK/CorsairProController.cpp \ - OpenAuraSDK/CorsairProControllerDetect.cpp \ - OpenAuraSDK/HyperXController.cpp \ - OpenAuraSDK/HyperXControllerDetect.cpp \ - OpenAuraSDK/LEDStripController.cpp \ - OpenAuraSDK/LEDStripControllerDetect.cpp \ - OpenAuraSDK/OpenRazerDetect.cpp \ - OpenAuraSDK/RGBController_Aura.cpp \ - OpenAuraSDK/RGBController_Corsair.cpp \ - OpenAuraSDK/RGBController_CorsairPro.cpp \ - OpenAuraSDK/RGBController_HyperX.cpp \ - OpenAuraSDK/RGBController_LEDStrip.cpp \ - OpenAuraSDK/RGBController_OpenRazer.cpp \ - OpenAuraSDK/main.cpp \ - OpenAuraSDK/serial_port.cpp +INCLUDEPATH += \ + i2c_smbus/ \ + serial_port/ \ + Controllers/AuraController/ \ + Controllers/CorsairController/ \ + Controllers/CorsairProController/ \ + Controllers/HyperXController/ \ + Controllers/LEDStripController/ \ + RGBController/ \ + qt/ + +SOURCES += \ + main.cpp \ + OpenAuraSDK.cpp \ + qt/OpenAuraSDKQtDialog.cpp \ + i2c_smbus/i2c_smbus.cpp \ + i2c_smbus/i2c_smbus_linux.cpp \ + serial_port/serial_port.cpp \ + Controllers/AuraController/AuraController.cpp \ + Controllers/AuraController/AuraControllerDetect.cpp \ + Controllers/CorsairController/CorsairController.cpp \ + Controllers/CorsairController/CorsairControllerDetect.cpp \ + Controllers/CorsairProController/CorsairProController.cpp \ + Controllers/CorsairProController/CorsairProControllerDetect.cpp \ + Controllers/HyperXController/HyperXController.cpp \ + Controllers/HyperXController/HyperXControllerDetect.cpp \ + Controllers/LEDStripController/LEDStripController.cpp \ + Controllers/LEDStripController/LEDStripControllerDetect.cpp \ + RGBController/OpenRazerDetect.cpp \ + RGBController/RGBController_Aura.cpp \ + RGBController/RGBController_Corsair.cpp \ + RGBController/RGBController_CorsairPro.cpp \ + RGBController/RGBController_HyperX.cpp \ + RGBController/RGBController_LEDStrip.cpp \ + RGBController/RGBController_OpenRazer.cpp HEADERS += \ - OpenAuraSDK/i2c_smbus.h \ - OpenAuraSDK/i2c_smbus_linux.h \ - OpenAuraSDK/AuraController.h \ - OpenAuraSDK/OpenAuraSDKQtDialog.h \ - OpenAuraSDK/CorsairController.h \ - OpenAuraSDK/CorsairProController.h \ - OpenAuraSDK/HyperXController.h \ - OpenAuraSDK/LEDStripController.h \ - OpenAuraSDK/RGBController.h \ - OpenAuraSDK/RGBController_Aura.h \ - OpenAuraSDK/RGBController_Corsair.h \ - OpenAuraSDK/RGBController_CorsairPro.h \ - OpenAuraSDK/RGBController_HyperX.h \ - OpenAuraSDK/RGBController_OpenRazer.h \ - OpenAuraSDK/serial_port.h + qt/OpenAuraSDKQtDialog.h \ + i2c_smbus/i2c_smbus.h \ + i2c_smbus/i2c_smbus_linux.h \ + serial_port/serial_port.h \ + Controllers/AuraController/AuraController.h \ + Controllers/CorsairController/CorsairController.h \ + Controllers/CorsairProController/CorsairProController.h \ + Controllers/HyperXController/HyperXController.h \ + Controllers/LEDStripController/LEDStripController.h \ + RGBController/RGBController.h \ + RGBController/RGBController_Aura.h \ + RGBController/RGBController_Corsair.h \ + RGBController/RGBController_CorsairPro.h \ + RGBController/RGBController_HyperX.h \ + RGBController/RGBController_OpenRazer.h FORMS += \ - OpenAuraSDK/openaurasdk.ui + qt/openaurasdk.ui diff --git a/OpenAuraSDK/OpenAuraSDK.vcxproj b/OpenAuraSDK.vcxproj similarity index 100% rename from OpenAuraSDK/OpenAuraSDK.vcxproj rename to OpenAuraSDK.vcxproj diff --git a/OpenAuraSDK/OpenAuraSDK.vcxproj.filters b/OpenAuraSDK.vcxproj.filters similarity index 100% rename from OpenAuraSDK/OpenAuraSDK.vcxproj.filters rename to OpenAuraSDK.vcxproj.filters diff --git a/OpenAuraSDK/dllmain.cpp b/OpenAuraSDK/dllmain.cpp deleted file mode 100644 index 44c1a0c401f1b6e0d2e4572add2e869d0005f854..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 906 zcmezWPoF`bL4hHKA%`J{A(tVMA(J7GL60Gsp@5-)L4m=FL4m=AA(bHwES}0x%%H$f z!jQp`%AmlI%8p7CQNp0Wkj9YDP=ut;g~5lxhe3fM5o~4-LncEq zLn1>7LncE$*e+fME(T?=?qr4>hEj$Uu<1$+7T1#}L90#1IK~FUT*xP`_v}C@^?1_%ir2xG;n=_%OIKC@^F&_%h@( zq%f2+Z`#d%(unha4um;X2@VrV9)@E z2_e5g%z>GJY91(Vi@`AniT8Mh0EQq2e+Fj;SB7AQV1{@GM}`oF5C%sEX9f=jD-^e2 z>J4G=U