From ce8331b4676aee7a03a3ab563c51b9618e4742c1 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Sat, 7 Mar 2020 17:18:44 -0600 Subject: [PATCH] Update Faustus controller to new RGBController API --- RGBController/RGBController_Faustus.cpp | 36 ++++++++++++++++++++----- RGBController/RGBController_Faustus.h | 5 ++++ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/RGBController/RGBController_Faustus.cpp b/RGBController/RGBController_Faustus.cpp index 2475cb81a..66786fb45 100644 --- a/RGBController/RGBController_Faustus.cpp +++ b/RGBController/RGBController_Faustus.cpp @@ -39,13 +39,7 @@ RGBController_Faustus::RGBController_Faustus(const std::string& dev_path) modes[3].color_mode = MODE_COLORS_NONE; modes[3].speed = FAUSTUS_SPEED_NORMAL; - colors.resize(1); - leds.resize(1); - leds[0].name = "Keyboard backlight LED"; - zones.resize(1); - zones[0].type = ZONE_TYPE_SINGLE; - zones[0].name = "Keyboard backlight zone"; - zones[0].map.push_back(std::vector(1, 0)); + SetupZones(); // Prepare file streams r_path = dev_path; @@ -63,6 +57,34 @@ RGBController_Faustus::RGBController_Faustus(const std::string& dev_path) set_path.append("/kbbl_set"); } +void RGBController_Faustus::SetupZones() +{ + /*---------------------------------------------------------*\ + | Set up zone | + \*---------------------------------------------------------*/ + zones.resize(1); + zones[0].type = ZONE_TYPE_SINGLE; + zones[0].name = "Keyboard Backlight zone"; + zones[0].leds_min = 1; + zones[0].leds_max = 1; + zones[0].leds_count = 1; + + /*---------------------------------------------------------*\ + | Set up LED | + \*---------------------------------------------------------*/ + leds.resize(1); + leds[0].name = "Keyboard Backlight LED"; + + SetupColors(); +} + +void RGBController_Faustus::ResizeZone(int /*zone*/, int /*new_size*/) +{ + /*---------------------------------------------------------*\ + | This device does not support resizing zones | + \*---------------------------------------------------------*/ +} + void RGBController_Faustus::UpdateLEDs() { int rv = uint8_t(RGBGetRValue(colors[0])); diff --git a/RGBController/RGBController_Faustus.h b/RGBController/RGBController_Faustus.h index 3cc780d57..0bd9bd122 100644 --- a/RGBController/RGBController_Faustus.h +++ b/RGBController/RGBController_Faustus.h @@ -30,6 +30,11 @@ class RGBController_Faustus : public RGBController public: RGBController_Faustus(const std::string& dev_path); + + void SetupZones(); + + void ResizeZone(int zone, int new_size); + void UpdateLEDs(); void UpdateZoneLEDs(int zone); void UpdateSingleLED(int led);