mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor LedPwm code

This commit is contained in:
Theo Arends 2020-05-23 13:09:16 +02:00
parent dc9ce42888
commit aafa0862ab
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tasmota/support_tasmota.ino
View File

@ -358,17 +358,17 @@ void SetLedPowerIdx(uint32_t led, uint32_t state)
} else {
led_power &= (0xFF ^ mask);
}
uint16_t pwm = 0;
if (bitRead(Settings.ledpwm_mask, led)) {
#ifdef USE_LIGHT
pwm = changeUIntScale(ledGamma10(state ? Settings.ledpwm_on : Settings.ledpwm_off), 0, 1023, 0, Settings.pwm_range); // gamma corrected
#else //USE_LIGHT
pwm = changeUIntScale((uint16_t)(state ? Settings.ledpwm_on : Settings.ledpwm_off), 0, 255, 0, Settings.pwm_range); // linear
#endif //USE_LIGHT
analogWrite(Pin(GPIO_LED1, led), bitRead(led_inverted, led) ? Settings.pwm_range - pwm : pwm);
} else {
DigitalWrite(GPIO_LED1, led, bitRead(led_inverted, led) ? !state : state);
}
uint16_t pwm = 0;
if (bitRead(Settings.ledpwm_mask, led)) {
#ifdef USE_LIGHT
pwm = changeUIntScale(ledGamma10(state ? Settings.ledpwm_on : Settings.ledpwm_off), 0, 1023, 0, Settings.pwm_range); // gamma corrected
#else //USE_LIGHT
pwm = changeUIntScale((uint16_t)(state ? Settings.ledpwm_on : Settings.ledpwm_off), 0, 255, 0, Settings.pwm_range); // linear
#endif //USE_LIGHT
analogWrite(Pin(GPIO_LED1, led), bitRead(led_inverted, led) ? Settings.pwm_range - pwm : pwm);
} else {
DigitalWrite(GPIO_LED1, led, bitRead(led_inverted, led) ? !state : state);
}
}
#ifdef USE_BUZZER
if (led == 0) {
@ -403,8 +403,9 @@ void SetLedLink(uint32_t state)
uint32_t led_pin = Pin(GPIO_LEDLNK);
uint32_t led_inv = ledlnk_inverted;
if (99 == led_pin) { // Legacy - LED1 is status
SetLedPowerIdx(0, state);
} else if (led_pin < 99) {
SetLedPowerIdx(0, state);
}
else if (led_pin < 99) {
if (state) { state = 1; }
digitalWrite(led_pin, (led_inv) ? !state : state);
}

2
tasmota/tasmota.ino
View File

@ -1,4 +1,4 @@
/*
/*
tasmota.ino - Tasmota firmware for iTead Sonoff, Wemos and NodeMCU hardware
Copyright (C) 2020 Theo Arends