jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 19:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change light color schemes 2, 3 and 4

Browse Source 
Change light color schemes 2, 3 and 4 from color wheel to Hue driven
This commit is contained in:
Theo Arends 2019-12-01 18:19:17 +01:00
parent bea001968f
commit d9e20497da
2 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/CHANGELOG.md
View File

@ -2,7 +2,7 @@
### 7.1.1.1 20191201 ### 7.1.1.1 20191201
- Version bump - Change light color schemes 2, 3 and 4 from color wheel to Hue driven
## Released ## Released

42
tasmota/xdrv_04_light.ino
View File

@ -241,8 +241,8 @@ struct LIGHT {
uint8_t last_color[LST_MAX]; uint8_t last_color[LST_MAX];
uint8_t color_remap[LST_MAX]; uint8_t color_remap[LST_MAX];
uint8_t wheel = 0; uint16_t wheel = 0;
uint8_t random = 0; uint16_t random = 0;
uint8_t subtype = 0; // LST_ subtype uint8_t subtype = 0; // LST_ subtype
uint8_t device = 0; uint8_t device = 0;
uint8_t old_power = 1; uint8_t old_power = 1;
@ -1510,33 +1510,6 @@ void LightPreparePower(power_t channels = 0xFFFFFFFF) { // 1 = only RGB, 2 =
LightState(0); LightState(0);
} }
void LightWheel(uint8_t wheel_pos)
{
wheel_pos = 255 - wheel_pos;
if (wheel_pos < 85) {
Light.entry_color[0] = 255 - wheel_pos * 3;
Light.entry_color[1] = 0;
Light.entry_color[2] = wheel_pos * 3;
} else if (wheel_pos < 170) {
wheel_pos -= 85;
Light.entry_color[0] = 0;
Light.entry_color[1] = wheel_pos * 3;
Light.entry_color[2] = 255 - wheel_pos * 3;
} else {
wheel_pos -= 170;
Light.entry_color[0] = wheel_pos * 3;
Light.entry_color[1] = 255 - wheel_pos * 3;
Light.entry_color[2] = 0;
}
Light.entry_color[3] = 0;
Light.entry_color[4] = 0;
float dimmer = 100 / (float)Settings.light_dimmer;
for (uint32_t i = 0; i < LST_RGB; i++) {
float temp = (float)Light.entry_color[i] / dimmer + 0.5f;
Light.entry_color[i] = (uint8_t)temp;
}
}
void LightCycleColor(int8_t direction) void LightCycleColor(int8_t direction)
{ {
if (Light.strip_timer_counter % (Settings.light_speed * 2)) { if (Light.strip_timer_counter % (Settings.light_speed * 2)) {
@ -1545,14 +1518,19 @@ void LightCycleColor(int8_t direction)
if (0 == direction) { if (0 == direction) {
if (Light.random == Light.wheel) { if (Light.random == Light.wheel) {
Light.random = random(255); Light.random = random(358) +1; // Random Hue
} }
Light.wheel += (Light.random < Light.wheel) ? -1 : 1; Light.wheel += (Light.random < Light.wheel) ? -1 : 1;
} else { } else {
Light.wheel += direction; Light.wheel += direction;
} }
LightWheel(Light.wheel); if (Light.wheel > 359) { Light.wheel = 1; } // Loop Hue colors
memcpy(Light.new_color, Light.entry_color, sizeof(Light.new_color)); if (Light.wheel < 1) { Light.wheel = 359; } // Loop Hue colors
uint8_t sat;
light_state.getHSB(nullptr, &sat, nullptr); // Allow user control over Saturation
light_state.setHS(Light.wheel, sat);
light_controller.calcLevels(Light.new_color);
} }
void LightSetPower(void) void LightSetPower(void)