jalr/OpenRGB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update LED Strip controller to new RGBController API

Browse source
This commit is contained in:
Adam Honse 2020-03-07 01:38:32 -06:00
parent f854441cf7
commit fde468a162
4 changed files with 34 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OpenRGB.cpp
View file

@ -327,7 +327,7 @@ void DetectRGBControllers(void)
DetectRGBFusionControllers(busses, rgb_controllers);
//DetectMSIRGBControllers(rgb_controllers);
//DetectLEDStripControllers(rgb_controllers);
DetectLEDStripControllers(rgb_controllers);
//DetectHue2Controllers(rgb_controllers);
//DetectHuePlusControllers(rgb_controllers);

8
OpenRGB.pro
View file

@ -41,7 +41,7 @@ INCLUDEPATH += \
# Controllers/HuePlusController/ \
Controllers/HyperXController/ \
# Controllers/HyperXKeyboardController/ \
# Controllers/LEDStripController/ \
Controllers/LEDStripController/ \
# Controllers/MSI3ZoneController/ \
# Controllers/MSIRGBController/ \
# Controllers/PatriotViperController/ \
@ -99,8 +99,8 @@ SOURCES += \
Controllers/HyperXController/HyperXControllerDetect.cpp \
# Controllers/HyperXKeyboardController/HyperXKeyboardController.cpp \
# Controllers/HyperXKeyboardController/HyperXKeyboardControllerDetect.cpp \
# Controllers/LEDStripController/LEDStripController.cpp \
# Controllers/LEDStripController/LEDStripControllerDetect.cpp \
Controllers/LEDStripController/LEDStripController.cpp \
Controllers/LEDStripController/LEDStripControllerDetect.cpp \
# Controllers/MSI3ZoneController/MSI3ZoneController.cpp \
# Controllers/MSI3ZoneController/MSI3ZoneControllerDetect.cpp \
# Controllers/MSIRGBController/MSIRGBController.cpp \
@ -135,7 +135,7 @@ SOURCES += \
RGBController/RGBController_HyperX.cpp \
# RGBController/RGBController_HyperXKeyboard.cpp \
# RGBController/RGBController_E131.cpp \
# RGBController/RGBController_LEDStrip.cpp \
RGBController/RGBController_LEDStrip.cpp \
# RGBController/RGBController_MSI3Zone.cpp \
# RGBController/RGBController_MSIRGB.cpp \
# RGBController/RGBController_PatriotViper.cpp \

41
RGBController/RGBController_LEDStrip.cpp
View file

@ -25,29 +25,36 @@ RGBController_LEDStrip::RGBController_LEDStrip(LEDStripController* ledstrip_ptr)
Direct.color_mode = MODE_COLORS_PER_LED;
modes.push_back(Direct);
colors.resize(strip->num_leds);
for (int i = 0; i < strip->num_leds; i++)
{
char id_buf[16];
snprintf(id_buf, 16, "%d", i);
SetupZones();
}
void RGBController_LEDStrip::SetupZones()
{
zone led_zone;
led_zone.name = "LED Strip";
led_zone.type = ZONE_TYPE_LINEAR;
led_zone.leds_min = strip->num_leds;
led_zone.leds_max = strip->num_leds;
led_zone.leds_count = strip->num_leds;
zones.push_back(led_zone);
for(int led_idx = 0; led_idx < strip->num_leds; led_idx++)
{
led new_led;
new_led.name = "LED ";
new_led.name.append(id_buf);
new_led.name.append(std::to_string(led_idx));
leds.push_back(new_led);
}
zone led_zone;
led_zone.name = "LED Strip";
std::vector<int> led_zone_map;
for (int i = 0; i < strip->num_leds; i++)
{
led_zone_map.push_back(i);
}
led_zone.map.push_back(led_zone_map);
zones.push_back(led_zone);
SetupColors();
}
void RGBController_LEDStrip::ResizeZone(int /*zone*/, int /*new_size*/)
{
/*---------------------------------------------------------*\
| This device does not support resizing zones |
\*---------------------------------------------------------*/
}
void RGBController_LEDStrip::UpdateLEDs()

5
RGBController/RGBController_LEDStrip.h
View file

@ -16,6 +16,11 @@ class RGBController_LEDStrip : public RGBController
{
public:
RGBController_LEDStrip(LEDStripController* ledstrip_ptr);
void SetupZones();
void ResizeZone(int zone, int new_size);
void UpdateLEDs();
void UpdateZoneLEDs(int zone);
void UpdateSingleLED(int led);