From 7226a4164f516ec8a50e67ea69cf464d647ff8ec Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Mon, 6 Jan 2020 23:01:51 -0600 Subject: [PATCH] Hue 2 channel is a bitfield rather than a value --- Controllers/Hue2Controller/Hue2Controller.cpp | 6 +++--- RGBController/RGBController_Hue2.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Controllers/Hue2Controller/Hue2Controller.cpp b/Controllers/Hue2Controller/Hue2Controller.cpp index c100f2cd..dea1412a 100644 --- a/Controllers/Hue2Controller/Hue2Controller.cpp +++ b/Controllers/Hue2Controller/Hue2Controller.cpp @@ -104,7 +104,7 @@ void Hue2Controller::SetChannelEffect(unsigned int channel, unsigned int mode, s /*-----------------------------------------------------*\ | Set channel in USB packet | \*-----------------------------------------------------*/ - usb_buf[0x02] = channel; + usb_buf[0x02] = 1 << channel; /*-----------------------------------------------------*\ | Set mode in USB packet | @@ -180,8 +180,8 @@ void Hue2Controller::SetChannelLEDs(unsigned int channel, std::vector /*-----------------------------------------------------*\ | Set channel in USB packets | \*-----------------------------------------------------*/ - usb_buf[0x02] = channel; - usb_apply[0x02] = channel; + usb_buf[0x02] = 1 << channel; + usb_apply[0x02] = 1 << channel; /*-----------------------------------------------------*\ | Send first packet for first 20 LEDs | diff --git a/RGBController/RGBController_Hue2.cpp b/RGBController/RGBController_Hue2.cpp index 604b16e4..540dc758 100644 --- a/RGBController/RGBController_Hue2.cpp +++ b/RGBController/RGBController_Hue2.cpp @@ -52,7 +52,7 @@ RGBController_Hue2::RGBController_Hue2(Hue2Controller* hue2_ptr) new_led.name.append(led_idx_string); leds.push_back(new_led); - leds_channel.push_back(channel_idx + 1); + leds_channel.push_back(channel_idx); new_zone_map->push_back(led_idx); led_idx++; @@ -60,7 +60,7 @@ RGBController_Hue2::RGBController_Hue2(Hue2Controller* hue2_ptr) new_zone->map.push_back(*new_zone_map); zones.push_back(*new_zone); - zones_channel.push_back(channel_idx + 1); + zones_channel.push_back(channel_idx); } } }