From 524675108d787bcc2b8387b94781d4491e4a1e7b Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 25 May 2022 17:58:59 +1000 Subject: [PATCH] Automatic generation of markdown pages for supported devices + Added build-supported-devices.sh script + Added new target in CI/CD to build at compile time --- .gitlab-ci.yml | 25 ++ .../RGBController_AMDWraithPrism.cpp | 1 + .../RGBController_ASRockPolychromeSMBus.cpp | 3 +- .../RGBController_ASRockPolychromeUSB.cpp | 17 +- .../RGBController_Alienware.cpp | 5 +- .../RGBController_AlienwareAW510K.cpp | 1 + .../RGBController_AnnePro2.cpp | 23 +- .../RGBController_AsusAuraCore.cpp | 3 +- .../RGBController_AsusAuraGPU.cpp | 15 +- .../RGBController_AsusAuraHeadsetStand.cpp | 1 + .../RGBController_AsusAuraKeyboard.cpp | 3 +- .../RGBController_AsusAuraMonitor.cpp | 1 + .../RGBController_AsusAuraMouse.cpp | 1 + .../RGBController_AsusAuraMousemat.cpp | 3 +- .../RGBController_AsusAuraStrixEvolve.cpp | 1 + .../RGBController_AsusAuraTUFKeyboard.cpp | 3 +- .../RGBController_AsusAuraUSB.cpp | 3 +- .../RGBController_ROGStrixLC_Controller.cpp | 1 + .../RGBController_AsusTUFLaptopWMI.cpp | 1 + .../RGBController_BlinkyTape.cpp | 1 + .../RGBController_CMARGBController.cpp | 1 + .../RGBController_CMMKController.cpp | 31 +-- .../RGBController_CMMM711Controller.cpp | 1 + .../RGBController_CMMMController.cpp | 1 + .../RGBController_CMMP750Controller.cpp | 1 + .../RGBController_CMR6000Controller.cpp | 3 +- .../RGBController_CMRGBController.cpp | 1 + .../RGBController_CMSmallARGBController.cpp | 1 + .../RGBController_CorsairCommanderCore.cpp | 1 + ...RGBController_CorsairDominatorPlatinum.cpp | 1 + .../RGBController_CorsairHydro.cpp | 3 +- .../RGBController_CorsairHydroPlatinum.cpp | 1 + .../RGBController_CorsairLightingNode.cpp | 3 +- .../RGBController_CorsairK100.cpp | 1 + .../RGBController_CorsairK55RGBPRO.cpp | 1 + .../RGBController_CorsairK65Mini.cpp | 1 + .../RGBController_CorsairPeripheral.cpp | 7 +- .../RGBController_CorsairVengeance.cpp | 1 + .../RGBController_CorsairVengeancePro.cpp | 3 +- .../RGBController_CorsairWireless.cpp | 1 + .../RGBController_CougarRevengerST.cpp | 1 + .../RGBController_CreativeSoundBlasterXG6.cpp | 1 + .../RGBController_Crucial.cpp | 3 +- .../RGBController_DarkProjectKeyboard.cpp | 5 +- .../RGBController_DasKeyboard.cpp | 1 + .../DebugController/RGBController_Debug.cpp | 5 +- .../RGBController_DuckyKeyboard.cpp | 7 +- .../RGBController_DygmaRaise.cpp | 71 ++--- .../E131Controller/RGBController_E131.cpp | 13 +- .../RGBController_EKController.cpp | 1 + .../RGBController_ENESMBus.cpp | 5 +- .../RGBController_EVGAGPUv3.cpp | 7 +- .../RGBController_EVGAGP102.cpp | 1 + .../RGBController_EVGAGPUv1.cpp | 1 + .../RGBController_EVGAGPUv2.cpp | 3 +- .../RGBController_EVGAKeyboard.cpp | 1 + .../RGBController_EVisionKeyboard.cpp | 5 +- .../RGBController_Espurna.cpp | 1 + .../FanBusController/RGBController_FanBus.cpp | 1 + .../RGBController_Faustus.cpp | 1 + .../RGBController_GainwardGPUv1.cpp | 1 + .../RGBController_GainwardGPUv2.cpp | 3 +- .../RGBController_GalaxGPU.cpp | 1 + .../RGBController_AorusATC800.cpp | 1 + .../RGBController_GigabyteRGBFusion2DRAM.cpp | 1 + .../RGBController_GigabyteRGBFusion2GPU.cpp | 3 +- .../RGBController_GigabyteRGBFusion2SMBus.cpp | 1 + .../RGBController_GigabyteRGBFusion2USB.cpp | 9 +- .../RGBController_GigabyteRGBFusion.cpp | 1 + .../RGBController_GigabyteRGBFusionGPU.cpp | 1 + .../RGBController_HPOmen30L.cpp | 3 +- .../RGBController_HoltekA070.cpp | 1 + .../RGBController_HoltekA1FA.cpp | 1 + .../RGBController_HyperXDRAM.cpp | 1 + .../RGBController_HyperXAlloyElite.cpp | 1 + .../RGBController_HyperXAlloyElite2.cpp | 1 + .../RGBController_HyperXAlloyFPS.cpp | 1 + .../RGBController_HyperXAlloyOrigins.cpp | 3 +- .../RGBController_HyperXAlloyOriginsCore.cpp | 15 +- .../RGBController_HyperXPulsefireDart.cpp | 1 + .../RGBController_HyperXPulsefireFPSPro.cpp | 5 +- .../RGBController_HyperXPulsefireHaste.cpp | 5 +- .../RGBController_HyperXPulsefireSurge.cpp | 5 +- .../RGBController_HyperXMousemat.cpp | 5 +- .../RGBController_KeychronKeyboard.cpp | 1 + .../RGBController_LEDStrip.cpp | 1 + .../LIFXController/RGBController_LIFX.cpp | 1 + .../RGBController_LexipMouse.cpp | 1 + .../RGBController_LianLiUniHub.cpp | 1 + .../RGBController_LinuxLED.cpp | 1 + .../RGBController_LogitechG203L.cpp | 3 +- .../RGBController_LogitechG213.cpp | 1 + .../RGBController_LogitechG560.cpp | 1 + .../RGBController_LogitechG810.cpp | 5 +- .../RGBController_LogitechG815.cpp | 1 + .../RGBController_LogitechG910.cpp | 5 +- .../RGBController_LogitechG915.cpp | 1 + .../RGBController_LogitechG933.cpp | 5 +- .../RGBController_LogitechGLightsync.cpp | 1 + .../RGBController_LogitechGLightsync1zone.cpp | 1 + .../RGBController_LogitechGPowerPlay.cpp | 1 + .../RGBController_LogitechGProKeyboard.cpp | 5 +- .../RGBController_LogitechLightspeed.cpp | 1 + .../RGBController_LogitechX56.cpp | 5 +- .../RGBController_MSI3Zone.cpp | 1 + .../MSIGPUController/RGBController_MSIGPU.cpp | 1 + .../RGBController_MSIMysticLight162.cpp | 7 +- .../RGBController_MSIMysticLight185.cpp | 7 +- .../RGBController_MSIOptix.cpp | 3 +- .../MSIRGBController/RGBController_MSIRGB.cpp | 3 +- .../RGBController_NZXTHue2.cpp | 11 +- .../RGBController_NZXTHuePlus.cpp | 5 +- .../RGBController_NZXTKraken.cpp | 3 +- .../RGBController_Nanoleaf.cpp | 15 +- .../RGBController_Nanoleaf.h | 10 - .../RGBController_NvidiaESA.cpp | 1 + .../RGBController_OpenRazer.cpp | 25 +- .../RGBController_OpenRazerWindows.cpp | 29 +- .../PNYGPUController/RGBController_PNYGPU.cpp | 1 + .../RGBController_PatriotViper.cpp | 1 + .../RGBController_PatriotViperSteel.cpp | 1 + .../RGBController_PhilipsHue.cpp | 1 + .../RGBController_PhilipsHueEntertainment.cpp | 17 +- .../RGBController_PhilipsWiz.cpp | 1 + .../RGBController_QMKOpenRGBRev9.cpp | 1 + .../RazerController/RGBController_Razer.cpp | 1 + .../RGBController_RazerAddressable.cpp | 3 +- .../RGBController_RazerKraken.cpp | 1 + .../RGBController_RedragonM711.cpp | 3 +- .../RGBController_RoccatHordeAimo.cpp | 3 +- .../RGBController_RoccatKoneAimo.cpp | 1 + .../RGBController_RoccatVulcanAimo.cpp | 1 + .../RGBController_SapphireNitroGlowV1.cpp | 1 + .../RGBController_SapphireNitroGlowV3.cpp | 1 + .../RGBController_Sinowealth.cpp | 1 + .../RGBController_Sinowealth1007.cpp | 3 +- .../RGBController_SinowealthKeyboard.cpp | 1 + .../RGBController_SinowealthKeyboard16.cpp | 5 +- .../RGBController_SonyDS4.cpp | 5 +- .../RGBController_SteelSeriesApex.cpp | 7 +- .../RGBController_SteelSeriesApexTZone.cpp | 3 +- .../RGBController_SteelSeriesArctis5.cpp | 1 + .../RGBController_SteelSeriesOldApex.cpp | 25 +- .../RGBController_SteelSeriesQCKMat.cpp | 5 +- .../RGBController_SteelSeriesRival.cpp | 11 +- .../RGBController_SteelSeriesRival3.cpp | 9 +- .../RGBController_SteelSeriesSensei.cpp | 7 +- .../RGBController_SteelSeriesSiberia.cpp | 5 +- .../RGBController_Tecknet.cpp | 1 + .../RGBController_ThermaltakePoseidonZRGB.cpp | 3 +- .../RGBController_ThermaltakeRiing.cpp | 3 +- .../RGBController_ThermaltakeRiingQuad.cpp | 3 +- .../RGBController_BlinkController.cpp | 1 + .../RGBController_TrustGXT114.cpp | 5 +- .../RGBController_TrustGXT180.cpp | 3 +- .../RGBController_WootingKeyboard.cpp | 3 +- .../RGBController_Yeelight.cpp | 1 + .../RGBController_ZETEdgeAirPro.cpp | 3 +- .../RGBController_ZETBladeOptical.cpp | 1 + .../RGBController_ZalmanZSync.cpp | 3 +- RGBController/RGBController_Dummy.cpp | 3 +- scripts/build-supported-devices-md.sh | 247 ++++++++++++++++++ scripts/build-udev-rules.sh | 15 +- 163 files changed, 699 insertions(+), 265 deletions(-) create mode 100755 scripts/build-supported-devices-md.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f72d60b..258b1ab8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,31 @@ before_script: - export QT_SELECT=qt5 - export APPIMAGE_EXTRACT_AND_RUN=1 +#-----------------------------------------------------------------------# +# Supported Devices Build Target # +#-----------------------------------------------------------------------# +"Supported Devices": + <<: *ccache_init + image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64 + stage: build + script: + - qmake + - make -j$(nproc) + - ./scripts/build-supported-devices-md.sh $CI_PROJECT_DIR $CI_COMMIT_SHORT_SHA + + artifacts: + name: "${CI_PROJECT_NAME}_Supported_Devices_${CI_COMMIT_SHORT_SHA}" + paths: + - ./*.md + exclude: + - README.md + - CONTRIBUTING.md + expire_in: 30 days + + rules: + - if: '$CI_PROJECT_PATH == "CalcProgrammer1/OpenRGB"' + when: on_success + #-----------------------------------------------------------------------# # Linux (AppImage) 32-bit Build Target # #-----------------------------------------------------------------------# diff --git a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp index 472168ea..dc57f6e2 100644 --- a/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp +++ b/Controllers/AMDWraithPrismController/RGBController_AMDWraithPrism.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name AMD Wraith Prism + @category Cooler @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp index 4657099f..d5b3e723 100644 --- a/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp +++ b/Controllers/ASRockPolychromeSMBusController/RGBController_ASRockPolychromeSMBus.cpp @@ -34,6 +34,7 @@ static const char* polychrome_v2_zone_names[] = /**------------------------------------------------------------------*\ @name ASRock Polychrome SMBus + @category Motherboard @type SMBus @save :warning: @direct :x: @@ -506,7 +507,7 @@ void RGBController_Polychrome::SetupZones() { new_zone->name = polychrome_v2_zone_names[zone_idx]; } - + if(zone_idx == POLYCHROME_ZONE_ADDRESSABLE) { new_zone->leds_min = 1; diff --git a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp index c7ba04df..7f2a48ba 100755 --- a/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp +++ b/Controllers/ASRockPolychromeUSBController/RGBController_ASRockPolychromeUSB.cpp @@ -15,6 +15,7 @@ /**------------------------------------------------------------------*\ @name ASrock Polychrome USB + @category Motherboard @type USB @save :warning: @direct :x: @@ -203,15 +204,15 @@ void RGBController_PolychromeUSB::SetupZones() zones[channel_idx].name = polychrome_USB_zone_names[device_info.zone_type]; zones[channel_idx].leds_min = 0; zones[channel_idx].leds_max = ASROCK_ADDRESSABLE_MAX_LEDS; - zones[channel_idx].leds_count = device_info.num_leds; + zones[channel_idx].leds_count = device_info.num_leds; } - else if(device_info.device_type==PolychromeDeviceType::FIXED) + else if(device_info.device_type==PolychromeDeviceType::FIXED) { zones[channel_idx].name = polychrome_USB_zone_names[device_info.zone_type]; zones[channel_idx].leds_min = device_info.num_leds; zones[channel_idx].leds_max = device_info.num_leds; - zones[channel_idx].leds_count = device_info.num_leds; - } + zones[channel_idx].leds_count = device_info.num_leds; + } for(unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) @@ -247,7 +248,7 @@ void RGBController_PolychromeUSB::SetupZones() for (unsigned int channel_idx = 0; channel_idx < zones.size(); channel_idx++) { PolychromeZoneInfo zoneinfo; - zoneinfo = controller->GetZoneConfig(channel_idx); + zoneinfo = controller->GetZoneConfig(channel_idx); zones_info.push_back(zoneinfo); } @@ -320,7 +321,7 @@ unsigned char RGBController_PolychromeUSB::GetDeviceMode(unsigned char zone) dev_mode = controller->GetZoneConfig(zone).mode; active_mode = dev_mode; - return(active_mode); + return(active_mode); } void RGBController_PolychromeUSB::SetCustomMode() @@ -337,10 +338,10 @@ void RGBController_PolychromeUSB::DeviceUpdateMode() unsigned char set_mode =(unsigned char) modes[active_mode].value; zones_info[zone_idx].mode =(unsigned char) modes[active_mode].value; zones_info[zone_idx].speed =(unsigned char) modes[active_mode].speed; - + if(set_mode > modes.size()) { - set_mode = active_mode; + set_mode = active_mode; } controller->WriteZone(zone_idx, set_mode, zones_info[zone_idx].speed, zones[zone_idx].colors[0], false); diff --git a/Controllers/AlienwareController/RGBController_Alienware.cpp b/Controllers/AlienwareController/RGBController_Alienware.cpp index 341917b1..362edf3e 100644 --- a/Controllers/AlienwareController/RGBController_Alienware.cpp +++ b/Controllers/AlienwareController/RGBController_Alienware.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name Alienware + @category Keyboard @type USB @save :x: @direct :x: @@ -147,7 +148,7 @@ void RGBController_Alienware::SetupZones() for(unsigned int led_idx = 0; led_idx < zones.size(); led_idx++) { led new_led; - + new_led.name = zones[led_idx].name + std::string(" LED"); leds.emplace_back(new_led); @@ -228,7 +229,7 @@ void RGBController_Alienware::DeviceUpdateMode() uint16_t period = 0x07d0; controller->SetMode(zone_idx, current_mode.value); - + switch(current_mode_idx) { case ALIENWARE_MODE_COLOR: diff --git a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp index edf56a56..61e1b63d 100644 --- a/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp +++ b/Controllers/AlienwareKeyboardController/RGBController_AlienwareAW510K.cpp @@ -160,6 +160,7 @@ static const led_type led_names[] = /**------------------------------------------------------------------*\ @name Alienware AW510 Keyboard + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp index 96cf1792..6efcec24 100644 --- a/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp +++ b/Controllers/AnnePro2Controller/RGBController_AnnePro2.cpp @@ -18,7 +18,7 @@ static unsigned int matrix_map[5][14] = { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NA }, - { 41, NA, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NA }, + { 41, NA, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NA }, { 53, NA, 54, 55, NA, NA, 56, NA, NA, 57, 58, 59, 60, NA } }; static const char* zone_names[] = @@ -110,6 +110,7 @@ static const led_type led_names[] = /**------------------------------------------------------------------*\ @name Anne Pro 2 + @category Keyboard @type USB @save :x: @direct :white_check_mark: @@ -118,7 +119,7 @@ static const led_type led_names[] = @comment \*-------------------------------------------------------------------*/ -RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_ptr) +RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_ptr) { controller = controller_ptr; @@ -139,12 +140,12 @@ RGBController_AnnePro2::RGBController_AnnePro2(AnnePro2Controller* controller_pt SetupZones(); } -RGBController_AnnePro2::~RGBController_AnnePro2() +RGBController_AnnePro2::~RGBController_AnnePro2() { delete controller; } -void RGBController_AnnePro2::SetupZones() +void RGBController_AnnePro2::SetupZones() { /*---------------------------------------------------------*\ | Set up zones | @@ -187,14 +188,14 @@ void RGBController_AnnePro2::SetupZones() SetupColors(); } -void RGBController_AnnePro2::ResizeZone(int /*zone*/, int /*new_size*/) +void RGBController_AnnePro2::ResizeZone(int /*zone*/, int /*new_size*/) { /*---------------------------------------------------------*\ | This device does not support resizing zones | \*---------------------------------------------------------*/ } -void RGBController_AnnePro2::DeviceUpdateLEDs() +void RGBController_AnnePro2::DeviceUpdateLEDs() { const unsigned char frame_buf_length = LED_REAL_COUNT * 3; unsigned char frame_buf[frame_buf_length]; @@ -225,22 +226,22 @@ void RGBController_AnnePro2::DeviceUpdateLEDs() controller->SendDirect(frame_buf_length, frame_buf); } -void RGBController_AnnePro2::UpdateZoneLEDs(int /*zone*/) +void RGBController_AnnePro2::UpdateZoneLEDs(int /*zone*/) { DeviceUpdateLEDs(); } -void RGBController_AnnePro2::UpdateSingleLED(int /*led*/) +void RGBController_AnnePro2::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } -void RGBController_AnnePro2::SetCustomMode() +void RGBController_AnnePro2::SetCustomMode() { active_mode = 0; } -void RGBController_AnnePro2::DeviceUpdateMode() +void RGBController_AnnePro2::DeviceUpdateMode() { - + } diff --git a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp index 5e5b6d58..5a3e12d3 100644 --- a/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp +++ b/Controllers/AsusAuraCoreController/RGBController_AsusAuraCore.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Asus AURA Core + @category Keyboard,LEDStrip @type USB @save :x: @direct :warning: @@ -25,7 +26,7 @@ RGBController_AuraCore::RGBController_AuraCore(AuraCoreController* controller_pt name = "ASUS Aura Core Device"; vendor = "ASUS"; location = controller->GetDeviceLocation(); - serial = controller->GetSerialString(); + serial = controller->GetSerialString(); description = "ASUS Aura Core Device"; type = DEVICE_TYPE_UNKNOWN; diff --git a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp index 9ae00f2b..8eee3b08 100644 --- a/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp +++ b/Controllers/AsusAuraGPUController/RGBController_AsusAuraGPU.cpp @@ -18,7 +18,7 @@ int RGBController_AuraGPU::GetDeviceMode() if (controller->direct) { dev_mode = AURA_GPU_MODE_DIRECT; - } + } } switch(dev_mode) @@ -35,7 +35,7 @@ int RGBController_AuraGPU::GetDeviceMode() { active_mode = mode; modes[mode].color_mode = color_mode; - } + } } return(active_mode); @@ -43,10 +43,11 @@ int RGBController_AuraGPU::GetDeviceMode() /**------------------------------------------------------------------*\ @name Asus Aura GPU - @type I2C + @category GPU + @type SMBus @save :x: @direct :white_check_mark: - @effects :white_check_mark:: + @effects :white_check_mark: @detectors DetectAsusAuraGPUControllers @comment \*-------------------------------------------------------------------*/ @@ -165,7 +166,7 @@ void RGBController_AuraGPU::DeviceUpdateLEDs() { controller->SetLEDColorsDirect(red, grn, blu); } - else + else { controller->SetLEDColorsEffect(red, grn, blu); } @@ -191,7 +192,7 @@ void RGBController_AuraGPU::DeviceUpdateMode() { int new_mode = modes[active_mode].value; controller->direct = false; - + switch(new_mode) { // Set all LEDs to 0 and Mode to static as a workaround for the non existing Off Mode @@ -199,7 +200,7 @@ void RGBController_AuraGPU::DeviceUpdateMode() controller->SetLEDColorsEffect(0, 0, 0); new_mode = AURA_GPU_MODE_STATIC; break; - + // Direct mode is done by switching to Static and not applying color changes case AURA_GPU_MODE_DIRECT: controller->direct = true; diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp index 3f639681..536bf6f2 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraHeadsetStand.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Asus Aura Headset Stand + @category HeadsetStand @type USB @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp index a310d42a..8c24e587 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraKeyboard.cpp @@ -40,7 +40,7 @@ static unsigned int scope_tkl_matrix_map[6][18] = static unsigned int falchion_matrix_map[5][16] = { { 0, 5, 9, 14, 18, 22, 26, 31, 35, 39, 44, 49, 54, 58, NA, 63 }, { 1, NA, 6, 10, 15, 19, 23, 27, 32, 36, 40, 45, 50, 55, 59, 64 }, - { 2, NA, 7, 11, 16, 20, 24, 28, 33, 37, 41, 46, 51, 60, NA, 65 }, + { 2, NA, 7, 11, 16, 20, 24, 28, 33, 37, 41, 46, 51, 60, NA, 65 }, { 3, NA, 12, 17, 21, 25, 29, 34, 38, 42, 47, 52, 56, NA, 61, 66 }, { 4, 8, 13, NA, NA, NA, 30, NA, NA, NA, 43, 48, 53, 57, 62, 67 } }; @@ -345,6 +345,7 @@ static const std::vector default_65pct_led_names = /**------------------------------------------------------------------*\ @name Asus Aura Keyboard + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp index 07998712..82508a2b 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMonitor.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Asus Aura Monitor + @category LEDStrip @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp index ada3dfb0..3b4c4393 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMouse.cpp @@ -18,6 +18,7 @@ static std::string aura_mouse_zone_names[3] /**------------------------------------------------------------------*\ @name Asus Aura Mouse + @category Mouse @type USB @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp index 3e023eb2..4e0e9c05 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraMousemat.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Asus Aura Mousemat + @category Mousemat @type USB @save :white_check_mark: @direct :white_check_mark: @@ -259,7 +260,7 @@ void RGBController_AuraMousemat::DeviceUpdateMode() case AURA_MOUSEMAT_MODE_WAVE: pattern = modes[active_mode].colors.size() * 16 + modes[active_mode].direction; break; - case AURA_MOUSEMAT_MODE_WAVE_PLANE: + case AURA_MOUSEMAT_MODE_WAVE_PLANE: switch(modes[active_mode].direction) { case MODE_DIRECTION_LEFT: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp index 774e5f06..2458438a 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraStrixEvolve.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Asus Aura Strix Evolve + @category Mouse @type USB @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp index fffc6214..5f1ec4a7 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraTUFKeyboard.cpp @@ -13,6 +13,7 @@ /**------------------------------------------------------------------*\ @name Asus Aura TUF Keyboard + @category Keyboard @type USB @save :white_check_mark: @direct :white_check_mark: @@ -276,7 +277,7 @@ void RGBController_AuraTUFKeyboard::SetCustomMode() } void RGBController_AuraTUFKeyboard::DeviceUpdateMode() -{ +{ unsigned char color_mode; std::vector mode_colors; diff --git a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp index 2421b2c0..fe7f4bbf 100644 --- a/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_AsusAuraUSB.cpp @@ -11,12 +11,13 @@ /**------------------------------------------------------------------*\ @name Asus Aura USB + @category Motherboard @type USB @save :x: @direct :white_check_mark: @effects :white_check_mark: @detectors DetectAsusAuraUSBTerminal,DetectAsusAuraUSBAddressable,DetectAsusAuraUSBMotherboards - @comment The Asus AUra USB controller applies to most AMD and + @comment The Asus Aura USB controller applies to most AMD and Intel mainboards from the x470 and z390 chipsets onwards. \*-------------------------------------------------------------------*/ diff --git a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp b/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp index b0087f77..526cca86 100644 --- a/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp +++ b/Controllers/AsusAuraUSBController/RGBController_ROGStrixLC_Controller.cpp @@ -13,6 +13,7 @@ /**------------------------------------------------------------------*\ @name Asus ROG Strix Liquid Cooler + @category Cooler @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp index 10cbfbcb..e117e11e 100644 --- a/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp +++ b/Controllers/AsusTUFLaptopController/RGBController_AsusTUFLaptopWMI.cpp @@ -12,6 +12,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name Asus TUF Laptop + @category Keyboard @type WMI @save :x: @direct :white_check_mark: diff --git a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp index 2e871e47..0799e219 100644 --- a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp +++ b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Blinky Tape + @category LEDStrip @type Serial @save :x: @direct :white_check_mark: diff --git a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp b/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp index 606481f8..d20dd3cd 100644 --- a/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMARGBController.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Coolermaster ARGB + @category LEDStrip @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/CoolerMasterController/RGBController_CMMKController.cpp b/Controllers/CoolerMasterController/RGBController_CMMKController.cpp index e93ddf8d..7f4708a0 100644 --- a/Controllers/CoolerMasterController/RGBController_CMMKController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMMKController.cpp @@ -22,6 +22,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name Coolermaster Masterkeys Keyboards + @category Keyboard @type USB @save :warning: @direct :white_check_mark: @@ -41,7 +42,7 @@ RGBController_CMMKController::RGBController_CMMKController(CMMKController* contr version = controller->GetFirmwareVersion(); serial = ""; location = controller->GetLocation(); - + mode Direct; Direct.name = "Direct"; Direct.value = CMMK_MODE_MANUAL; @@ -58,7 +59,7 @@ RGBController_CMMKController::RGBController_CMMKController(CMMKController* contr Static.colors_max = 1; Static.colors.resize(1); modes.push_back(Static); - + mode Breathing; Breathing.name = "Breathing"; Breathing.value = CMMK_EFFECT_BREATHE; @@ -108,7 +109,7 @@ RGBController_CMMKController::RGBController_CMMKController(CMMKController* contr Wave.colors_max = 1; Wave.colors.resize(1); modes.push_back(Wave); - + mode Ripple; Ripple.name = "Ripple Effect"; Ripple.value = CMMK_EFFECT_RIPPLE; @@ -121,7 +122,7 @@ RGBController_CMMKController::RGBController_CMMKController(CMMKController* contr Ripple.colors_max = 2; Ripple.colors.resize(2); modes.push_back(Ripple); - + mode Cross; Cross.name = "Cross"; Cross.value = CMMK_EFFECT_CROSS; @@ -147,7 +148,7 @@ RGBController_CMMKController::RGBController_CMMKController(CMMKController* contr Raindrops.colors_max = 2; Raindrops.colors.resize(2); modes.push_back(Raindrops); - + mode Stars; Stars.name = "Starfield"; Stars.value = CMMK_EFFECT_STARS; @@ -224,7 +225,7 @@ void RGBController_CMMKController::SetupZones() std::stringstream namestrm; led key; - + namestrm << "Key @ Row " << (y + 1) << ", Column" << (x + 1); key.name = namestrm.str(); @@ -365,7 +366,7 @@ void RGBController_CMMKController::DeviceUpdateMode() case CMMK_MODE_FIRMWARE: controller->SetFirmwareControl(); break; - + case CMMK_MODE_MANUAL: controller->SetManualControl(); break; @@ -400,7 +401,7 @@ void RGBController_CMMKController::DeviceUpdateMode() controller->SetMode(cycle_effect); } break; - + case CMMK_EFFECT_SINGLE: { cmmk_effect_single single_effect; @@ -412,7 +413,7 @@ void RGBController_CMMKController::DeviceUpdateMode() controller->SetMode(single_effect); } break; - + case CMMK_EFFECT_WAVE: { cmmk_effect_wave wave_effect; @@ -424,7 +425,7 @@ void RGBController_CMMKController::DeviceUpdateMode() controller->SetMode(wave_effect); } break; - + case CMMK_EFFECT_RIPPLE: { cmmk_effect_ripple ripple_effect; @@ -445,7 +446,7 @@ void RGBController_CMMKController::DeviceUpdateMode() controller->SetMode(ripple_effect); } break; - + case CMMK_EFFECT_CROSS: { cmmk_effect_cross cross_effect; @@ -457,7 +458,7 @@ void RGBController_CMMKController::DeviceUpdateMode() controller->SetMode(cross_effect); } break; - + case CMMK_EFFECT_RAINDROPS: { cmmk_effect_raindrops raindrops_effect; @@ -474,12 +475,12 @@ void RGBController_CMMKController::DeviceUpdateMode() case CMMK_EFFECT_STARS: { cmmk_effect_stars stars_effect; - + stars_effect.speed = (uint8_t)modes[active_mode].speed; stars_effect.interval = CMMK_SPEED_MID; stars_effect.active = map_to_cmmk_rgb(modes[active_mode].colors[0]); stars_effect.rest = map_to_cmmk_rgb(modes[active_mode].colors[1]); - + controller->SetMode(stars_effect); } break; @@ -487,7 +488,7 @@ void RGBController_CMMKController::DeviceUpdateMode() case CMMK_EFFECT_SNAKE: { cmmk_effect_snake snake_effect; - + snake_effect.speed = (uint8_t)modes[active_mode].speed; controller->SetMode(snake_effect); diff --git a/Controllers/CoolerMasterController/RGBController_CMMM711Controller.cpp b/Controllers/CoolerMasterController/RGBController_CMMM711Controller.cpp index d25cd06b..99d78804 100644 --- a/Controllers/CoolerMasterController/RGBController_CMMM711Controller.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMMM711Controller.cpp @@ -13,6 +13,7 @@ /**------------------------------------------------------------------*\ @name Coolermaster Master Mouse + @category Mouse @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/CoolerMasterController/RGBController_CMMMController.cpp b/Controllers/CoolerMasterController/RGBController_CMMMController.cpp index c6fd9bcb..c6c58681 100644 --- a/Controllers/CoolerMasterController/RGBController_CMMMController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMMMController.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name Coolermaster Master Mouse + @category Mouse @type USB @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp index d35b57ca..f8b3d4b1 100644 --- a/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMMP750Controller.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Coolermaster Mouse Pad + @category Mousemat @type USB @save :warning: @direct :x: diff --git a/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp b/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp index 7fa39007..eb508901 100644 --- a/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMR6000Controller.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name AMD Radeon 6000 + @category GPU @type USB @save :x: @direct :white_check_mark: @@ -77,7 +78,7 @@ RGBController_CMR6000Controller::RGBController_CMR6000Controller(CMR6000Controll Breathing.colors_max = 1; Breathing.colors.resize(1); Breathing.speed = speed; - modes.push_back(Breathing); + modes.push_back(Breathing); SetupZones(); active_mode = 1; diff --git a/Controllers/CoolerMasterController/RGBController_CMRGBController.cpp b/Controllers/CoolerMasterController/RGBController_CMRGBController.cpp index e7137bdd..7e174dd8 100644 --- a/Controllers/CoolerMasterController/RGBController_CMRGBController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMRGBController.cpp @@ -45,6 +45,7 @@ /**------------------------------------------------------------------*\ @name Coolermaster RGB + @category LEDStrip @type USB @save :warning: @direct :x: diff --git a/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp b/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp index d8429542..9f9efce1 100644 --- a/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp +++ b/Controllers/CoolerMasterController/RGBController_CMSmallARGBController.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Coolermaster Small ARGB + @category LEDStrip @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp index 28b2acbf..acb90252 100644 --- a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp +++ b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Corsair Commander Core + @category Cooler @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp index f074a4fa..df933148 100644 --- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp +++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Corsair Dominator Platinum + @category RAM @type SMBus @save :x: @direct :white_check_mark: diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp index 2f10c263..74c8f79b 100644 --- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp +++ b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Corsair Hydro + @category Cooler @type USB @save :x: @direct :white_check_mark: @@ -86,7 +87,7 @@ RGBController_CorsairHydro::~RGBController_CorsairHydro() void RGBController_CorsairHydro::SetupZones() { zone new_zone; - + new_zone.name = "Pump Zone"; new_zone.type = ZONE_TYPE_SINGLE; new_zone.leds_min = 1; diff --git a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp index 5e15a2f9..5031ad13 100644 --- a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp +++ b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp @@ -21,6 +21,7 @@ static unsigned int matrix_map[5][5] = /**------------------------------------------------------------------*\ @name Corsair Hydro Platinum + @category Cooler @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp index eae0bbf4..69761018 100644 --- a/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp +++ b/Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Corsair Lighting Node + @category LEDStrip @type USB @save :warning: @direct :white_check_mark: @@ -259,7 +260,7 @@ void RGBController_CorsairLightingNode::SetupZones() } zones[channel_idx].matrix_map = NULL; - + for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) { char led_idx_string[4]; diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp index c0d0cfec..be9eaefe 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp @@ -221,6 +221,7 @@ typedef struct /**------------------------------------------------------------------*\ @name Corsair K100 Keyboard + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp index e945b9b2..daf9d299 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp @@ -11,6 +11,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name Corsair K55 RGB Pro + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp index c493fcf9..99b1f09e 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp @@ -122,6 +122,7 @@ std::vector> keys = /**------------------------------------------------------------------*\ @name Corsair K65 Mini + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp index 1e7e4a6e..026cadcf 100644 --- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp +++ b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp @@ -756,8 +756,9 @@ static const char* corsair_harpoon_pro_leds[] = /**------------------------------------------------------------------*\ @name Corsair Peripheral + @category Keyboard,Mouse,Mousemat,HeadsetStand @type USB - @save :white_check_mark: or :warning: or :x: + @save :x: @direct :white_check_mark: @effects :x: @detectors DetectCorsairPeripheralControllers @@ -1037,14 +1038,14 @@ void RGBController_CorsairPeripheral::SetupZones() new_led.name = corsair_mouse_leds[led_idx]; } break; - + case DEVICE_TYPE_MOUSEMAT: case DEVICE_TYPE_HEADSET_STAND: new_led.name = "Mousemat LED "; new_led.name.append(std::to_string(led_idx + 1)); break; } - + leds.push_back(new_led); } diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp index 568d8dd9..84846e7d 100644 --- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp +++ b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Corsair Vengeance + @category RAM @type SMBus @save :warning: @direct :x: diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp index 82534e71..a040ad6f 100644 --- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp +++ b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Corsair Vengeance Pro + @category RAM @type SMBus @save :warning: @direct :white_check_mark: @@ -291,7 +292,7 @@ void RGBController_CorsairVengeancePro::DeviceUpdateMode() mode_colors[3] = RGBGetRValue(modes[active_mode].colors[1]); mode_colors[4] = RGBGetGValue(modes[active_mode].colors[1]); mode_colors[5] = RGBGetBValue(modes[active_mode].colors[1]); - } + } } if (modes[active_mode].name == "Direct") diff --git a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp index 82807fab..0360ebc8 100644 --- a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp +++ b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp @@ -182,6 +182,7 @@ static const char* led_names[] = /**------------------------------------------------------------------*\ @name Corsair Wireless Peripheral + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CougarController/RGBController_CougarRevengerST.cpp b/Controllers/CougarController/RGBController_CougarRevengerST.cpp index b2e5e7a1..11ed8eab 100644 --- a/Controllers/CougarController/RGBController_CougarRevengerST.cpp +++ b/Controllers/CougarController/RGBController_CougarRevengerST.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name Cougar Revenger ST + @category Mouse @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp b/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp index 37c9ac76..518c796b 100644 --- a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp +++ b/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp @@ -2,6 +2,7 @@ /**------------------------------------------------------------------*\ @name Creative Sound BlasterX G6 + @category Headset @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/CrucialController/RGBController_Crucial.cpp b/Controllers/CrucialController/RGBController_Crucial.cpp index c6d3eb7f..46e4b996 100644 --- a/Controllers/CrucialController/RGBController_Crucial.cpp +++ b/Controllers/CrucialController/RGBController_Crucial.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Crucial RAM + @category RAM @type SMBus @save :x: @direct :white_check_mark: @@ -43,7 +44,7 @@ RGBController_Crucial::RGBController_Crucial(CrucialController* controller_ptr) Shift.flags = MODE_FLAG_HAS_PER_LED_COLOR; Shift.color_mode = MODE_COLORS_PER_LED; modes.push_back(Shift); - + mode GradientShift; GradientShift.name = "Gradient Shift"; GradientShift.value = CRUCIAL_MODE_GRADIENT_SHIFT; diff --git a/Controllers/DarkProject/RGBController_DarkProjectKeyboard.cpp b/Controllers/DarkProject/RGBController_DarkProjectKeyboard.cpp index 76ee4e32..851080b8 100644 --- a/Controllers/DarkProject/RGBController_DarkProjectKeyboard.cpp +++ b/Controllers/DarkProject/RGBController_DarkProjectKeyboard.cpp @@ -116,8 +116,9 @@ static const char *led_names[] = KEY_EN_RIGHT_ARROW }; -/** +/**------------------------------------------------------------------*\ @name Dark Project Keyboard + @category Keyboard @type USB @save :x: @direct :white_check_mark: @@ -125,7 +126,7 @@ static const char *led_names[] = @detectors DetectDarkProjectKeyboardControllers @comment The Dark Project keyboard controller currently supports the full size KD3B Version 2 (ANSI layout). -*/ +\*-------------------------------------------------------------------*/ RGBController_DarkProjectKeyboard::RGBController_DarkProjectKeyboard(DarkProjectKeyboardController *controller_ptr) { diff --git a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp index 9c6a4aa0..a9105882 100644 --- a/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp +++ b/Controllers/DasKeyboardController/RGBController_DasKeyboard.cpp @@ -192,6 +192,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name Das Keyboard + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/DebugController/RGBController_Debug.cpp b/Controllers/DebugController/RGBController_Debug.cpp index e03ca96c..4e7b172a 100644 --- a/Controllers/DebugController/RGBController_Debug.cpp +++ b/Controllers/DebugController/RGBController_Debug.cpp @@ -5,6 +5,7 @@ /**------------------------------------------------------------------*\ @name Debug + @category Unknown @type I2C @save :x: @direct :x: @@ -43,7 +44,7 @@ void RGBController_Debug::ResizeZone(int index, int new_size) // Add the new ammount of LEDs to the old ammount size_t new_leds_size = leds.size() - old_size + new_size; - + leds.resize(std::max(old_leds_size, new_leds_size)); memmove(&leds[zones[index].start_idx] + old_leds_size, &leds[zones[index].start_idx] + new_leds_size, (old_leds_size - zones[index].start_idx - old_size) * sizeof(led)); @@ -54,6 +55,6 @@ void RGBController_Debug::ResizeZone(int index, int new_size) { leds[zones[index].start_idx + i].name = "Linear LED " + std::to_string(i); } - + SetupColors(); } diff --git a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp index 0b09cc0b..aa9874da 100644 --- a/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp +++ b/Controllers/DuckyKeyboardController/RGBController_DuckyKeyboard.cpp @@ -188,9 +188,10 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name Ducky Keyboard + @category Keyboard @type USB @save :x: - @direct :white_check_mark + @direct :white_check_mark: @effects :x: @detectors DetectDuckyKeyboardControllers @comment @@ -291,11 +292,11 @@ void RGBController_DuckyKeyboard::ResizeZone(int /*zone*/, int /*new_size*/) | This device does not support resizing zones | \*---------------------------------------------------------*/ } - + void RGBController_DuckyKeyboard::DeviceUpdateLEDs() { unsigned char colordata[155*3]; - + for(std::size_t color_idx = 0; color_idx < colors.size(); color_idx++) { colordata[(color_idx*3)+0] = RGBGetRValue(colors[color_idx]); diff --git a/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp b/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp index 082e242e..77abe315 100644 --- a/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp +++ b/Controllers/DygmaRaiseController/RGBController_DygmaRaise.cpp @@ -17,8 +17,8 @@ static unsigned int kb_matrix_map_ISO[6][14] = { { 0, 1, 2, 3, 4, 5, 6, 39, 38, 37, 36, 35, 34, 33 }, { 7, 8, 9, 10, 11, 12, 47, 46, 45, 44, 43, 42, 41, 40 }, { 13, 14, 15, 16, 17, 18, 54, 53, 52, 51, 50, 49, 48, NA }, - { 19, 20, 21, 22, 23, 24, 25, 60, 59, 58, 57, 56, 55, NA }, - { 26, 27, 28, NA, 29, 30, NA, 66, 65, NA, 64, 63, 62, 61 }, + { 19, 20, 21, 22, 23, 24, 25, 60, 59, 58, 57, 56, 55, NA }, + { 26, 27, 28, NA, 29, 30, NA, 66, 65, NA, 64, 63, 62, 61 }, { NA, NA, NA, NA, 31, 32, NA, 68, 67, NA, NA, NA, NA, NA } }; static unsigned int underglow_matrix[11][14] = @@ -77,20 +77,20 @@ static const char* led_names[] = KEY_EN_D, KEY_EN_F, KEY_EN_G, - KEY_EN_LEFT_SHIFT, - KEY_EN_ISO_BACK_SLASH, + KEY_EN_LEFT_SHIFT, + KEY_EN_ISO_BACK_SLASH, KEY_EN_Z, KEY_EN_X, KEY_EN_C, KEY_EN_V, KEY_EN_B, - KEY_EN_LEFT_CONTROL, - KEY_EN_LEFT_WINDOWS, + KEY_EN_LEFT_CONTROL, + KEY_EN_LEFT_WINDOWS, KEY_EN_LEFT_ALT, - "Key: T1", - "Key: T2", - "Key: T3", - "Key: T4", + "Key: T1", + "Key: T2", + "Key: T3", + "Key: T4", KEY_EN_BACKSPACE, KEY_EN_EQUALS, KEY_EN_MINUS, @@ -98,9 +98,9 @@ static const char* led_names[] = KEY_EN_9, KEY_EN_8, KEY_EN_7, - KEY_EN_ANSI_ENTER, - KEY_EN_RIGHT_BRACKET, - KEY_EN_LEFT_BRACKET, + KEY_EN_ANSI_ENTER, + KEY_EN_RIGHT_BRACKET, + KEY_EN_LEFT_BRACKET, KEY_EN_P, KEY_EN_O, KEY_EN_I, @@ -113,24 +113,25 @@ static const char* led_names[] = KEY_EN_K, KEY_EN_J, KEY_EN_H, - KEY_EN_RIGHT_SHIFT, - KEY_EN_FORWARD_SLASH, + KEY_EN_RIGHT_SHIFT, + KEY_EN_FORWARD_SLASH, KEY_EN_PERIOD, KEY_EN_COMMA, KEY_EN_M, KEY_EN_N, - KEY_EN_RIGHT_CONTROL, - KEY_EN_RIGHT_WINDOWS, - KEY_EN_RIGHT_FUNCTION, - KEY_EN_RIGHT_ALT, - "Key: T6", - "Key: T5", - "Key: T8", - "Key: T7", + KEY_EN_RIGHT_CONTROL, + KEY_EN_RIGHT_WINDOWS, + KEY_EN_RIGHT_FUNCTION, + KEY_EN_RIGHT_ALT, + "Key: T6", + "Key: T5", + "Key: T8", + "Key: T7", }; /**------------------------------------------------------------------*\ @name Dygma Raise Keyboard + @category Keyboard @type Serial @save :x: @direct :white_check_mark: @@ -139,7 +140,7 @@ static const char* led_names[] = @comment \*-------------------------------------------------------------------*/ -RGBController_DygmaRaise::RGBController_DygmaRaise(DygmaRaiseController* controller_ptr) +RGBController_DygmaRaise::RGBController_DygmaRaise(DygmaRaiseController* controller_ptr) { controller = controller_ptr; @@ -159,12 +160,12 @@ RGBController_DygmaRaise::RGBController_DygmaRaise(DygmaRaiseController* control SetupZones(); } -RGBController_DygmaRaise::~RGBController_DygmaRaise() +RGBController_DygmaRaise::~RGBController_DygmaRaise() { delete controller; } -void RGBController_DygmaRaise::SetupZones() +void RGBController_DygmaRaise::SetupZones() { /*---------------------------------------------------------*\ | Set up zones | @@ -192,10 +193,10 @@ void RGBController_DygmaRaise::SetupZones() new_zone.matrix_map->width = 14; new_zone.matrix_map->map = (unsigned int *)&underglow_matrix; } - + zones.push_back(new_zone); } - + /*---------------------------------------------------------*\ | Set up keyboard LEDs | \*---------------------------------------------------------*/ @@ -226,7 +227,7 @@ void RGBController_DygmaRaise::SetupZones() SetupColors(); } -void RGBController_DygmaRaise::ResizeZone(int /*zone*/, int /*new_size*/) +void RGBController_DygmaRaise::ResizeZone(int /*zone*/, int /*new_size*/) { /*---------------------------------------------------------*\ | This device does not support resizing zones | @@ -234,27 +235,27 @@ void RGBController_DygmaRaise::ResizeZone(int /*zone*/, int /*new_size*/) } -void RGBController_DygmaRaise::DeviceUpdateLEDs() +void RGBController_DygmaRaise::DeviceUpdateLEDs() { controller->SendDirect(colors,leds.size()); } -void RGBController_DygmaRaise::UpdateZoneLEDs(int /*zone*/) +void RGBController_DygmaRaise::UpdateZoneLEDs(int /*zone*/) { DeviceUpdateLEDs(); } -void RGBController_DygmaRaise::UpdateSingleLED(int /*led*/) +void RGBController_DygmaRaise::UpdateSingleLED(int /*led*/) { DeviceUpdateLEDs(); } -void RGBController_DygmaRaise::SetCustomMode() +void RGBController_DygmaRaise::SetCustomMode() { active_mode = 0; } -void RGBController_DygmaRaise::DeviceUpdateMode() +void RGBController_DygmaRaise::DeviceUpdateMode() { - + } diff --git a/Controllers/E131Controller/RGBController_E131.cpp b/Controllers/E131Controller/RGBController_E131.cpp index d973ee96..badf8dc4 100644 --- a/Controllers/E131Controller/RGBController_E131.cpp +++ b/Controllers/E131Controller/RGBController_E131.cpp @@ -15,6 +15,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name E1.31 Devices + @category LEDStrip @type E1.31 @save :x: @direct :white_check_mark: @@ -114,7 +115,7 @@ RGBController_E131::RGBController_E131(std::vector device_list) for(unsigned int univ_list_idx = 0; univ_list_idx < universe_list.size(); univ_list_idx++) { location += std::to_string(universe_list[univ_list_idx]); - + if(univ_list_idx < (universe_list.size() - 1)) { location += ", "; @@ -135,7 +136,7 @@ RGBController_E131::RGBController_E131(std::vector device_list) | Create E1.31 socket | \*-----------------------------------------*/ sockfd = e131_socket(); - + keepalive_delay = 0ms; SetupZones(); @@ -291,7 +292,7 @@ RGBController_E131::RGBController_E131(std::vector device_list) } zones[device_idx].matrix_map = new_map; } - } + } if(keepalive_delay.count() > 0) { @@ -380,7 +381,7 @@ void RGBController_E131::DeviceUpdateLEDs() int color_idx = 0; last_update_time = std::chrono::steady_clock::now(); - + for(std::size_t device_idx = 0; device_idx < devices.size(); device_idx++) { float universe_size = devices[device_idx].universe_size; @@ -441,12 +442,12 @@ void RGBController_E131::DeviceUpdateLEDs() void RGBController_E131::UpdateZoneLEDs(int /*zone*/) { - DeviceUpdateLEDs(); + DeviceUpdateLEDs(); } void RGBController_E131::UpdateSingleLED(int /*led*/) { - DeviceUpdateLEDs(); + DeviceUpdateLEDs(); } void RGBController_E131::SetCustomMode() diff --git a/Controllers/EKController/RGBController_EKController.cpp b/Controllers/EKController/RGBController_EKController.cpp index ea897529..83c5e9fb 100644 --- a/Controllers/EKController/RGBController_EKController.cpp +++ b/Controllers/EKController/RGBController_EKController.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name EK Loop Connect + @category LEDStrip @type USB @save :warning: @direct :x: diff --git a/Controllers/ENESMBusController/RGBController_ENESMBus.cpp b/Controllers/ENESMBusController/RGBController_ENESMBus.cpp index ca5eb136..b1825619 100644 --- a/Controllers/ENESMBusController/RGBController_ENESMBus.cpp +++ b/Controllers/ENESMBusController/RGBController_ENESMBus.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name ENE SMBus Device + @category RAM,Motherboard,GPU,Storage @type SMBus @save :white_check_mark: @direct :white_check_mark: @@ -64,7 +65,7 @@ RGBController_ENESMBus::RGBController_ENESMBus(ENESMBusController * controller_p Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_MANUAL_SAVE; Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); - + mode Breathing; Breathing.name = "Breathing"; Breathing.value = ENE_MODE_BREATHING; @@ -361,7 +362,7 @@ void RGBController_ENESMBus::SetupZones() } new_zone->matrix_map = NULL; - + /*---------------------------------------------------------*\ | Push new zone to zones vector | \*---------------------------------------------------------*/ diff --git a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp index c4dbdf6d..152b5bdf 100644 --- a/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp +++ b/Controllers/EVGAAmpereGPUController/RGBController_EVGAGPUv3.cpp @@ -20,6 +20,7 @@ static const char* evga_v3_zone_names[] = /**------------------------------------------------------------------*\ @name EVGA RGB v3 GPU + @category GPU @type I2C @save :white_check_mark: @direct :white_check_mark: @@ -167,7 +168,7 @@ RGBController_EVGAGPUv3::RGBController_EVGAGPUv3(EVGAGPUv3Controller* evga_ptr) for( uint8_t zone_idx = 0; zone_idx < zoneIndexMap.size(); zone_idx++) { active_mode = evga->GetZoneMode(0); // Hard coding zone 0 until per zone modes are available. - + if(active_mode != EVGA_GPU_V3_MODE_OFF) { EVGAv3_config hw_config = evga->GetZoneConfig(zoneIndexMap[zone_idx], active_mode); @@ -266,7 +267,7 @@ void RGBController_EVGAGPUv3::DeviceUpdateLEDs() | modes and as such colorB will always be black (0x000000) | \*---------------------------------------------------------*/ EVGAv3_config zone_config; - + zone_config.brightness = modes[active_mode].brightness; zone_config.speed = modes[active_mode].speed; zone_config.direction = modes[active_mode].direction; @@ -311,7 +312,7 @@ void RGBController_EVGAGPUv3::DeviceUpdateMode() for(uint8_t zone = 0; zone < 4; zone++) { evga->SetZoneMode(zone, modes[active_mode].value); - } + } */ //LOG_TRACE("[%s] Updating to mode %1d", evga->evgaGPUName, modes[active_mode].value); DeviceUpdateLEDs(); diff --git a/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp index 0963c689..93501532 100644 --- a/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp +++ b/Controllers/EVGAGP102GPUController/RGBController_EVGAGP102.cpp @@ -12,6 +12,7 @@ /**------------------------------------------------------------------*\ @name EVGA GP102 GPU + @category GPU @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp index c98ccc40..d1c44f67 100644 --- a/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp +++ b/Controllers/EVGAPascalGPUController/RGBController_EVGAGPUv1.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name EVGA RGB v1 GPU + @category GPU @type I2C @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp index dd19886d..4c350a09 100644 --- a/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp +++ b/Controllers/EVGATuringGPUController/RGBController_EVGAGPUv2.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name EVGA RGB v2 GPU + @category GPU @type I2C @save :white_check_mark: @direct :white_check_mark: @@ -218,7 +219,7 @@ void RGBController_EVGAGPUv2::DeviceUpdateMode() colorA = modes[active_mode].colors[0]; colorB = (modes[active_mode].colors.size() == 2) ? modes[active_mode].colors[1] : 0 ; } - + evga->SetMode( modes[active_mode].value, colorA, colorB, modes[active_mode].speed, modes[active_mode].brightness); } diff --git a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp b/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp index c5f9af73..155bd3ef 100644 --- a/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp +++ b/Controllers/EVGAUSBController/RGBController_EVGAKeyboard.cpp @@ -184,6 +184,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name EVGA USB Keyboard + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp b/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp index 1b8329b1..e82062aa 100644 --- a/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp +++ b/Controllers/EVisionKeyboardController/RGBController_EVisionKeyboard.cpp @@ -22,6 +22,7 @@ static unsigned int matrix_map[6][23] = /**------------------------------------------------------------------*\ @name EVision Keyboard + @category Keyboard @type USB @save :warning: @direct :x: @@ -175,7 +176,7 @@ RGBController_EVisionKeyboard::RGBController_EVisionKeyboard(EVisionKeyboardCont Blooming.speed = EVISION_KB_SPEED_NORMAL; Blooming.color_mode = MODE_COLORS_NONE; modes.push_back(Blooming); - + mode Reactive; Reactive.name = "Reactive"; Reactive.value = EVISION_KB_MODE_REACTIVE; @@ -247,7 +248,7 @@ void RGBController_EVisionKeyboard::SetupZones() new_zone.matrix_map->height = 6; new_zone.matrix_map->width = 23; new_zone.matrix_map->map = (unsigned int *)&matrix_map; - + zones.push_back(new_zone); for(int led_idx = 0; led_idx < 126; led_idx++) diff --git a/Controllers/EspurnaController/RGBController_Espurna.cpp b/Controllers/EspurnaController/RGBController_Espurna.cpp index dc91e4b9..37724fed 100644 --- a/Controllers/EspurnaController/RGBController_Espurna.cpp +++ b/Controllers/EspurnaController/RGBController_Espurna.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Espurna + @category Light @type TCP @save :x: @direct :white_check_mark: diff --git a/Controllers/FanBusController/RGBController_FanBus.cpp b/Controllers/FanBusController/RGBController_FanBus.cpp index 65c275cd..acdfd9f7 100644 --- a/Controllers/FanBusController/RGBController_FanBus.cpp +++ b/Controllers/FanBusController/RGBController_FanBus.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name FanBus + @category Cooler @type Serial @save :x: @direct :white_check_mark: diff --git a/Controllers/FaustusController/RGBController_Faustus.cpp b/Controllers/FaustusController/RGBController_Faustus.cpp index 3bbb70c5..ce172887 100644 --- a/Controllers/FaustusController/RGBController_Faustus.cpp +++ b/Controllers/FaustusController/RGBController_Faustus.cpp @@ -5,6 +5,7 @@ /**------------------------------------------------------------------*\ @name ASUS TUF Keyboard (Faustus) + @category Keyboard @type File Stream @save :x: @direct :x: diff --git a/Controllers/GainwardGPUController/RGBController_GainwardGPUv1.cpp b/Controllers/GainwardGPUController/RGBController_GainwardGPUv1.cpp index 7498f738..144b5c1b 100644 --- a/Controllers/GainwardGPUController/RGBController_GainwardGPUv1.cpp +++ b/Controllers/GainwardGPUController/RGBController_GainwardGPUv1.cpp @@ -16,6 +16,7 @@ int RGBController_GainwardGPUv1::GetDeviceMode() /**------------------------------------------------------------------*\ @name Gainward GPU v1 + @category GPU @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/GainwardGPUController/RGBController_GainwardGPUv2.cpp b/Controllers/GainwardGPUController/RGBController_GainwardGPUv2.cpp index 2de7908e..7ba7bf89 100644 --- a/Controllers/GainwardGPUController/RGBController_GainwardGPUv2.cpp +++ b/Controllers/GainwardGPUController/RGBController_GainwardGPUv2.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Gainward GPU v2 + @category GPU @type I2C @save :x: @direct :x: @@ -181,7 +182,7 @@ void RGBController_GainwardGPUv2::DeviceUpdateMode() unsigned char b = RGBGetBValue(current_mode.colors[0]); controller->SetLEDColors(r, g, b, GAINWARD_V2_COLOR_REGISTER_TERTIARY); } - + case 2: controller->SetMode((unsigned char)(current_mode.value), (unsigned char)(current_mode.speed)); controller->SetDirection(current_mode.direction); diff --git a/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp b/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp index 185259d3..2c6f3268 100644 --- a/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp +++ b/Controllers/GalaxGPUController/RGBController_GalaxGPU.cpp @@ -42,6 +42,7 @@ int RGBController_GalaxGPU::GetDeviceMode() /**------------------------------------------------------------------*\ @name Galax GPU + @category GPU @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp index e4731ce8..5e076933 100644 --- a/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp +++ b/Controllers/GigabyteAorusCPUCoolerController/RGBController_AorusATC800.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Aorus ATC800 + @category Cooler @type USB @save :x: @direct :x: diff --git a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp index 6c3ec0ff..0abddfbc 100644 --- a/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp +++ b/Controllers/GigabyteRGBFusion2DRAMController/RGBController_GigabyteRGBFusion2DRAM.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Gigabyte Fusion2 DRAM + @category RAM @type I2C @save :x: @direct :x: diff --git a/Controllers/GigabyteRGBFusion2GPUController/RGBController_GigabyteRGBFusion2GPU.cpp b/Controllers/GigabyteRGBFusion2GPUController/RGBController_GigabyteRGBFusion2GPU.cpp index cf2a3c91..e116719a 100644 --- a/Controllers/GigabyteRGBFusion2GPUController/RGBController_GigabyteRGBFusion2GPU.cpp +++ b/Controllers/GigabyteRGBFusion2GPUController/RGBController_GigabyteRGBFusion2GPU.cpp @@ -20,6 +20,7 @@ static const char* gigabyte_fusion2_gpu_zone[] = /**------------------------------------------------------------------*\ @name Gigabyte Fusion 2 GPU + @category GPU @type I2C @save :white_check_mark: @direct :white_check_mark: @@ -130,7 +131,7 @@ RGBController_RGBFusion2GPU::RGBController_RGBFusion2GPU(RGBFusion2GPUController mode Shift; Shift.name = "Color Shift"; Shift.value = RGB_FUSION2_GPU_MODE_COLOR_SHIFT; - Shift.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE; + Shift.flags = MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_MANUAL_SAVE; Shift.speed_min = RGB_FUSION2_GPU_SPEED_SLOWEST; Shift.speed_max = RGB_FUSION2_GPU_SPEED_FASTEST; Shift.speed = RGB_FUSION2_GPU_SPEED_NORMAL; diff --git a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp index df119a76..5aa84290 100644 --- a/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp +++ b/Controllers/GigabyteRGBFusion2SMBusController/RGBController_GigabyteRGBFusion2SMBus.cpp @@ -39,6 +39,7 @@ static const char* rgb_fusion_zone_names[] = /**------------------------------------------------------------------*\ @name Gigabyte Fusion2 SMBus + @category Motherboard @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp index 559c136c..d667aad0 100644 --- a/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp +++ b/Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp @@ -112,7 +112,7 @@ static KnownLayout knownLayoutsLookup } } } - }, + }, { "STD_ATX", { @@ -190,6 +190,7 @@ static KnownLayout knownLayoutsLookup /**------------------------------------------------------------------*\ @name Gigabyte RGB Fusion 2 USB + @category Motherboard @type USB @save :x: @direct :white_check_mark: @@ -555,7 +556,7 @@ void RGBController_RGBFusion2USB::UpdateZoneLEDs(int zone) unsigned char red = 0; unsigned char grn = 0; unsigned char blu = 0; - + for(std::size_t led_idx = 0; led_idx < zones[zone].leds_count; led_idx++) { /*---------------------------------------------------------*\ @@ -590,7 +591,7 @@ void RGBController_RGBFusion2USB::UpdateZoneLEDs(int zone) \*---------------------------------------------------------*/ controller->SetLEDEffect(zones[zone].leds[led_idx].value, mode_value, modes[active_mode].speed, modes[active_mode].brightness, random, red, grn, blu); } - + controller->ApplyEffect(); } /*---------------------------------------------------------*\ @@ -658,7 +659,7 @@ void RGBController_RGBFusion2USB::UpdateSingleLED(int led) unsigned char red = 0; unsigned char grn = 0; unsigned char blu = 0; - + /*---------------------------------------------------------*\ | Motherboard LEDs always use effect mode, so use static for| | direct mode but get colors from zone | diff --git a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp index 0e222763..167a2ded 100644 --- a/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp +++ b/Controllers/GigabyteRGBFusionController/RGBController_GigabyteRGBFusion.cpp @@ -17,6 +17,7 @@ static const char* rgb_fusion_zone_names[] = /**------------------------------------------------------------------*\ @name Gigabyte Fusion SMBus + @category Motherboard @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp index 2c8cc454..d4a08a09 100644 --- a/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp +++ b/Controllers/GigabyteRGBFusionGPUController/RGBController_GigabyteRGBFusionGPU.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Gigabyte Fusion GPU + @category GPU @type I2C @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp b/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp index 5a8b9aa8..519ddad9 100644 --- a/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp +++ b/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp @@ -8,6 +8,7 @@ /**------------------------------------------------------------------*\ @name HP Omen 30L + @category Motherboard @type USB @save :x: @direct :white_check_mark: @@ -208,6 +209,6 @@ void RGBController_HPOmen30L::DeviceUpdateMode() { controller->SetZoneMode(i, modes[active_mode].value, modes[active_mode].speed, modes[active_mode].brightness); } - + DeviceUpdateLEDs(); } diff --git a/Controllers/HoltekController/RGBController_HoltekA070.cpp b/Controllers/HoltekController/RGBController_HoltekA070.cpp index c3849998..a6c47569 100644 --- a/Controllers/HoltekController/RGBController_HoltekA070.cpp +++ b/Controllers/HoltekController/RGBController_HoltekA070.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Holtek A070 + @category Mouse @type USB @save :x: @direct :x: diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp b/Controllers/HoltekController/RGBController_HoltekA1FA.cpp index 99503e7d..30f97f87 100644 --- a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp +++ b/Controllers/HoltekController/RGBController_HoltekA1FA.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Holtek A1FA + @category Mouse @type USB @save :x: @direct :x: diff --git a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp index 7c11d8c7..3061ff21 100644 --- a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp +++ b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name HyperX DRAM + @category RAM @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp index b7211b74..8a406e0d 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp @@ -178,6 +178,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name HyperX Alloy Elite + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp index 237d641a..b8bdbb41 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp @@ -195,6 +195,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name HyperX Alloy Elite 2 + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp index 39ab339c..dd0ae167 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp @@ -150,6 +150,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name HyperX Alloy FPS + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp index 74b4d3ee..b0e12fc0 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp @@ -170,6 +170,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name HyperX Alloy Origins + @category Keyboard @type USB @save :x: @direct :white_check_mark: @@ -276,7 +277,7 @@ void RGBController_HyperXAlloyOrigins::ResizeZone(int /*zone*/, int /*new_size*/ | This device does not support resizing zones | \*---------------------------------------------------------*/ } - + void RGBController_HyperXAlloyOrigins::DeviceUpdateLEDs() { controller->SetLEDsDirect(colors); diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp index 31bf0df2..20d3b4e1 100644 --- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp +++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp @@ -17,12 +17,12 @@ using namespace std::chrono_literals; static unsigned int matrix_map[6][19] = { - { 0, NA, 1, 2, 3, 4, 5, 6, 7, 44, NA, 45, 46, 47, 48, NA, 49, 50, 51 }, - { 8, 9, 10, 11, 12, 13, 14, 15, 16, 52, 53, 54, 55, 56, NA, NA, 57, 58, 59 }, - { 17, NA, 18, 19, 20, 21, 22, 23, 24, 60, 61, 62, 63, 64, 65, NA, 66, 67, 68 }, - { 25, NA, 26, 27, 28, 29, 30, 31, 32, 69, 70, 71, 72, 73, NA, NA, NA, NA, NA }, - { 33, NA, 34, 35, 36, 37, 38, NA, 39, 74, 75, 76, 77, 78, NA, NA, NA, 79, NA }, - { 40, 41, 42, NA, NA, NA, 43, NA, NA, NA, NA, 80, 81, 82, 83, NA, 84, 85, 86 } + { 0, NA, 1, 2, 3, 4, 5, 6, 7, 44, NA, 45, 46, 47, 48, NA, 49, 50, 51 }, + { 8, 9, 10, 11, 12, 13, 14, 15, 16, 52, 53, 54, 55, 56, NA, NA, 57, 58, 59 }, + { 17, NA, 18, 19, 20, 21, 22, 23, 24, 60, 61, 62, 63, 64, 65, NA, 66, 67, 68 }, + { 25, NA, 26, 27, 28, 29, 30, 31, 32, 69, 70, 71, 72, 73, NA, NA, NA, NA, NA }, + { 33, NA, 34, 35, 36, 37, 38, NA, 39, 74, 75, 76, 77, 78, NA, NA, NA, 79, NA }, + { 40, 41, 42, NA, NA, NA, 43, NA, NA, NA, NA, 80, 81, 82, 83, NA, 84, 85, 86 } }; static const char* zone_names[] = @@ -92,7 +92,7 @@ static const char *led_names[] = KEY_EN_LEFT_ALT, KEY_EN_SPACE, - // End of first section + // End of first section KEY_EN_F8, KEY_EN_F9, @@ -148,6 +148,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name HyperX Alloy Origins Core + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp index d76a7151..3884dafc 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp +++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name HyoerX Pulsefire Dart + @category Mouse @type USB @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp index 312d18a2..f0c29d65 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp +++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp @@ -13,6 +13,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name HyperX Pulsefire FPS + @category Mouse @type USB @save :x: @direct :white_check_mark: @@ -76,14 +77,14 @@ void RGBController_HyperXPulsefireFPSPro::SetupZones() for(unsigned int led_idx = 0; led_idx < zones[zone_idx].leds_count; led_idx++) { led new_led; - + new_led.name = zones[zone_idx].name; if(zones[zone_idx].leds_count > 1) { new_led.name.append(" LED "); new_led.name.append(std::to_string(led_idx + 1)); - } + } leds.push_back(new_led); } diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp index b4767de9..51ec89e6 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp +++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp @@ -13,6 +13,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name HyperX Pulsefire Haste + @category Mouse @type USB @save :x: @direct :white_check_mark: @@ -76,14 +77,14 @@ void RGBController_HyperXPulsefireHaste::SetupZones() for(unsigned int led_idx = 0; led_idx < zones[zone_idx].leds_count; led_idx++) { led new_led; - + new_led.name = zones[zone_idx].name; if(zones[zone_idx].leds_count > 1) { new_led.name.append(" LED "); new_led.name.append(std::to_string(led_idx + 1)); - } + } leds.push_back(new_led); } diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp index 29e3706d..c548cf92 100644 --- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp +++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp @@ -13,6 +13,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name HyperX Pulsefire Surge + @category Mouse @type USB @save :x: @direct :white_check_mark: @@ -85,14 +86,14 @@ void RGBController_HyperXPulsefireSurge::SetupZones() for(unsigned int led_idx = 0; led_idx < zones[zone_idx].leds_count; led_idx++) { led new_led; - + new_led.name = zones[zone_idx].name; if(zones[zone_idx].leds_count > 1) { new_led.name.append(" LED "); new_led.name.append(std::to_string(led_idx + 1)); - } + } leds.push_back(new_led); } diff --git a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp index b49b8bea..8c327cad 100644 --- a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp +++ b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp @@ -13,6 +13,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name HyperX Mousemat + @category Mousemat @type USB @save :x: @direct :white_check_mark: @@ -85,14 +86,14 @@ void RGBController_HyperXMousemat::SetupZones() for(unsigned int led_idx = 0; led_idx < zones[zone_idx].leds_count; led_idx++) { led new_led; - + new_led.name = zones[zone_idx].name; if(zones[zone_idx].leds_count > 1) { new_led.name.append(" LED "); new_led.name.append(std::to_string(led_idx + 1)); - } + } leds.push_back(new_led); } diff --git a/Controllers/KeychronKeyboardController/RGBController_KeychronKeyboard.cpp b/Controllers/KeychronKeyboardController/RGBController_KeychronKeyboard.cpp index 08428518..1a2e1f4a 100644 --- a/Controllers/KeychronKeyboardController/RGBController_KeychronKeyboard.cpp +++ b/Controllers/KeychronKeyboardController/RGBController_KeychronKeyboard.cpp @@ -416,6 +416,7 @@ typedef struct /**------------------------------------------------------------------*\ @name Keychron Keyboard + @category Keyboard @type USB @save :x: @direct :x: diff --git a/Controllers/LEDStripController/RGBController_LEDStrip.cpp b/Controllers/LEDStripController/RGBController_LEDStrip.cpp index e92b17e8..573ac65e 100644 --- a/Controllers/LEDStripController/RGBController_LEDStrip.cpp +++ b/Controllers/LEDStripController/RGBController_LEDStrip.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Serial LED Strip + @category LEDStrip @type Serial @save :x: @direct :white_check_mark: diff --git a/Controllers/LIFXController/RGBController_LIFX.cpp b/Controllers/LIFXController/RGBController_LIFX.cpp index a4016777..4501f8dd 100644 --- a/Controllers/LIFXController/RGBController_LIFX.cpp +++ b/Controllers/LIFXController/RGBController_LIFX.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name LIFX Globes + @category Light @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/LexipMouseController/RGBController_LexipMouse.cpp b/Controllers/LexipMouseController/RGBController_LexipMouse.cpp index ce6c6134..97300fc3 100644 --- a/Controllers/LexipMouseController/RGBController_LexipMouse.cpp +++ b/Controllers/LexipMouseController/RGBController_LexipMouse.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name Lexip Mouse + @category Mouse @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/LianLiController/RGBController_LianLiUniHub.cpp b/Controllers/LianLiController/RGBController_LianLiUniHub.cpp index dbec2acc..ed6e01ee 100644 --- a/Controllers/LianLiController/RGBController_LianLiUniHub.cpp +++ b/Controllers/LianLiController/RGBController_LianLiUniHub.cpp @@ -30,6 +30,7 @@ mode makeMode() /**------------------------------------------------------------------*\ @name Lian Li Uni Hub + @category Cooler @type USB @save :x: @direct :warning: diff --git a/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp b/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp index 06f4f1ba..9ba23cd6 100644 --- a/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp +++ b/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Dummy + @category LEDStrip @type File Stream @save :x: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechG203L.cpp b/Controllers/LogitechController/RGBController_LogitechG203L.cpp index c85f8877..cc6ec28a 100644 --- a/Controllers/LogitechController/RGBController_LogitechG203L.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG203L.cpp @@ -2,6 +2,7 @@ /**------------------------------------------------------------------*\ @name Logitech G203L + @category Mouse @type USB @save :warning: @direct :white_check_mark: @@ -165,7 +166,7 @@ void RGBController_LogitechG203L::DeviceUpdateMode() blu = RGBGetBValue(modes[active_mode].colors[0]); } - if(modes[active_mode].flags & MODE_FLAG_HAS_DIRECTION_LR) + if(modes[active_mode].flags & MODE_FLAG_HAS_DIRECTION_LR) { dir = (unsigned char)modes[active_mode].direction; } diff --git a/Controllers/LogitechController/RGBController_LogitechG213.cpp b/Controllers/LogitechController/RGBController_LogitechG213.cpp index fdfdc60b..18d1c9b5 100644 --- a/Controllers/LogitechController/RGBController_LogitechG213.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG213.cpp @@ -30,6 +30,7 @@ static const unsigned char led_values[] = /**------------------------------------------------------------------*\ @name Logitech G213 + @category Keyboard @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechG560.cpp b/Controllers/LogitechController/RGBController_LogitechG560.cpp index b211e1e6..e928d94d 100644 --- a/Controllers/LogitechController/RGBController_LogitechG560.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG560.cpp @@ -13,6 +13,7 @@ /**------------------------------------------------------------------*\ @name Logitech G560 + @category Speaker @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechG810.cpp b/Controllers/LogitechController/RGBController_LogitechG810.cpp index 686ddb4f..e45b47a6 100644 --- a/Controllers/LogitechController/RGBController_LogitechG810.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG810.cpp @@ -168,6 +168,7 @@ static const led_type led_names[] = /**------------------------------------------------------------------*\ @name Logitech G810 + @category Keyboard @type USB @save :warning: @direct :white_check_mark: @@ -202,7 +203,7 @@ RGBController_LogitechG810::RGBController_LogitechG810(LogitechG810Controller* c Static.color_mode = MODE_COLORS_MODE_SPECIFIC; Static.colors.resize(1); modes.push_back(Static); - + mode Off; Off.name = "Off"; Off.value = LOGITECH_G810_MODE_OFF; @@ -330,7 +331,7 @@ void RGBController_LogitechG810::DeviceUpdateLEDs() frame_buf[(frame_cnt * 4) + 1] = RGBGetRValue(colors[led_idx]); frame_buf[(frame_cnt * 4) + 2] = RGBGetGValue(colors[led_idx]); frame_buf[(frame_cnt * 4) + 3] = RGBGetBValue(colors[led_idx]); - + frame_cnt++; prev_zone = zone; diff --git a/Controllers/LogitechController/RGBController_LogitechG815.cpp b/Controllers/LogitechController/RGBController_LogitechG815.cpp index a13b8011..bfe730e6 100644 --- a/Controllers/LogitechController/RGBController_LogitechG815.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG815.cpp @@ -172,6 +172,7 @@ static const led_type led_names[] = /**------------------------------------------------------------------*\ @name Logitech G815 + @category Keyboard @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechG910.cpp b/Controllers/LogitechController/RGBController_LogitechG910.cpp index dbd98504..5fc11e32 100644 --- a/Controllers/LogitechController/RGBController_LogitechG910.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG910.cpp @@ -169,6 +169,7 @@ static const led_type led_names[] = /**------------------------------------------------------------------*\ @name Logitech G910 + @category Keyboard @type USB @save :warning: @direct :white_check_mark: @@ -203,7 +204,7 @@ RGBController_LogitechG910::RGBController_LogitechG910(LogitechG910Controller* c Static.color_mode = MODE_COLORS_MODE_SPECIFIC; Static.colors.resize(1); modes.push_back(Static); - + mode Off; Off.name = "Off"; Off.value = LOGITECH_G910_MODE_OFF; @@ -331,7 +332,7 @@ void RGBController_LogitechG910::DeviceUpdateLEDs() frame_buf[(frame_cnt * 4) + 1] = RGBGetRValue(colors[led_idx]); frame_buf[(frame_cnt * 4) + 2] = RGBGetGValue(colors[led_idx]); frame_buf[(frame_cnt * 4) + 3] = RGBGetBValue(colors[led_idx]); - + frame_cnt++; prev_zone = zone; diff --git a/Controllers/LogitechController/RGBController_LogitechG915.cpp b/Controllers/LogitechController/RGBController_LogitechG915.cpp index 69bf0f41..ab0ca798 100644 --- a/Controllers/LogitechController/RGBController_LogitechG915.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG915.cpp @@ -184,6 +184,7 @@ static const led_type led_names[] = /**------------------------------------------------------------------*\ @name Logitech G915 + @category Keyboard @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechG933.cpp b/Controllers/LogitechController/RGBController_LogitechG933.cpp index 0a27c62a..075c0513 100644 --- a/Controllers/LogitechController/RGBController_LogitechG933.cpp +++ b/Controllers/LogitechController/RGBController_LogitechG933.cpp @@ -12,8 +12,9 @@ #include "RGBController_LogitechG933.h" /**------------------------------------------------------------------*\ - @name Dummy - @type I2C or Serial or WMI or USB + @name Logitech G933 + @category Headset + @type USB @save :x: @direct :white_check_mark: @effects :x: diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp b/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp index 27b58c73..92e7b648 100644 --- a/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Logitech Lightsync Mouse + @category Mouse @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp b/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp index ce391d82..d732a624 100644 --- a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Logitech Lightsync Mouse (1 Zone) + @category Mouse @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp index 5b270080..e9eb7185 100644 --- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Logitech Powerplay Mat + @category Mousemat @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp index 4699714d..a78d0862 100644 --- a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp +++ b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp @@ -145,6 +145,7 @@ static const led_type led_names[] = /**------------------------------------------------------------------*\ @name Logitech G Pro + @category Keyboard @type USB @save :warning: @direct :white_check_mark: @@ -179,7 +180,7 @@ RGBController_LogitechGProKeyboard::RGBController_LogitechGProKeyboard(LogitechG Static.color_mode = MODE_COLORS_MODE_SPECIFIC; Static.colors.resize(1); modes.push_back(Static); - + mode Off; Off.name = "Off"; Off.value = LOGITECH_GPRO_MODE_OFF; @@ -307,7 +308,7 @@ void RGBController_LogitechGProKeyboard::DeviceUpdateLEDs() frame_buf[(frame_cnt * 4) + 1] = RGBGetRValue(colors[led_idx]); frame_buf[(frame_cnt * 4) + 2] = RGBGetGValue(colors[led_idx]); frame_buf[(frame_cnt * 4) + 3] = RGBGetBValue(colors[led_idx]); - + frame_cnt++; prev_zone = zone; diff --git a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp index 9d54520c..444bf8c3 100644 --- a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp +++ b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Logitech Lightspeed + @category Keyboard,Mouse,Mousemat,Headset @type USB @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/LogitechController/RGBController_LogitechX56.cpp b/Controllers/LogitechController/RGBController_LogitechX56.cpp index b754883b..fae0ca4d 100644 --- a/Controllers/LogitechController/RGBController_LogitechX56.cpp +++ b/Controllers/LogitechController/RGBController_LogitechX56.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Logitech X56 + @category Gamepad @type USB @save :x: @direct :white_check_mark: @@ -22,10 +23,10 @@ RGBController_LogitechX56::RGBController_LogitechX56(LogitechX56Controller* controller_ptr) { controller = controller_ptr; - + name = controller->GetDeviceName(); vendor = "Logitech"; - type = DEVICE_TYPE_GAMEPAD; + type = DEVICE_TYPE_GAMEPAD; description = "Logitech X56 Device"; location = controller->GetDeviceLocation(); serial = controller->GetSerialString(); diff --git a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp index bc023908..877fa1ab 100644 --- a/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp +++ b/Controllers/MSI3ZoneController/RGBController_MSI3Zone.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name MSI 3 Zone Keyboard + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp index ab5cae41..7f25f98e 100644 --- a/Controllers/MSIGPUController/RGBController_MSIGPU.cpp +++ b/Controllers/MSIGPUController/RGBController_MSIGPU.cpp @@ -28,6 +28,7 @@ int RGBController_MSIGPU::GetDeviceMode() /**------------------------------------------------------------------*\ @name MSI GPU + @category GPU @type I2C @save :white_check_mark: @direct :white_check_mark: diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp index c2b44a1d..2e555683 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight162.cpp @@ -75,6 +75,7 @@ static const ZoneDescription led_zones[] = /**------------------------------------------------------------------*\ @name MSI Mystic Light (162 Byte) + @category Motherboard @type USB @save :warning: @direct :white_check_mark: @@ -113,7 +114,7 @@ void RGBController_MSIMysticLight162::SetupZones() for(std::size_t zone_idx = 0; zone_idx < NUM_ZONES; zone_idx++) { ZoneDescription zd = led_zones[zone_idx]; - + zone new_zone; unsigned int led_count = 0; @@ -138,7 +139,7 @@ void RGBController_MSIMysticLight162::SetupZones() for(std::size_t led_idx = 0; led_idx < new_zone.leds_count; led_idx++) { led new_led; - + new_led.name = new_zone.name + " LED "; if(new_zone.leds_count > 1) { @@ -247,7 +248,7 @@ void RGBController_MSIMysticLight162::UpdateLed(int zone, int led) unsigned char blu = RGBGetBValue(zones[zone].colors[led]); MSI_MODE mode = (MSI_MODE)(modes[active_mode].value); MSI_SPEED speed = (MSI_SPEED)(modes[active_mode].speed); - + controller->SetMode((MSI_ZONE)zones[zone].leds[led].value, mode, speed, MSI_BRIGHTNESS_LEVEL_100, random); controller->SetLEDColor((MSI_ZONE)zones[zone].leds[led].value, red, grn, blu, red, grn, blu); } diff --git a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp index 670bac5c..2c6dc9db 100644 --- a/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp +++ b/Controllers/MSIMysticLightController/RGBController_MSIMysticLight185.cpp @@ -83,6 +83,7 @@ static const ZoneDescription led_zones[] = /**------------------------------------------------------------------*\ @name MSI Mystic Light (185 Byte) + @category Motherboard @type USB @save :warning: @direct :white_check_mark: @@ -121,7 +122,7 @@ void RGBController_MSIMysticLight185::SetupZones() for(std::size_t zone_idx = 0; zone_idx < NUM_ZONES; zone_idx++) { ZoneDescription zd = led_zones[zone_idx]; - + zone new_zone; unsigned int led_count = 0; @@ -146,7 +147,7 @@ void RGBController_MSIMysticLight185::SetupZones() for(std::size_t led_idx = 0; led_idx < new_zone.leds_count; led_idx++) { led new_led; - + new_led.name = new_zone.name + " LED "; if(new_zone.leds_count > 1) { @@ -255,7 +256,7 @@ void RGBController_MSIMysticLight185::UpdateLed(int zone, int led) unsigned char blu = RGBGetBValue(zones[zone].colors[led]); MSI_MODE mode = (MSI_MODE)(modes[active_mode].value); MSI_SPEED speed = (MSI_SPEED)(modes[active_mode].speed); - + controller->SetMode((MSI_ZONE)zones[zone].leds[led].value, mode, speed, MSI_BRIGHTNESS_LEVEL_100, random); controller->SetZoneColor((MSI_ZONE)zones[zone].leds[led].value, red, grn, blu, red, grn, blu); } diff --git a/Controllers/MSIOptixController/RGBController_MSIOptix.cpp b/Controllers/MSIOptixController/RGBController_MSIOptix.cpp index 6721f3a0..22446c41 100644 --- a/Controllers/MSIOptixController/RGBController_MSIOptix.cpp +++ b/Controllers/MSIOptixController/RGBController_MSIOptix.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name MSI Optix + @category LEDStrip @type USB @save :x: @direct :white_check_mark: @@ -387,7 +388,7 @@ void RGBController_MSIOptix::SetCustomMode() } void RGBController_MSIOptix::DeviceUpdateMode() -{ +{ if(modes[active_mode].flags & MODE_FLAG_HAS_PER_LED_COLOR) { controller->SetMode(colors, modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].value, modes[active_mode].flags); diff --git a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp index 3ac75742..523073cf 100644 --- a/Controllers/MSIRGBController/RGBController_MSIRGB.cpp +++ b/Controllers/MSIRGBController/RGBController_MSIRGB.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name MSI RGB + @category Motherboard @type SuperIO @save :x: @direct :white_check_mark: @@ -26,7 +27,7 @@ RGBController_MSIRGB::RGBController_MSIRGB(MSIRGBController* msi_ptr) vendor = "MSI"; type = DEVICE_TYPE_MOTHERBOARD; description = "MSI-RGB Device"; - + mode Direct; Direct.name = "Direct"; Direct.value = 0; diff --git a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp index 3e847c5b..cc75f99d 100644 --- a/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp +++ b/Controllers/NZXTHue2Controller/RGBController_NZXTHue2.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name NZXT Hue2 + @category LEDStrip @type USB @save :warning: @direct :white_check_mark: @@ -138,7 +139,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* controller_pt Breathing.color_mode = MODE_COLORS_MODE_SPECIFIC; Breathing.colors.resize( 1); modes.push_back(Breathing); - + mode Candle; Candle.name = "Candle"; Candle.value = HUE_2_MODE_CANDLE; @@ -151,7 +152,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* controller_pt Candle.color_mode = MODE_COLORS_MODE_SPECIFIC; Candle.colors.resize(1) ; modes.push_back(Candle); - + mode StarryNight; StarryNight.name = "Starry Night"; StarryNight.value = HUE_2_MODE_STARRY_NIGHT; @@ -164,7 +165,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* controller_pt StarryNight.color_mode = MODE_COLORS_MODE_SPECIFIC; StarryNight.colors.resize(1); modes.push_back(StarryNight); - + mode SuperRainbow; SuperRainbow.name = "Super Rainbow"; SuperRainbow.value = HUE_2_MODE_SUPER_RAINBOW; @@ -175,7 +176,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* controller_pt SuperRainbow.direction = MODE_DIRECTION_RIGHT; SuperRainbow.color_mode = MODE_COLORS_NONE; modes.push_back(SuperRainbow); - + mode RainbowPulse; RainbowPulse.name = "Rainbow Pulse"; RainbowPulse.value = HUE_2_MODE_RAINBOW_PULSE; @@ -186,7 +187,7 @@ RGBController_NZXTHue2::RGBController_NZXTHue2(NZXTHue2Controller* controller_pt RainbowPulse.direction = MODE_DIRECTION_RIGHT; RainbowPulse.color_mode = MODE_COLORS_NONE; modes.push_back(RainbowPulse); - + mode RainbowFlow; RainbowFlow.name = "Rainbow Flow"; RainbowFlow.value = HUE_2_MODE_RAINBOW_FLOW; diff --git a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp index 2294f89c..c8e64e33 100644 --- a/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp +++ b/Controllers/NZXTHuePlusController/RGBController_NZXTHuePlus.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name NZXT Hue+ + @category LEDStrip @type Serial @save :warning: @direct :white_check_mark: @@ -27,7 +28,7 @@ RGBController_HuePlus::RGBController_HuePlus(HuePlusController* controller_ptr) type = DEVICE_TYPE_LEDSTRIP; description = "NZXT Hue+ Device"; location = controller->GetLocation(); - + mode Direct; Direct.name = "Direct"; Direct.value = HUE_PLUS_MODE_DIRECT; @@ -205,7 +206,7 @@ void RGBController_HuePlus::SetupZones() zones[zone_idx].leds_min = 0; zones[zone_idx].leds_max = 40; zones[zone_idx].matrix_map = NULL; - + if(first_run) { zones[zone_idx].leds_count = 0; diff --git a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp index 196d9be2..03a9e53b 100644 --- a/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp +++ b/Controllers/NZXTKrakenController/RGBController_NZXTKraken.cpp @@ -12,8 +12,9 @@ /**------------------------------------------------------------------*\ @name NZXT Kraken + @category Cooler @type USB - @saven :x: + @save :x: @direct :white_check_mark: @effects :white_check_mark: @detectors DetectNZXTKrakenControllers diff --git a/Controllers/NanoleafController/RGBController_Nanoleaf.cpp b/Controllers/NanoleafController/RGBController_Nanoleaf.cpp index 2f9840b8..812ab20f 100644 --- a/Controllers/NanoleafController/RGBController_Nanoleaf.cpp +++ b/Controllers/NanoleafController/RGBController_Nanoleaf.cpp @@ -12,6 +12,17 @@ #include "json.hpp" using json = nlohmann::json; +/**------------------------------------------------------------------*\ + @name Nanoleaf + @category Light + @type Network + @save :x: + @direct :white_check_mark: + @effects :white_check_mark: + @detectors DetectNanoleafControllers + @comment +\*-------------------------------------------------------------------*/ + RGBController_Nanoleaf::RGBController_Nanoleaf(std::string a_address, int a_port, std::string a_auth_token) : controller(a_address, a_port, a_auth_token) { @@ -108,12 +119,12 @@ void RGBController_Nanoleaf::DeviceUpdateLEDs() void RGBController_Nanoleaf::UpdateZoneLEDs(int /*zone*/) { - DeviceUpdateLEDs(); + DeviceUpdateLEDs(); } void RGBController_Nanoleaf::UpdateSingleLED(int /*led*/) { - DeviceUpdateLEDs(); + DeviceUpdateLEDs(); } void RGBController_Nanoleaf::SetCustomMode() diff --git a/Controllers/NanoleafController/RGBController_Nanoleaf.h b/Controllers/NanoleafController/RGBController_Nanoleaf.h index 6560b187..11e4f236 100644 --- a/Controllers/NanoleafController/RGBController_Nanoleaf.h +++ b/Controllers/NanoleafController/RGBController_Nanoleaf.h @@ -10,16 +10,6 @@ #include "RGBController.h" #include "NanoleafController.h" -/**------------------------------------------------------------------*\ - @name Nanoleaf - @type Network - @save :x: - @direct :white_check_mark: - @effects :white_check_mark: - @detectors DetectNanoleafControllers - @comment -\*-------------------------------------------------------------------*/ - class RGBController_Nanoleaf : public RGBController { diff --git a/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp b/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp index 329a9fa6..7756c229 100644 --- a/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp +++ b/Controllers/NvidiaESAController/RGBController_NvidiaESA.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name NVidia ESA + @category Case @type USB @save :x: @direct :x: diff --git a/Controllers/OpenRazerController/RGBController_OpenRazer.cpp b/Controllers/OpenRazerController/RGBController_OpenRazer.cpp index afa9e45f..23392cf6 100644 --- a/Controllers/OpenRazerController/RGBController_OpenRazer.cpp +++ b/Controllers/OpenRazerController/RGBController_OpenRazer.cpp @@ -25,7 +25,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() case RAZER_TYPE_MATRIX_STATIC: { char update_value = 1; - + for (unsigned int row = 0; row < matrix_rows; row++) { unsigned int output_array_size; @@ -42,7 +42,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() output_array_size = 3; output_offset = 0; } - + char* output_array = new char[output_array_size]; if(matrix_type == RAZER_TYPE_MATRIX_FRAME) @@ -59,7 +59,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() output_array[(col * 3) + 1 + output_offset] = (char)RGBGetGValue(colors[color_idx]); output_array[(col * 3) + 2 + output_offset] = (char)RGBGetBValue(colors[color_idx]); } - + if(matrix_type == RAZER_TYPE_MATRIX_FRAME) { matrix_custom_frame.write(output_array, output_array_size); @@ -80,7 +80,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() std::this_thread::sleep_for(1ms); } - + if(matrix_type == RAZER_TYPE_MATRIX_FRAME) { matrix_effect_custom.write(&update_value, 1); @@ -212,6 +212,7 @@ void RGBController_OpenRazer::OpenFunctions(std::string dev_path) /**------------------------------------------------------------------*\ @name Openrazer + @category Keyboard,Mouse,Mousemat,HeadsetStand @type USB @save :x: @direct :white_check_mark: @@ -242,7 +243,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) | Set the description to indicate this is an OpenRazer device | \*-----------------------------------------------------------------*/ description = "OpenRazer Device"; - + /*-----------------------------------------------------------------*\ | Set the device path as the location | \*-----------------------------------------------------------------*/ @@ -447,19 +448,19 @@ RGBController_OpenRazer::RGBController_OpenRazer(std::string dev_path) Reactive.color_mode = MODE_COLORS_NONE; modes.push_back(Reactive); } - + /*---------------------------------------------------------*\ | Initialize file descriptors | \*---------------------------------------------------------*/ if(device_list[i]->matrix_type == true) { - SetupMatrixDevice(device_list[i]->rows, device_list[i]->cols); + SetupMatrixDevice(device_list[i]->rows, device_list[i]->cols); } else { SetupNonMatrixDevice(); } - + SetupZones(); } } @@ -524,7 +525,7 @@ void RGBController_OpenRazer::SetupZones() { new_zone.matrix_map = NULL; } - + zones.push_back(new_zone); } } @@ -543,7 +544,7 @@ void RGBController_OpenRazer::SetupZones() { new_led->name.append(" LED "); new_led->name.append(std::to_string(col_id + 1)); - } + } if(device_list[device_index]->keymap != NULL) { @@ -557,7 +558,7 @@ void RGBController_OpenRazer::SetupZones() } } } - + leds.push_back(*new_led); } } @@ -593,7 +594,7 @@ void RGBController_OpenRazer::SetCustomMode() { active_mode = i; break; - } + } } } } diff --git a/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp b/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp index ab71fa42..6c3e7bae 100644 --- a/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp +++ b/Controllers/OpenRazerController/RGBController_OpenRazerWindows.cpp @@ -27,7 +27,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() case RAZER_TYPE_MATRIX_STATIC: { char update_value = 1; - + for (unsigned int row = 0; row < matrix_rows; row++) { unsigned int output_array_size; @@ -44,7 +44,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() output_array_size = 3; output_offset = 0; } - + char* output_array = new char[output_array_size]; if(matrix_type == RAZER_TYPE_MATRIX_FRAME) @@ -61,7 +61,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() output_array[(col * 3) + 1 + output_offset] = (char)RGBGetGValue(colors[color_idx]); output_array[(col * 3) + 2 + output_offset] = (char)RGBGetBValue(colors[color_idx]); } - + if(matrix_type == RAZER_TYPE_MATRIX_FRAME) { razer_functions->matrix_custom_frame->store(razer_device, NULL, output_array, output_array_size); @@ -79,7 +79,7 @@ void RGBController_OpenRazer::DeviceUpdateLEDs() std::this_thread::sleep_for(1ms); } - + if(matrix_type == RAZER_TYPE_MATRIX_FRAME) { razer_functions->matrix_effect_custom->store(razer_device, NULL, &update_value, 1); @@ -136,7 +136,8 @@ void RGBController_OpenRazer::SetupNonMatrixDevice() } /**------------------------------------------------------------------*\ - @name Openrazer + @name Openrazer Windows + @category Keyboard,Mouse,Mousemat,HeadsetStand @type USB @save :x: @direct :white_check_mark: @@ -149,7 +150,7 @@ void RGBController_OpenRazer::SetupNonMatrixDevice() RGBController_OpenRazer::RGBController_OpenRazer(device * razer_device, device_fn_type* razer_functions) { char string_buf[1024]; - + this->razer_device = razer_device; this->razer_functions = razer_functions; @@ -165,7 +166,7 @@ RGBController_OpenRazer::RGBController_OpenRazer(device * razer_device, device_f name = string_buf; name.erase(std::remove(name.begin(), name.end(), '\n'), name.end()); name.erase(std::remove(name.begin(), name.end(), '\r'), name.end()); - + /*-----------------------------------------------------------------*\ | Set the description to indicate this is an OpenRazer device | \*-----------------------------------------------------------------*/ @@ -387,13 +388,13 @@ RGBController_OpenRazer::RGBController_OpenRazer(device * razer_device, device_f \*---------------------------------------------------------*/ if(device_list[i]->matrix_type == true) { - SetupMatrixDevice(razer_functions, device_list[i]->rows, device_list[i]->cols); + SetupMatrixDevice(razer_functions, device_list[i]->rows, device_list[i]->cols); } else { SetupNonMatrixDevice(); } - + SetupZones(); } } @@ -459,7 +460,7 @@ void RGBController_OpenRazer::SetupZones() { new_zone.matrix_map = NULL; } - + zones.push_back(new_zone); } } @@ -473,12 +474,12 @@ void RGBController_OpenRazer::SetupZones() led* new_led = new led(); new_led->name = device_list[device_index]->zones[zone_id]->name; - + if(zones[zone_id].leds_count > 1) { new_led->name.append(" LED "); new_led->name.append(std::to_string(col_id + 1)); - } + } if(device_list[device_index]->keymap != NULL) { @@ -492,7 +493,7 @@ void RGBController_OpenRazer::SetupZones() } } } - + leds.push_back(*new_led); } } @@ -528,7 +529,7 @@ void RGBController_OpenRazer::SetCustomMode() { active_mode = i; break; - } + } } } } diff --git a/Controllers/PNYGPUController/RGBController_PNYGPU.cpp b/Controllers/PNYGPUController/RGBController_PNYGPU.cpp index 908927d5..8c108a1f 100644 --- a/Controllers/PNYGPUController/RGBController_PNYGPU.cpp +++ b/Controllers/PNYGPUController/RGBController_PNYGPU.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name PNY GPU + @category GPU @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp index f538d0eb..db8774cb 100644 --- a/Controllers/PatriotViperController/RGBController_PatriotViper.cpp +++ b/Controllers/PatriotViperController/RGBController_PatriotViper.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Patriot Viper + @category RAM @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/PatriotViperSteelController/RGBController_PatriotViperSteel.cpp b/Controllers/PatriotViperSteelController/RGBController_PatriotViperSteel.cpp index 66b32bc1..e10ac9ef 100644 --- a/Controllers/PatriotViperSteelController/RGBController_PatriotViperSteel.cpp +++ b/Controllers/PatriotViperSteelController/RGBController_PatriotViperSteel.cpp @@ -9,6 +9,7 @@ /**------------------------------------------------------------------*\ @name Patriot Viper Steel + @category RAM @type I2C @save :x: @direct :white_check_mark: diff --git a/Controllers/PhilipsHueController/RGBController_PhilipsHue.cpp b/Controllers/PhilipsHueController/RGBController_PhilipsHue.cpp index 5e043906..29637d8e 100644 --- a/Controllers/PhilipsHueController/RGBController_PhilipsHue.cpp +++ b/Controllers/PhilipsHueController/RGBController_PhilipsHue.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Philips Hue + @category Light @type Network @save :x: @direct :white_check_mark: diff --git a/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.cpp b/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.cpp index 2c77f601..1087b654 100644 --- a/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.cpp +++ b/Controllers/PhilipsHueController/RGBController_PhilipsHueEntertainment.cpp @@ -14,6 +14,7 @@ using namespace std::chrono_literals; /**------------------------------------------------------------------*\ @name Philips Hue Entertainment + @category Light @type Network @save :x: @direct :white_check_mark: @@ -126,15 +127,15 @@ void RGBController_PhilipsHueEntertainment::DeviceUpdateMode() { std::vector rgb_controllers = ResourceManager::get()->GetRGBControllers(); - for(unsigned int controller_idx = 0; controller_idx < rgb_controllers.size(); controller_idx++) - { - if(rgb_controllers[controller_idx] != this && rgb_controllers[controller_idx]->description == "Philips Hue Entertainment Mode Device" && rgb_controllers[controller_idx]->active_mode == 0) - { - rgb_controllers[controller_idx]->SetMode(1); - } - } + for(unsigned int controller_idx = 0; controller_idx < rgb_controllers.size(); controller_idx++) + { + if(rgb_controllers[controller_idx] != this && rgb_controllers[controller_idx]->description == "Philips Hue Entertainment Mode Device" && rgb_controllers[controller_idx]->active_mode == 0) + { + rgb_controllers[controller_idx]->SetMode(1); + } + } - light->Connect(); + light->Connect(); } else { diff --git a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp index 639e90a2..c0c00382 100644 --- a/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp +++ b/Controllers/PhilipsWizController/RGBController_PhilipsWiz.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Philips Wiz + @category Light @type Network @save :x: @direct :white_check_mark: diff --git a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp b/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp index 6132059a..c8b4282a 100644 --- a/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp +++ b/Controllers/QMKOpenRGBController/RGBController_QMKOpenRGBRev9.cpp @@ -13,6 +13,7 @@ /**------------------------------------------------------------------*\ @name Quantum Mechanical Keyboard (QMK) + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/RazerController/RGBController_Razer.cpp b/Controllers/RazerController/RGBController_Razer.cpp index 9e1683bf..c2e2e3fc 100644 --- a/Controllers/RazerController/RGBController_Razer.cpp +++ b/Controllers/RazerController/RGBController_Razer.cpp @@ -3,6 +3,7 @@ /**------------------------------------------------------------------*\ @name Razer + @category Keyboard,Mouse,Mousemat,HeadsetStand,Case @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/RazerController/RGBController_RazerAddressable.cpp b/Controllers/RazerController/RGBController_RazerAddressable.cpp index 58381724..e2320215 100644 --- a/Controllers/RazerController/RGBController_RazerAddressable.cpp +++ b/Controllers/RazerController/RGBController_RazerAddressable.cpp @@ -5,6 +5,7 @@ /**------------------------------------------------------------------*\ @name Razer ARGB + @category LEDStrip @type USB @save :warning: @direct :white_check_mark: @@ -148,7 +149,7 @@ void RGBController_RazerAddressable::SetupZones() leds.clear(); colors.clear(); zones.resize(zone_count); - + /*---------------------------------------------------------*\ | Fill in zone information based on device table | \*---------------------------------------------------------*/ diff --git a/Controllers/RazerController/RGBController_RazerKraken.cpp b/Controllers/RazerController/RGBController_RazerKraken.cpp index 77456a4b..6b4e91d5 100644 --- a/Controllers/RazerController/RGBController_RazerKraken.cpp +++ b/Controllers/RazerController/RGBController_RazerKraken.cpp @@ -3,6 +3,7 @@ /**------------------------------------------------------------------*\ @name Razer Kraken + @category Headset @type USB @save :warning: @direct :white_check_mark: diff --git a/Controllers/RedragonController/RGBController_RedragonM711.cpp b/Controllers/RedragonController/RGBController_RedragonM711.cpp index 262abd6d..cd3a1680 100644 --- a/Controllers/RedragonController/RGBController_RedragonM711.cpp +++ b/Controllers/RedragonController/RGBController_RedragonM711.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Redragon Mice + @category Mouse @type USB @save :warning: @direct :x: @@ -36,7 +37,7 @@ RGBController_RedragonM711::RGBController_RedragonM711(RedragonM711Controller* r Static.flags = MODE_FLAG_HAS_PER_LED_COLOR | MODE_FLAG_AUTOMATIC_SAVE; Static.color_mode = MODE_COLORS_PER_LED; modes.push_back(Static); - + mode Wave; Wave.name = "Wave"; Wave.value = REDRAGON_M711_MODE_WAVE; diff --git a/Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp b/Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp index 4bdadcef..9404c997 100644 --- a/Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp +++ b/Controllers/RoccatController/RGBController_RoccatHordeAimo.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Roccat Horde Aimo + @category Keyboard @type USB @save :x: @direct :white_check_mark: @@ -72,7 +73,7 @@ void RGBController_RoccatHordeAimo::ResizeZone(int /*zone*/, int /*new_size*/) } void RGBController_RoccatHordeAimo::DeviceUpdateLEDs() -{ +{ UpdateZoneLEDs(0); } diff --git a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp b/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp index b160587a..c2e376ef 100644 --- a/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp +++ b/Controllers/RoccatController/RGBController_RoccatKoneAimo.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Roccat Kone Aimo + @category Mouse @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp b/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp index e834725b..70d8ba44 100644 --- a/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp +++ b/Controllers/RoccatController/RGBController_RoccatVulcanAimo.cpp @@ -161,6 +161,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name Roccat Vulcan Aimo + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp index e8aa07d6..73f06a3b 100644 --- a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp +++ b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV1.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Sapphire Nitro Glow v1 + @category GPU @type I2C @save :x: @direct :x: diff --git a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp index 1c46a2fd..645763f5 100644 --- a/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp +++ b/Controllers/SapphireGPUController/RGBController_SapphireNitroGlowV3.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Sapphire Nitro Glow v3 + @category GPU @type I2C @save :x: @direct :x: diff --git a/Controllers/SinowealthController/RGBController_Sinowealth.cpp b/Controllers/SinowealthController/RGBController_Sinowealth.cpp index 2fde23f8..f0437d17 100644 --- a/Controllers/SinowealthController/RGBController_Sinowealth.cpp +++ b/Controllers/SinowealthController/RGBController_Sinowealth.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Sinowealth Mice + @category Mouse @type USB @save :warning: @direct :x: diff --git a/Controllers/SinowealthController/RGBController_Sinowealth1007.cpp b/Controllers/SinowealthController/RGBController_Sinowealth1007.cpp index 33bf313f..69bde3cb 100644 --- a/Controllers/SinowealthController/RGBController_Sinowealth1007.cpp +++ b/Controllers/SinowealthController/RGBController_Sinowealth1007.cpp @@ -22,6 +22,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name Sinowealth 1007 Mouse + @category Mouse @type USB @save :x: @direct :x: @@ -236,7 +237,7 @@ void RGBController_Sinowealth1007::DeviceUpdateMode() { unsigned char random = (modes[active_mode].flags & MODE_FLAG_HAS_RANDOM_COLOR) ? ZET_FURY_PRO_SUBMODE_SET_COLOR : 0x00; random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM) ? ZET_FURY_PRO_SUBMODE_RANDOM : random; - + if (modes[active_mode].value == ZET_FURY_PRO_MODE_BREATHING) { random = ZET_FURY_PRO_SUBMODE_SET_COLOR; // An unfortunate exception that has no random option but requires this diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp b/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp index c061e274..fce8b9b4 100644 --- a/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp +++ b/Controllers/SinowealthController/RGBController_SinowealthKeyboard.cpp @@ -120,6 +120,7 @@ static const char *led_names_tkl[] = /**------------------------------------------------------------------*\ @name Sinowealth Keyboard + @category Keyboard @type USB @save :x: @direct :x: diff --git a/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp b/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp index ae30ffce..fb6d7e5a 100644 --- a/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp +++ b/Controllers/SinowealthController/RGBController_SinowealthKeyboard16.cpp @@ -171,6 +171,7 @@ static const char *led_names_tkl[] = /**------------------------------------------------------------------*\ @name Sinowealth Keyboard 16 + @category Keyboard @type USB @save :x: @direct :x: @@ -234,7 +235,7 @@ RGBController_SinowealthKeyboard16::RGBController_SinowealthKeyboard16(Sinowealt mode PerLed; PerLed.name = "Custom"; - + if(i > 0) { PerLed.name += " " + std::to_string(i + 1); @@ -472,6 +473,6 @@ void RGBController_SinowealthKeyboard16::DeviceUpdateMode() std::fill(colors.begin(), colors.end(), ActiveMode.colors[0]); } } - + SignalUpdate(); } diff --git a/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp b/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp index 8aae0aeb..13528264 100644 --- a/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp +++ b/Controllers/SonyDS4Controller/RGBController_SonyDS4.cpp @@ -12,6 +12,7 @@ /**------------------------------------------------------------------*\ @name Sony Dual Shock 4 controller + @category Gamepad @type USB @save :x: @direct :white_check_mark: @@ -23,14 +24,14 @@ RGBController_SonyDS4::RGBController_SonyDS4(SonyDS4Controller* dualshock) { this->dualshock = dualshock; - + name = "Sony DualShock 4"; vendor = "Sony"; type = DEVICE_TYPE_GAMEPAD; description = "Sony DualShock 4 Device"; location = dualshock->GetLocation(); serial = dualshock->GetSerialString(); - + mode Direct; Direct.value = 0; Direct.name = "Direct"; diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp index cb8e7e51..e5675951 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesApex.cpp @@ -15,7 +15,7 @@ using namespace std::chrono_literals; //0xFFFFFFFF indicates an unused entry in matrix #define NA 0xFFFFFFFF -static unsigned int matrix_map[6][23] = +static unsigned int matrix_map[6][23] = { { 37, NA, 53, 54, 55, 56, NA, 57, 58, 59, 60, NA, 61 , 62 , 63 , 64 , 65, 66, 67, NA, NA, NA, NA }, { 48, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 41, 42 , NA , 38 , 88 , 68, 69, 70, 89, 90, 91, 92 }, { 39, NA, 16, 22, 4 , 17, 19, 24, 20, 8 , 14, 15, 43 , 44 , NA , 36 , 71, 72, 73, 101, 102, 103, 93 }, @@ -23,7 +23,7 @@ static unsigned int matrix_map[6][23] = { 80, 78, 25, 23, 2 , 21, NA, 1 , 13, 12, 49, 50, 51 , NA , 84 , NA , NA, 77, NA, 95, 96, 97, 94 }, { 79, 82, 81, NA, NA, NA, NA, 40, NA, NA, NA, NA, 85 , 86 , 87 , 83 , 75, 76, 74, 104, NA, 105, NA } }; -static unsigned int matrix_map_tkl[6][19] = +static unsigned int matrix_map_tkl[6][19] = { { 37, NA, 53, 54, 55, 56, NA, 57, 58, 59, 60, NA, 61 , 62 , 63 , 64 , 65, 66, 67}, { 48, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 41, 42 , NA , 38 , 88 , 68, 69, 70}, { 39, NA, 16, 22, 4 , 17, 19, 24, 20, 8 , 14, 15, 43 , 44 , NA , 36 , 71, 72, 73}, @@ -163,6 +163,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name Steel Series APEX + @category Keyboard @type USB @save :x: @direct :white_check_mark: @@ -181,7 +182,7 @@ RGBController_SteelSeriesApex::RGBController_SteelSeriesApex(SteelSeriesApexBase description = "SteelSeries Apex RGB Device"; location = steelseries->GetDeviceLocation(); serial = ""; - + proto_type = steelseries->proto_type; mode Direct; diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesApexTZone.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesApexTZone.cpp index 6f55aee2..119b66d6 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesApexTZone.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesApexTZone.cpp @@ -8,6 +8,7 @@ /**------------------------------------------------------------------*\ @name Steel Series Apex Tri Zone Keyboards + @category Keyboard @type USB @save :x: @direct :white_check_mark: @@ -19,7 +20,7 @@ RGBController_SteelSeriesApexTZone::RGBController_SteelSeriesApexTZone(SteelSeriesApexTZoneController* controller_ptr) { controller = controller_ptr; - + name = controller->GetDeviceName(); vendor = "SteelSeries"; type = DEVICE_TYPE_KEYBOARD; diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.cpp index b16ccc4c..d4e2a191 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesArctis5.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Steelseries Arctis 5 + @category Headset @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp index ed89f5cb..01a98e11 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesOldApex.cpp @@ -20,9 +20,10 @@ /**------------------------------------------------------------------*\ @name Steel Series Apex (Old) + @category Keyboard @type USB @save :x: - @direct :white_check_mark:: + @direct :white_check_mark: @effects :x: @detectors DetectSteelSeriesApexOld @comment @@ -31,10 +32,10 @@ RGBController_SteelSeriesOldApex::RGBController_SteelSeriesOldApex(SteelSeriesOldApexController* old_apex_ptr) { OldApex = old_apex_ptr; - + name = OldApex->GetDeviceName(); vendor = "SteelSeries"; - type = DEVICE_TYPE_KEYBOARD; + type = DEVICE_TYPE_KEYBOARD; description = "SteelSeries old Apex device"; location = OldApex->GetDeviceLocation(); serial = OldApex->GetSerialString(); @@ -65,11 +66,11 @@ void RGBController_SteelSeriesOldApex::SetupZones() qwerty_zone.leds_count = 1; qwerty_zone.matrix_map = NULL; zones.push_back(qwerty_zone); - + led qwerty_led; qwerty_led.name = "QWERTY"; leds.push_back(qwerty_led); - + zone tenkey_zone; tenkey_zone.name = "TenKey"; tenkey_zone.type = ZONE_TYPE_LINEAR; @@ -78,11 +79,11 @@ void RGBController_SteelSeriesOldApex::SetupZones() tenkey_zone.leds_count = 1; tenkey_zone.matrix_map = NULL; zones.push_back(tenkey_zone); - + led tenkey_led; tenkey_led.name = "TenKey"; leds.push_back(tenkey_led); - + zone function_zone; function_zone.name = "FunctionKeys"; function_zone.type = ZONE_TYPE_LINEAR; @@ -91,11 +92,11 @@ void RGBController_SteelSeriesOldApex::SetupZones() function_zone.leds_count = 1; function_zone.matrix_map = NULL; zones.push_back(function_zone); - + led function_led; function_led.name = "FunctionKeys"; leds.push_back(function_led); - + zone mx_zone; mx_zone.name = "MXKeys"; mx_zone.type = ZONE_TYPE_LINEAR; @@ -104,7 +105,7 @@ void RGBController_SteelSeriesOldApex::SetupZones() mx_zone.leds_count = 1; mx_zone.matrix_map = NULL; zones.push_back(mx_zone); - + led mx_led; mx_led.name = "MXKeys"; leds.push_back(mx_led); @@ -117,11 +118,11 @@ void RGBController_SteelSeriesOldApex::SetupZones() logo_zone.leds_count = 1; logo_zone.matrix_map = NULL; zones.push_back(logo_zone); - + led logo_led; logo_led.name = "Logo"; leds.push_back(logo_led); - + SetupColors(); } diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.cpp index 9320d986..fdfc6cd3 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesQCKMat.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Steel Series QCK Mat + @category Mousemat @type USB @save :x: @direct :white_check_mark: @@ -22,10 +23,10 @@ RGBController_SteelSeriesQCKMat::RGBController_SteelSeriesQCKMat(SteelSeriesQCKMatController* qck_ptr) { qck = qck_ptr; - + name = qck->GetDeviceName(); vendor = "SteelSeries"; - type = DEVICE_TYPE_MOUSEMAT; + type = DEVICE_TYPE_MOUSEMAT; description = "SteelSeries QCK Mat Device"; location = qck->GetDeviceLocation(); serial = qck->GetSerialString(); diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp index 6d9a3673..45c5ca3a 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival.cpp @@ -37,6 +37,7 @@ static const steelseries_rival_led_info rival_600_leds[]= /**------------------------------------------------------------------*\ @name Steel Series Rival + @category Mouse @type USB @save :x: @direct :white_check_mark: @@ -48,10 +49,10 @@ static const steelseries_rival_led_info rival_600_leds[]= RGBController_SteelSeriesRival::RGBController_SteelSeriesRival(SteelSeriesRivalController* rival_ptr) { rival = rival_ptr; - + name = rival->GetDeviceName(); vendor = "SteelSeries"; - type = DEVICE_TYPE_MOUSE; + type = DEVICE_TYPE_MOUSE; description = "SteelSeries Rival Device"; location = rival->GetDeviceLocation(); serial = rival->GetSerialString(); @@ -113,7 +114,7 @@ void RGBController_SteelSeriesRival::SetupZones() wheel_zone.leds_count = 1; wheel_zone.matrix_map = NULL; zones.push_back(wheel_zone); - + led wheel_led; wheel_led.name = "Scroll Wheel"; wheel_led.value = 1; @@ -222,7 +223,7 @@ void RGBController_SteelSeriesRival::UpdateZoneLEDs(int zone) unsigned char blu = RGBGetBValue(zones[zone].colors[i]); rival->SetColor(zones[zone].leds[i].value, red, grn, blu); } -} +} void RGBController_SteelSeriesRival::UpdateSingleLED(int led) { @@ -239,7 +240,7 @@ void RGBController_SteelSeriesRival::SetCustomMode() void RGBController_SteelSeriesRival::DeviceUpdateMode() { - /* Strictly, the device actually does support different modes for the + /* Strictly, the device actually does support different modes for the * different zones, but we don't support that. */ //steelseries_type mouse_type = rival->GetMouseType(); switch (modes[active_mode].value) diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.cpp index a6e2b38b..157d1ba8 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesRival3.cpp @@ -25,6 +25,7 @@ static const steelseries_rival_led_info rival_3_leds[]= /**------------------------------------------------------------------*\ @name Steel Series Rival 3 + @category Mouse @type USB @save :white_check_mark: @direct :white_check_mark: @@ -36,10 +37,10 @@ static const steelseries_rival_led_info rival_3_leds[]= RGBController_SteelSeriesRival3::RGBController_SteelSeriesRival3(SteelSeriesRival3Controller* rival_ptr) { rival = rival_ptr; - + name = rival->GetDeviceName(); vendor = "SteelSeries"; - type = DEVICE_TYPE_MOUSE; + type = DEVICE_TYPE_MOUSE; description = "SteelSeries Rival 3 Device"; location = rival->GetDeviceLocation(); serial = rival->GetSerialString(); @@ -85,7 +86,7 @@ RGBController_SteelSeriesRival3::RGBController_SteelSeriesRival3(SteelSeriesRiva | | | It is disabled in the vendor software, and is only known about as it is | | documented in rivalcfg. | - | | + | | | If this does get re-enabled, worth noting it has an issue where this | | mode is black if you come directly from one of the pulsating modes. | \*------------------------------------------------------------------------*/ @@ -153,7 +154,7 @@ void RGBController_SteelSeriesRival3::UpdateZoneLEDs(int zone) | Subtracting one as the zone and led indexes differ | \*--------------------------------------------------*/ UpdateSingleLED(zones[zone].leds[0].value - 1); -} +} void RGBController_SteelSeriesRival3::UpdateSingleLED(int led) { diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.cpp index 5ca8c160..7f03b3c4 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesSensei.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Steel Series Sensei + @category Mouse @type USB @save :x: @direct :white_check_mark: @@ -22,10 +23,10 @@ RGBController_SteelSeriesSensei::RGBController_SteelSeriesSensei(SteelSeriesSenseiController* sensei_ptr) { sensei = sensei_ptr; - + name = sensei->GetDeviceName(); vendor = "SteelSeries"; - type = DEVICE_TYPE_MOUSE; + type = DEVICE_TYPE_MOUSE; description = "SteelSeries Sensei Device"; location = sensei->GetDeviceLocation(); serial = sensei->GetSerialString(); @@ -127,7 +128,7 @@ void RGBController_SteelSeriesSensei::UpdateZoneLEDs(int zone) sensei->SetLightEffect(zone, modes[active_mode].value, modes[active_mode].speed, red, grn, blu); break; } -} +} void RGBController_SteelSeriesSensei::UpdateSingleLED(int led) { diff --git a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp index b2630634..4675eb2d 100644 --- a/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp +++ b/Controllers/SteelSeriesController/RGBController_SteelSeriesSiberia.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Steel Series Siberia + @category Headset @type USB @save :x: @direct :x: @@ -22,10 +23,10 @@ RGBController_SteelSeriesSiberia::RGBController_SteelSeriesSiberia(SteelSeriesSiberiaController* siberia_ptr) { siberia = siberia_ptr; - + name = siberia->GetDeviceName(); vendor = "SteelSeries"; - type = DEVICE_TYPE_HEADSET; + type = DEVICE_TYPE_HEADSET; description = "SteelSeries Siberia Device"; location = siberia->GetDeviceLocation(); serial = siberia->GetSerialString(); diff --git a/Controllers/TecknetController/RGBController_Tecknet.cpp b/Controllers/TecknetController/RGBController_Tecknet.cpp index f2701ebf..664d0a3e 100644 --- a/Controllers/TecknetController/RGBController_Tecknet.cpp +++ b/Controllers/TecknetController/RGBController_Tecknet.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Tecknet Mouse + @category Mouse @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp index 93b13fa7..936e7d94 100644 --- a/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp +++ b/Controllers/ThermaltakePoseidonZRGBController/RGBController_ThermaltakePoseidonZRGB.cpp @@ -141,11 +141,12 @@ static const char* led_names[] = KEY_EN_SCROLL_LOCK, KEY_EN_RIGHT_SHIFT, KEY_EN_PAUSE_BREAK, - KEY_EN_BACKSPACE + KEY_EN_BACKSPACE }; /**------------------------------------------------------------------*\ @name Thermaltake PoseidonZ + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp index ac91db0c..2b963390 100644 --- a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp +++ b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Thermaltake Riing + @category Cooler @type USB @save :x: @direct :white_check_mark: @@ -165,7 +166,7 @@ void RGBController_ThermaltakeRiing::SetupZones() } zones[channel_idx].matrix_map = NULL; - + for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) { char led_idx_string[3]; diff --git a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp index 89eff176..a8b9e70c 100644 --- a/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp +++ b/Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Thermaltake Riing Quad + @category Cooler @type USB @save :x: @direct :white_check_mark: @@ -92,7 +93,7 @@ void RGBController_ThermaltakeRiingQuad::SetupZones() } zones[channel_idx].matrix_map = NULL; - + for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) { char led_idx_string[3]; diff --git a/Controllers/ThingMController/RGBController_BlinkController.cpp b/Controllers/ThingMController/RGBController_BlinkController.cpp index a3b051e4..859e9f81 100644 --- a/Controllers/ThingMController/RGBController_BlinkController.cpp +++ b/Controllers/ThingMController/RGBController_BlinkController.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name ThingM Blink + @category LEDStrip @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/TrustController/RGBController_TrustGXT114.cpp b/Controllers/TrustController/RGBController_TrustGXT114.cpp index 713b1187..5de7771d 100644 --- a/Controllers/TrustController/RGBController_TrustGXT114.cpp +++ b/Controllers/TrustController/RGBController_TrustGXT114.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name Trust GXT 114 + @category Mouse @type USB @save :x: @direct :x: @@ -43,7 +44,7 @@ RGBController_TrustGXT114::RGBController_TrustGXT114(TrustGXT114Controller* cont Static.brightness_min = TRUST_GXT_114_BRIGHTNESS_MIN; Static.brightness_max = TRUST_GXT_114_BRIGHTNESS_MAX; Static.brightness = TRUST_GXT_114_BRIGHTNESS_MAX; - Static.colors.resize(1); + Static.colors.resize(1); modes.push_back(Static); mode Breathing; @@ -131,6 +132,6 @@ void RGBController_TrustGXT114::SetCustomMode() } void RGBController_TrustGXT114::DeviceUpdateMode() -{ +{ controller->SetMode(modes[active_mode].colors[0], modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].value); } diff --git a/Controllers/TrustController/RGBController_TrustGXT180.cpp b/Controllers/TrustController/RGBController_TrustGXT180.cpp index 067e9c65..08dbe073 100644 --- a/Controllers/TrustController/RGBController_TrustGXT180.cpp +++ b/Controllers/TrustController/RGBController_TrustGXT180.cpp @@ -14,6 +14,7 @@ /**------------------------------------------------------------------*\ @name Trust GXT 180 + @category Mouse @type USB @save :x: @direct :x: @@ -135,6 +136,6 @@ void RGBController_TrustGXT180::SetCustomMode() } void RGBController_TrustGXT180::DeviceUpdateMode() -{ +{ controller->SetMode(colors[0], modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].value); } diff --git a/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp b/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp index da339744..6974cab8 100644 --- a/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp +++ b/Controllers/WootingKeyboardController/RGBController_WootingKeyboard.cpp @@ -168,11 +168,12 @@ static const char *led_names[] = KEY_EN_NUMPAD_PLUS, KEY_EN_UNUSED, KEY_EN_NUMPAD_ENTER, - KEY_EN_UNUSED + KEY_EN_UNUSED }; /**------------------------------------------------------------------*\ @name Wooting Keyboards + @category Keyboard @type USB @save :x: @direct :white_check_mark: diff --git a/Controllers/YeelightController/RGBController_Yeelight.cpp b/Controllers/YeelightController/RGBController_Yeelight.cpp index 61463ca3..95e79ee0 100644 --- a/Controllers/YeelightController/RGBController_Yeelight.cpp +++ b/Controllers/YeelightController/RGBController_Yeelight.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Yeelight + @category Light @type Network @save :x: @direct :warning: diff --git a/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp b/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp index 0bf6ee60..eba95fd8 100644 --- a/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp +++ b/Controllers/ZETEdgeAirProController/RGBController_ZETEdgeAirPro.cpp @@ -13,6 +13,7 @@ /**------------------------------------------------------------------*\ @name ZET Edge Air Pro + @category Mouse @type USB @save :x: @direct :x: @@ -134,7 +135,7 @@ void RGBController_ZETEdgeAirPro::SetCustomMode() } void RGBController_ZETEdgeAirPro::DeviceUpdateMode() -{ +{ RGBColor color; if(modes[active_mode].flags & MODE_FLAG_HAS_PER_LED_COLOR) diff --git a/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp b/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp index 05394ec6..0bd0a4c1 100644 --- a/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp +++ b/Controllers/ZETKeyboardController/RGBController_ZETBladeOptical.cpp @@ -172,6 +172,7 @@ static const char *led_names[] = /**------------------------------------------------------------------*\ @name Zet Blade Optical + @category Keyboard @type USB @save :x: @direct :x: diff --git a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp index 3083f70b..d98d25c7 100644 --- a/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp +++ b/Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp @@ -11,6 +11,7 @@ /**------------------------------------------------------------------*\ @name Zalmna Z Sync + @category LEDStrip @type USB @save :x: @direct :white_check_mark: @@ -226,7 +227,7 @@ void RGBController_ZalmanZSync::SetupZones() } zones[channel_idx].matrix_map = NULL; - + for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) { char led_idx_string[4]; diff --git a/RGBController/RGBController_Dummy.cpp b/RGBController/RGBController_Dummy.cpp index 605bef71..23af9d1e 100644 --- a/RGBController/RGBController_Dummy.cpp +++ b/RGBController/RGBController_Dummy.cpp @@ -10,6 +10,7 @@ /**------------------------------------------------------------------*\ @name Dummy + @category Unknown @type I2C or Serial or WMI or USB @save :white_check_mark: or :warning: or :x: @direct :white_check_mark: or :warning: or :x: @@ -55,5 +56,5 @@ void RGBController_Dummy::SetCustomMode() void RGBController_Dummy::DeviceUpdateMode() { - + } diff --git a/scripts/build-supported-devices-md.sh b/scripts/build-supported-devices-md.sh new file mode 100755 index 00000000..144abb98 --- /dev/null +++ b/scripts/build-supported-devices-md.sh @@ -0,0 +1,247 @@ +#!/bin/bash +#-----------------------------------------------------------------------------# +# This script relies on the preprocessed *.ii and *.s files from # +# all "RGBController_" .cpp files and the detectors that call them # +# so that all #define macros have been replaced and can be text processed # +# # +# This script produces a set of markdown documents as defined by the # +# supported_devs target in the Linux specific section of OpenRGB.pro # +#-----------------------------------------------------------------------------# + +## Modular Variables +OPENRGB_PATH=$1 +CONTROLLER_PATH=${OPENRGB_PATH}'/Controllers' +DATA_TABLE_HEAD='| Controller Name | Connection | Save to Flash | Direct | Hardware Effects |\n' +DATA_TABLE_ALIGN='| :--- | :---: | :---: | :---: | :---: |' +DEVICE_TABLE_HEAD='| VID | PID | Device Name |\n' +DEVICE_TABLE_ALIGN='| :---: | :---: | :--- |' +MAIN_FILE='Supported Devices.md' + +## We first need to build OpenRGB with the preprocessed files saved +#qmake ${OPENRGB_PATH}/OpenRGB.pro "QMAKE_CXXFLAGS+=-save-temps" +#make -j$(nproc) + +## The HID list is produced from each "REGISTER_DETECTOR" macro replacement. +## | callback_function | VID | PID | Name | +HID_LIST=$(grep -hR -e "static\ HIDDeviceDetector" . | cut -d '(' -f 2- | awk -F , '{ print $2 ":|" $3 "|" $4 "|" $1 "|" }') +I2C_LIST=$(grep -hR -e "static\ I2CPCIDeviceDetector" . | cut -d '(' -f 2- | awk -F , '{ print $2 ":|" $3 "|" $4 "|" $5 "|" $6 "|" $1 "|" }') + +printf %s\n%s "$HID_LIST" "$I2C_LIST" > "device.list" + +## This is the list of RGBController.cpp classes including path +FILE_LIST=$(find ${CONTROLLER_PATH} | grep RGBController_ | grep cpp | sort) + +echo -e $FILE_LIST > "file.list" + +## Write the heading to the main file prior to iterating over the controller list +echo -e "# Supported Devices\n\n" > "$MAIN_FILE" + +## Write quick links to each section heading in an unordered list +echo -e "- [Motherboards](#motherboards)" >> "$MAIN_FILE" +echo -e "- [RAM](#ram)" >> "$MAIN_FILE" +echo -e "- [Graphics Cards](#graphics-cards)" >> "$MAIN_FILE" +echo -e "- [Coolers](#coolers)" >> "$MAIN_FILE" +echo -e "- [LED Strips](#led-strips)" >> "$MAIN_FILE" +echo -e "- [Keyboards](#keyboards)" >> "$MAIN_FILE" +echo -e "- [Mice](#mouse)" >> "$MAIN_FILE" +echo -e "- [Mouse Mats](#mouse-mats)" >> "$MAIN_FILE" +echo -e "- [Headsets](#headsets)" >> "$MAIN_FILE" +echo -e "- [Headset Stands](#headset-stands)" >> "$MAIN_FILE" +echo -e "- [Gamepads](#gamepads)" >> "$MAIN_FILE" +echo -e "- [Lights](#lights)" >> "$MAIN_FILE" +echo -e "- [Speakers](#speakers)" >> "$MAIN_FILE" +echo -e "- [Virtual Devices](#virtual-devices)" >> "$MAIN_FILE" +echo -e "- [Storage](#storage)" >> "$MAIN_FILE" +echo -e "- [Cases](#cases)" >> "$MAIN_FILE" +echo -e "- [Other Devices](#other-devices)" >> "$MAIN_FILE" + +while read -r controller +do + ## 's/\r$//' - Convert DOS text to Unix text + DATA=$(sed -e 's/\r$//' ${controller} | awk -v RS='' '/\/\*\*/') + + ## 's/^ *//g' - Remove all leading whitespace + ## 's/\,/\n/g' - Convert a comma separated list to lines + name=$(printf %s "$DATA" | grep @name | sed -e 's/@name//g' -e 's/^ *//g') + categories=$(printf %s "$DATA" | grep @category | sed -e 's/@category//g' -e 's/^ *//g' -e 's/\,/\n/g') + type=$(printf %s "$DATA" | grep @type | sed -e 's/@type//g' -e 's/^ *//g') + save=$(printf %s "$DATA" | grep @save | sed -e 's/@save//g' -e 's/^ *//g') + direct=$(printf %s "$DATA" | grep @direct | sed -e 's/@direct//g' -e 's/^ *//g') + effects=$(printf %s "$DATA" | grep @effects | sed -e 's/@effects//g' -e 's/^ *//g') + detectors=$(printf %s "$DATA" | grep @detectors | sed -e 's/@detectors *//g' -e 's/^ *//g' -e 's/\,/\n/g') + comment=$(printf %s "$DATA" | awk -v RS='@' '/comment/' | grep -v '\*' | sed -e 's/comment//g' -e 's/^ *//g') + + if [[ $name = *[![:blank:]]* ]]; then #Check that the name is not blank + case $save in + :x:) + save_title="Not supported by controller" + ;; + :warning:) + save_title="Controller saves on every update" + ;; + :white_check_mark:) + save_title="Saving is supported by this controller" + ;; + esac + + case $direct in + :x:) + direct_title="Not supported by controller" + ;; + :warning:) + direct_title="Direct control is problematic" + ;; + :white_check_mark:) + direct_title="Direct control is supported for Software Effects" + ;; + esac + + case $effects in + :x:) + effects_title="Hardware effects are not supported by controller" + ;; + :warning:) + effects_title="Hardware effects are not fully implemented by controller" + ;; + :white_check_mark:) + effects_title="Hardware effects are supported" + ;; + esac + + link=$(echo -e ${name} | sed -e 's/(/%28/' -e 's/)/%29/') + ## Output this controllers entry into the main file's tables + current_controller='|['${name}']('${link}'.md)|'${type}'|'${save}'|'${direct}'|'${effects}'|\n' + + ## Add entry to all relevant categories listed in @category + while read -r category + do + case $category in + Motherboard) + motherboard+=$current_controller + ;; + RAM) + ram+=$current_controller + ;; + GPU) + gpu+=$current_controller + ;; + Cooler) + cooler+=$current_controller + ;; + LEDStrip) + ledstrip+=$current_controller + ;; + Keyboard) + keyboard+=$current_controller + ;; + Mouse) + mouse+=$current_controller + ;; + Mousemat) + mousemat+=$current_controller + ;; + Headset) + headset+=$current_controller + ;; + HeadsetStand) + headset_stand+=$current_controller + ;; + Gamepad) + gamepad+=$current_controller + ;; + Light) + light+=$current_controller + ;; + Speaker) + speaker+=$current_controller + ;; + Virtual) + virtual+=$current_controller + ;; + Storage) + storage+=$current_controller + ;; + Case) + case+=$current_controller + ;; + *) + unknown+=$current_controller + ;; + esac + done <<< "$categories" + + ## Create a controller page and fill it with header details and the start of the device table + outfile=${name}.md + echo -e "# ${name}\n\n ${comment}\n" >"$outfile" + echo -e "## Connection Type\n ${type}\n" >> "$outfile" + echo -e "## Saving\n ${save_title}\n" >> "$outfile" + echo -e "## Direct Mode\n ${direct_title}\n" >> "$outfile" + echo -e "## Hardware Effects\n ${effects_title}\n" >> "$outfile" + echo -e "## Device List\n\n${DEVICE_TABLE_HEAD}${DEVICE_TABLE_ALIGN}" >> "$outfile" + + ## Iterate over the comma seperated detector function list + while read -r detector + do + #Filter the list for all devices that use this detector + text=$(printf %s\n%s "$HID_LIST" "$I2C_LIST" | grep ${detector} | cut -d: -f 2- | sed -e 's/"//g') + + #Replace the detector string with the list of devices + detectors=${detectors/${detector}/${text}} + + vid="" + pid="" + svid="" + spid="" + device_name="" + + while read -r device + do + case $type in + USB) + IFS='|' read null vid pid device_name null <<<"$device" + #Remove leading hex signifier from $vid and $pid + vid=${vid/0x/} + pid=${pid/0x/} + device_name=${device_name//[^[:alnum:][:blank:]]/} + + table_row=$(printf '| `%s` | `%s` | %s |' "${vid/ /}" "${pid/ /}" "${device_name}") + ;; + I2C | SMBus) + IFS='|' read null vid pid svid spid device_name null <<<"$device" + #Remove leading hex signifiers + vid=${vid/0x/} + pid=${pid/0x/} + svid=${svid/0x/} + spid=${spid/0x/} + device_name=${device_name//[^[:alnum:][:blank:]]/} + + table_row=$(printf '| `%s:%s` | `%s:%s` | %s |' "${vid}" "${pid/ /}" "${svid}" "${spid/ /}" "${device_name}") + ;; + *) + ;; + esac + + echo -e "$table_row" >>"$outfile" + done <<< "$text" + done <<< "$detectors" + fi +done <<< "$FILE_LIST" + +printf "\n## Motherboards\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${motherboard}| sort)">> "$MAIN_FILE" +printf "\n## RAM\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${ram}| sort)">> "$MAIN_FILE" +printf "\n## Graphics Cards\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${gpu}| sort)" >> "$MAIN_FILE" +printf "\n## Coolers\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${cooler}| sort)" >> "$MAIN_FILE" +printf "\n## LED Strips\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${ledstrip}| sort)" >> "$MAIN_FILE" +printf "\n## Keyboards\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${keyboard}| sort)" >> "$MAIN_FILE" +printf "\n## Mice\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${mouse}| sort)" >> "$MAIN_FILE" +printf "\n## Mouse Mats\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${mousemat}| sort)" >> "$MAIN_FILE" +printf "\n## Headsets\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${headset}| sort)" >> "$MAIN_FILE" +printf "\n## Headset Stands\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${headset_stand}| sort)" >> "$MAIN_FILE" +printf "\n## Gamepads\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${gamepad}| sort)" >> "$MAIN_FILE" +printf "\n## Lights\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${light}| sort)" >> "$MAIN_FILE" +printf "\n## Speakers\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${speaker}| sort)" >> "$MAIN_FILE" +printf "\n## Virtual Devices\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${virtual}| sort)" >> "$MAIN_FILE" +printf "\n## Storage\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${storage}| sort)" >> "$MAIN_FILE" +printf "\n## Cases\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${case}| sort)" >> "$MAIN_FILE" +printf "\n## Other Devices\n${DATA_TABLE_HEAD}${DATA_TABLE_ALIGN}%s\n" "$(echo -e ${unknown}| sort)" >> "$MAIN_FILE" + diff --git a/scripts/build-udev-rules.sh b/scripts/build-udev-rules.sh index cdd2da91..dfbfa01d 100755 --- a/scripts/build-udev-rules.sh +++ b/scripts/build-udev-rules.sh @@ -58,11 +58,14 @@ FILE_LIST=$(find ${CONTROLLER_PATH} | grep RGBController_ | grep cpp) #-----------------------------------------------------------------------------# while read -r controller do - DATA=$(awk -v RS='' '/\/\*\*/' ${controller}) + ## 's/\r$//' - Convert DOS text to Unix text + DATA=$(sed -e 's/\r$//' ${controller} | awk -v RS='' '/\/\*\*/') - name=$(printf %s "$DATA" | grep @name | sed -e 's/\r$//' -e 's/@name//g' -e 's/^ *//g') - type=$(printf %s "$DATA" | grep @type | sed -e 's/\r$//' -e 's/@type//g' -e 's/^ *//g') - detectors=$(printf %s "$DATA" | grep @detectors | sed -e 's/\r$//' -e 's/@detectors *//g' -e 's/^ *//g' -e 's/\,/\n/g') + ## 's/^ *//g' - Remove all leading whitespace + ## 's/\,/\n/g' - Convert a comma separated list to lines + name=$(printf %s "$DATA" | grep @name | sed -e 's/@name//g' -e 's/^ *//g') + type=$(printf %s "$DATA" | grep @type | sed -e 's/@type//g' -e 's/^ *//g') + detectors=$(printf %s "$DATA" | grep @detectors | sed -e 's/@detectors *//g' -e 's/^ *//g' -e 's/\,/\n/g') if [[ $type = USB || $type = Serial ]]; then #Check that the type is USB ## Iterate over the comma seperated detector function list @@ -102,8 +105,8 @@ if [ -f "$UDEV_FILE" ]; then outpath=$(readlink -f "$UDEV_FILE") echo -e "Udev rules built at: $outpath" - #Clean up the preprocessor files if the rules file was created successfully - rm *.{ii,s} + ## Clean up the preprocessor files if the rules file was created + # rm *.{ii,s} else echo -e "Something went wrong. No Udev file was found" fi