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

dry

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-18 13:53:05 -10:00
parent a249c9c282
commit 2cdfd04204
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,11 +259,7 @@ class ColorModeMask {
constexpr bool operator!=(const Iterator &other) const { return !(*this == other); } constexpr bool operator!=(const Iterator &other) const { return !(*this == other); }
private: private:
constexpr void advance_to_next_set_bit_() { constexpr void advance_to_next_set_bit_() { bit_ = ColorModeMask::find_next_set_bit(mask_, bit_); }
while (bit_ < MAX_BIT_INDEX && !(mask_ & (1 << bit_))) {
++bit_;
}
}
color_mode_bitmask_t mask_; color_mode_bitmask_t mask_;
int bit_; int bit_;
@@ -275,15 +271,20 @@ class ColorModeMask {
/// Get the raw bitmask value for API encoding /// Get the raw bitmask value for API encoding
constexpr color_mode_bitmask_t get_mask() const { return this->mask_; } constexpr color_mode_bitmask_t get_mask() const { return this->mask_; }
/// Find the first set bit in a bitmask and return the corresponding ColorMode /// Find the next set bit in a bitmask starting from a given position
/// Used for optimizing compute_color_mode_() intersection logic /// Returns the bit position, or MAX_BIT_INDEX if no more bits are set
static constexpr ColorMode first_mode_from_mask(color_mode_bitmask_t mask) { static constexpr int find_next_set_bit(color_mode_bitmask_t mask, int start_bit) {
// Find the position of the first set bit (least significant bit) int bit = start_bit;
int bit = 0;
while (bit < MAX_BIT_INDEX && !(mask & (1 << bit))) { while (bit < MAX_BIT_INDEX && !(mask & (1 << bit))) {
++bit; ++bit;
} }
return bit_to_mode(bit); return bit;
}
/// Find the first set bit in a bitmask and return the corresponding ColorMode
/// Used for optimizing compute_color_mode_() intersection logic
static constexpr ColorMode first_mode_from_mask(color_mode_bitmask_t mask) {
return bit_to_mode(find_next_set_bit(mask, 0));
} }
/// Check if a ColorMode is present in a raw bitmask value /// Check if a ColorMode is present in a raw bitmask value