Skip to content

Commit 5d30d61

Browse files
Chr1sNoCalcProgrammer1
authored andcommitted
Fix for brightness in Direct mode in Fusion2USB controller
* Added definition for `RGBFUSION2_BRIGHTNESS_MAX` * Updated modes to reflect new definition * Added brightness to mode `Direct`
1 parent b36673b commit 5d30d61

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.cpp

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,20 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController
204204
mode Direct;
205205
Direct.name = "Direct";
206206
Direct.value = 0xFFFF;
207-
Direct.flags = MODE_FLAG_HAS_PER_LED_COLOR;
207+
Direct.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_PER_LED_COLOR;
208+
Direct.brightness_min = RGBFUSION2_BRIGHTNESS_MIN;
209+
Direct.brightness_max = RGBFUSION2_BRIGHTNESS_MAX;
210+
Direct.brightness = RGBFUSION2_BRIGHTNESS_MAX;
208211
Direct.color_mode = MODE_COLORS_PER_LED;
209212
modes.push_back(Direct);
210213

211214
mode Static;
212215
Static.name = "Static";
213216
Static.value = EFFECT_STATIC;
214217
Static.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR;
215-
Static.brightness_min = 0;
216-
Static.brightness_max = 100;
217-
Static.brightness = Static.brightness_max;
218+
Static.brightness_min = RGBFUSION2_BRIGHTNESS_MIN;
219+
Static.brightness_max = RGBFUSION2_BRIGHTNESS_MAX;
220+
Static.brightness = RGBFUSION2_BRIGHTNESS_MAX;
218221
Static.colors_min = 1;
219222
Static.colors_max = 1;
220223
Static.color_mode = MODE_COLORS_MODE_SPECIFIC;
@@ -225,9 +228,9 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController
225228
Breathing.name = "Breathing";
226229
Breathing.value = EFFECT_PULSE;
227230
Breathing.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
228-
Breathing.brightness_min = 0;
229-
Breathing.brightness_max = 100;
230-
Breathing.brightness = Breathing.brightness_max;
231+
Breathing.brightness_min = RGBFUSION2_BRIGHTNESS_MIN;
232+
Breathing.brightness_max = RGBFUSION2_BRIGHTNESS_MAX;
233+
Breathing.brightness = RGBFUSION2_BRIGHTNESS_MAX;
231234
Breathing.speed_min = 0;
232235
Breathing.speed_max = 4;
233236
Breathing.colors_min = 1;
@@ -241,9 +244,9 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController
241244
Blinking.name = "Blinking";
242245
Blinking.value = EFFECT_BLINKING;
243246
Blinking.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
244-
Blinking.brightness_min = 0;
245-
Blinking.brightness_max = 100;
246-
Blinking.brightness = Blinking.brightness_max;
247+
Blinking.brightness_min = RGBFUSION2_BRIGHTNESS_MIN;
248+
Blinking.brightness_max = RGBFUSION2_BRIGHTNESS_MAX;
249+
Blinking.brightness = RGBFUSION2_BRIGHTNESS_MAX;
247250
Blinking.speed_min = 0;
248251
Blinking.speed_max = 4;
249252
Blinking.colors_min = 1;
@@ -257,9 +260,9 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController
257260
ColorCycle.name = "Color Cycle";
258261
ColorCycle.value = EFFECT_COLORCYCLE;
259262
ColorCycle.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED;
260-
ColorCycle.brightness_min = 0;
261-
ColorCycle.brightness_max = 100;
262-
ColorCycle.brightness = ColorCycle.brightness_max;
263+
ColorCycle.brightness_min = RGBFUSION2_BRIGHTNESS_MIN;
264+
ColorCycle.brightness_max = RGBFUSION2_BRIGHTNESS_MAX;
265+
ColorCycle.brightness = RGBFUSION2_BRIGHTNESS_MAX;
263266
ColorCycle.speed_min = 0;
264267
ColorCycle.speed_max = 4;
265268
ColorCycle.color_mode = MODE_COLORS_NONE;
@@ -270,9 +273,9 @@ RGBController_RGBFusion2USB::RGBController_RGBFusion2USB(RGBFusion2USBController
270273
Flashing.name = "Flashing";
271274
Flashing.value = 10;
272275
Flashing.flags = MODE_FLAG_HAS_BRIGHTNESS | MODE_FLAG_HAS_SPEED | MODE_FLAG_HAS_MODE_SPECIFIC_COLOR | MODE_FLAG_HAS_RANDOM_COLOR;
273-
Flashing.brightness_min = 0;
274-
Flashing.brightness_max = 100;
275-
Flashing.brightness = Flashing.brightness_max;
276+
Flashing.brightness_min = RGBFUSION2_BRIGHTNESS_MIN;
277+
Flashing.brightness_max = RGBFUSION2_BRIGHTNESS_MAX;
278+
Flashing.brightness = RGBFUSION2_BRIGHTNESS_MAX;
276279
Flashing.speed_min = 0;
277280
Flashing.speed_max = 4;
278281
Flashing.colors_min = 1;

Controllers/GigabyteRGBFusion2USBController/RGBController_GigabyteRGBFusion2USB.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#define RGBFusion2_Digital_LEDS_Min 0;
1818
#define RGBFusion2_Digital_LEDS_Max 1024;
19+
#define RGBFUSION2_BRIGHTNESS_MIN 0;
20+
#define RGBFUSION2_BRIGHTNESS_MAX 100;
1921
#define RGBFusion2_Digital_Direct_Offset (HDR_D_LED1_RGB - HDR_D_LED1);
2022

2123
template<typename K, typename V>

0 commit comments

Comments
 (0)