jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-26 04:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into dev-energy

Browse Source
This commit is contained in:
Theo Arends 2023-01-27 16:00:44 +01:00
commit 5b977bf4e4
3 changed files with 465 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/tasmota_xdrv_driver/xdrv_04_light.ino
View File

@ -1780,8 +1780,6 @@ void LightAnimate(void)
if (TasmotaGlobal.sleep > PWM_MAX_SLEEP) { if (TasmotaGlobal.sleep > PWM_MAX_SLEEP) {
sleep_previous = TasmotaGlobal.sleep; // save previous value of sleep sleep_previous = TasmotaGlobal.sleep; // save previous value of sleep
TasmotaGlobal.sleep = PWM_MAX_SLEEP; // set a maximum value (in milliseconds) to sleep to ensure that animations are smooth TasmotaGlobal.sleep = PWM_MAX_SLEEP; // set a maximum value (in milliseconds) to sleep to ensure that animations are smooth
} else {
sleep_previous = -1; // if low enough, don't change it
} }
} else { } else {
if (sleep_previous > 0) { if (sleep_previous > 0) {

640
tasmota/tasmota_xdrv_driver/xdrv_10_scripter.ino
View File

File diff suppressed because it is too large Load Diff

3
tasmota/tasmota_xdrv_driver/xdrv_85_esp32_ble_eq3_trv.ino
View File

@ -132,8 +132,7 @@ print("".join(pin))
#define USE_EQ3_ESP32 #define USE_EQ3_ESP32
#endif #endif
// for testing of BLE_ESP32, we remove xsns_62_MI_ESP32.ino completely, and instead add this modified xsns_52_ibeacon_BLE_ESP32.ino #if defined CONFIG_IDF_TARGET_ESP32 || defined CONFIG_IDF_TARGET_ESP32C3 || defined CONFIG_IDF_TARGET_ESP32S3
#if CONFIG_IDF_TARGET_ESP32
#ifdef USE_EQ3_ESP32 #ifdef USE_EQ3_ESP32
#ifdef ESP32 // ESP32 only. Use define USE_HM10 for ESP8266 support #ifdef ESP32 // ESP32 only. Use define USE_HM10 for ESP8266 support
#ifdef USE_BLE_ESP32 #ifdef USE_BLE_ESP32