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

Fix Wifi instability when light is on, due to sleep=0 (#6961, #6608)

This commit is contained in:
Hadinger 2019-11-20 21:08:35 +01:00
parent 7777fa08b0
commit 62b213897f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/_changelog.ino
View File

@ -3,6 +3,7 @@
* Fix boot loop regression * Fix boot loop regression
* Add command TempOffset -12.6 .. 12.6 to set global temperature sensor offset (#6958) * Add command TempOffset -12.6 .. 12.6 to set global temperature sensor offset (#6958)
* Fix check deepsleep for valid values in Settings (#6961) * Fix check deepsleep for valid values in Settings (#6961)
* Fix Wifi instability when light is on, due to sleep=0 (#6961, #6608)
* *
* 7.0.0.4 20191108 * 7.0.0.4 20191108
* Add command WifiPower 0 .. 20.5 to set Wifi Output Power which will be default set to 17dBm * Add command WifiPower 0 .. 20.5 to set Wifi Output Power which will be default set to 17dBm

1
tasmota/tasmota.h
View File

@ -100,7 +100,6 @@ const uint16_t PWM_MAX = 4000; // [PWM_MAX] Maximum frequency - Def
const uint16_t PWM_MIN = 100; // [PWM_MIN] Minimum frequency - Default: 100 const uint16_t PWM_MIN = 100; // [PWM_MIN] Minimum frequency - Default: 100
// For Dimmers use double of your mains AC frequecy (100 for 50Hz and 120 for 60Hz) // For Dimmers use double of your mains AC frequecy (100 for 50Hz and 120 for 60Hz)
// For Controlling Servos use 50 and also set PWM_FREQ as 50 (DO NOT USE THESE VALUES FOR DIMMERS) // For Controlling Servos use 50 and also set PWM_FREQ as 50 (DO NOT USE THESE VALUES FOR DIMMERS)
//#define PWM_LIGHTSCHEME0_IGNORE_SLEEP // Do not change sleep value for LightAnimate() scheme 0
const uint16_t MAX_POWER_HOLD = 10; // Time in SECONDS to allow max agreed power const uint16_t MAX_POWER_HOLD = 10; // Time in SECONDS to allow max agreed power
const uint16_t MAX_POWER_WINDOW = 30; // Time in SECONDS to disable allow max agreed power const uint16_t MAX_POWER_WINDOW = 30; // Time in SECONDS to disable allow max agreed power

10
tasmota/xdrv_04_light.ino
View File

@ -1617,11 +1617,11 @@ void LightAnimate(void)
} }
} }
else { else {
#ifdef PWM_LIGHTSCHEME0_IGNORE_SLEEP if (Settings.sleep > 50) {
sleep = (LS_POWER == Settings.light_scheme) ? Settings.sleep : 0; // If no animation then use sleep as is sleep = 50; // set a minimal value of 50 milliseconds to ensure that animations are smooth
#else } else {
sleep = 0; sleep = Settings.sleep; // or keep the current sleep if it's lower than 50
#endif // PWM_LIGHTSCHEME0_IGNORE_SLEEP }
switch (Settings.light_scheme) { switch (Settings.light_scheme) {
case LS_POWER: case LS_POWER:
light_controller.calcLevels(); light_controller.calcLevels();