sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-23 12:13:49 +01:00
Code Issues Releases Wiki Activity

Merge branch 'light_bitmask' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-18 14:58:06 -10:00
parent d0fa64e419 f7d52a342b
commit d817461f11
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
esphome/components/light/color_mode.h
View File

@@ -199,12 +199,13 @@ class ColorModeMask {
constexpr bool contains(ColorMode mode) const { return (this->mask_ & (1 << mode_to_bit(mode))) != 0; } constexpr bool contains(ColorMode mode) const { return (this->mask_ & (1 << mode_to_bit(mode))) != 0; }
constexpr size_t size() const { constexpr size_t size() const {
// Count set bits // Count set bits using Brian Kernighan's algorithm
// More efficient for sparse bitmasks (typical case: 2-4 modes out of 10)
uint16_t n = this->mask_; uint16_t n = this->mask_;
size_t count = 0; size_t count = 0;
while (n) { while (n) {
count += n & 1; n &= n - 1; // Clear the least significant set bit
n >>= 1; count++;
} }
return count; return count;
} }
@@ -276,11 +277,17 @@ class ColorModeMask {
// ColorCapability values: 1, 2, 4, 8, 16, 32 -> array indices: 0, 1, 2, 3, 4, 5 // ColorCapability values: 1, 2, 4, 8, 16, 32 -> array indices: 0, 1, 2, 3, 4, 5
// We need to convert the power-of-2 value to an index // We need to convert the power-of-2 value to an index
uint8_t cap_val = static_cast<uint8_t>(capability); uint8_t cap_val = static_cast<uint8_t>(capability);
#if defined(__GNUC__) || defined(__clang__)
// Use compiler intrinsic for efficient bit position lookup (O(1) vs O(log n))
int index = __builtin_ctz(cap_val);
#else
// Fallback for compilers without __builtin_ctz
int index = 0; int index = 0;
while (cap_val > 1) { while (cap_val > 1) {
cap_val >>= 1; cap_val >>= 1;
++index; ++index;
} }
#endif
return (this->mask_ & CAPABILITY_BITMASKS[index]) != 0; return (this->mask_ & CAPABILITY_BITMASKS[index]) != 0;
} }