jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-22 18:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes, removed debug printout

Browse Source
This commit is contained in:
Damian Schneider 2024-09-02 22:06:46 +02:00
parent 85e2f7eb34
commit be7475fe66
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wled00/bus_manager.cpp
View File

@ -533,13 +533,8 @@ void BusPwm::show() {
pwmBri += 4080; pwmBri += 4080;
float temp = (float)pwmBri / 29580.0f; float temp = (float)pwmBri / 29580.0f;
temp = temp * temp * temp * (float)maxBri; temp = temp * temp * temp * (float)maxBri;
pwmBri = (unsigned)temp; pwmBri = (unsigned)temp; // pwmBri is in range [0-maxBri]
} }
// pwmBri is in range [0-4095]
// determine phase shift
[[maybe_unused]] unsigned phaseOffset = maxBri / numPins; // (maxBri is at _depth resolution)
unsigned phaseOffset = 0; unsigned phaseOffset = 0;
// we will be phase shifting every channel by previous pulse length (plus dead time if required) // we will be phase shifting every channel by previous pulse length (plus dead time if required)
// phase shifting is only mandatory when using H-bridge to drive reverse-polarity PWM CCT (2 wire) LED type // phase shifting is only mandatory when using H-bridge to drive reverse-polarity PWM CCT (2 wire) LED type
@ -575,27 +570,10 @@ void BusPwm::show() {
LEDC_MUTEX_UNLOCK(); LEDC_MUTEX_UNLOCK();
ledc_update_duty((ledc_mode_t)gr, (ledc_channel_t)ch); ledc_update_duty((ledc_mode_t)gr, (ledc_channel_t)ch);
phaseOffset += ((scaled + (maxBri - scaled) / 2) >> bithsift) + 1; // fixed 180°, add 1 pulse for dead time (min pulse with dithering is 8bit)
phaseOffset += 2 + (scaled >> bithsift); // offset to cascade the signals, dithering requires two pulses and in non-dithering the extra pulse does not hurt phaseOffset += 2 + (scaled >> bithsift); // offset to cascade the signals, dithering requires two pulses and in non-dithering the extra pulse does not hurt
if(phaseOffset >= maxBri >> bithsift) phaseOffset = 0; // offset it out of bounds, reset if(phaseOffset >= maxBri >> bithsift) phaseOffset = 0; // offset it out of bounds, reset TODO: maybe this should be (maxBri-1), need to test
Serial.print(" maxbri = ");
Serial.print(maxBri);
Serial.print(" offset = ");
Serial.print(phaseOffset);
Serial.print(" bit depth = ");
Serial.print(_depth);
Serial.print(" freq = ");
Serial.print(_frequency);
Serial.print(" scaled= ");
Serial.println(scaled);
Serial.print(" duty = ");
Serial.println(LEDC.channel_group[gr].channel[ch].duty.duty);
#endif #endif
} }
Serial.println("*********");
} }
uint8_t BusPwm::getPins(uint8_t* pinArray) const { uint8_t BusPwm::getPins(uint8_t* pinArray) const {