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

Bump version 6.7.1 

* Fix on energy monitoring devices using PowerDelta Exception0 with epc1:0x4000dce5 = Divide by zero (#6750)
 * Fix Script array bug (#6751)
This commit is contained in:
Theo Arends 2019-10-26 13:13:16 +02:00
parent d4421b2d08
commit b44040af0f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sonoff/_changelog.ino
View File

@ -1,4 +1,9 @@
/*********************************************************************************************\ /*********************************************************************************************\
* 6.7.1 20191026
* Release
* Fix on energy monitoring devices using PowerDelta Exception0 with epc1:0x4000dce5 = Divide by zero (#6750)
* Fix Script array bug (#6751)
*
* 6.7.0 20191025 * 6.7.0 20191025
* Release * Release
* *

2
sonoff/sonoff_version.h
View File

@ -20,6 +20,6 @@
#ifndef _SONOFF_VERSION_H_ #ifndef _SONOFF_VERSION_H_
#define _SONOFF_VERSION_H_ #define _SONOFF_VERSION_H_
const uint32_t VERSION = 0x06070000; const uint32_t VERSION = 0x06070100;
#endif // _SONOFF_VERSION_H_ #endif // _SONOFF_VERSION_H_

2
sonoff/xdrv_03_energy.ino
View File

@ -292,7 +292,7 @@ void EnergyMarginCheck(void)
DEBUG_DRIVER_LOG(PSTR("NRG: Delta %d, Power %d"), delta, min_power); DEBUG_DRIVER_LOG(PSTR("NRG: Delta %d, Power %d"), delta, min_power);
if (delta) { // Fix divide by 0 exception (#6741) if ((delta > 0) && (min_power > 0)) { // Fix divide by 0 exception (#6741)
if (((Settings.energy_power_delta < 101) && (((delta * 100) / min_power) > Settings.energy_power_delta)) || // 1..100 = Percentage if (((Settings.energy_power_delta < 101) && (((delta * 100) / min_power) > Settings.energy_power_delta)) || // 1..100 = Percentage
((Settings.energy_power_delta > 100) && (delta > (Settings.energy_power_delta -100)))) { // 101..32000 = Absolute ((Settings.energy_power_delta > 100) && (delta > (Settings.energy_power_delta -100)))) { // 101..32000 = Absolute
Energy.power_delta = true; Energy.power_delta = true;