Commit Graph

4273 Commits

Author SHA1 Message Date
Theo Arends 82b7225332 Fix divide
Fix divide
2019-09-26 16:16:38 +02:00
Theo Arends 81b081f620 Add max current checks to SM2135
Add max current checks to SM2135 (#6495)
2019-09-26 16:06:05 +02:00
Theo Arends febb93788c Experimental support for SM2135
Experimental support for SM2135 (#6495)
2019-09-26 12:30:21 +02:00
Theo Arends 130117cd44
Merge pull request #6494 from s-hadinger/minor_fixes
Minor fixes to Hue Emulation and Light
2019-09-25 22:43:15 +02:00
Stephan Hadinger 9c885079f0 Allow Hue emulation friendly names to go beyond 13 2019-09-25 18:14:58 +02:00
Stephan Hadinger 902dc6b69c Fix rounding issue when reading Channel value 2019-09-25 17:56:03 +02:00
Theo Arends fa826d33d9 Refactor ds18x20.ino 2019-09-25 16:28:54 +02:00
Theo Arends 2d1bc97843 Update RELEASENOTES.md 2019-09-25 15:44:41 +02:00
Theo Arends f03ec437fe Delete xsns_05_ds18x20_legacy.ino 2019-09-25 15:07:23 +02:00
Theo Arends 3eb219ccaa Remove support for define USE_DS18x20_LEGACY
Remove support for define USE_DS18x20_LEGACY and legacy DS18x20 driver (#6486)
2019-09-25 14:35:37 +02:00
Theo Arends 5bd19d54db Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00
Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00. NOTE: As this is development branch previous tariffs are lost! (#6488)
2019-09-25 14:24:49 +02:00
Theo Arends 6ad2d3b86f Bump version 6.6.0.14
Bump version 6.6.0.14
2019-09-25 14:17:20 +02:00
Theo Arends d984646731
Merge pull request #6480 from gemu2015/scripter-update
Scripter update
2019-09-24 16:39:38 +02:00
gemu2015 c369289cb5 Update xdrv_10_scripter.ino 2019-09-24 15:30:26 +02:00
gemu2015 854b60ac7a Update support_command.ino 2019-09-24 08:51:09 +02:00
gemu2015 31a269a82f Update xdrv_01_webserver.ino 2019-09-24 08:43:13 +02:00
gemu2015 56c3de022b Update xdrv_01_webserver.ino 2019-09-24 08:32:55 +02:00
gemu2015 5e5fc79ca1 Delete sonoff.ino.cpp 2019-09-24 08:27:43 +02:00
gemu2015 4c79e0c627 scripter command support, up to 4 buttons in a row, bug fixes 2019-09-24 08:25:32 +02:00
Theo Arends 9add50b679
Merge pull request #6478 from s-hadinger/hue_32_relays
Support up to 32 devices for Hue emulation
2019-09-23 23:57:48 +02:00
Stephan Hadinger 93c031eb01 Support up to 32 devices for Hue emulation 2019-09-23 22:57:20 +02:00
Theo Arends 397070900a Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2019-09-23 17:30:42 +02:00
Theo Arends 58c1851f93 Disable GroupTopic change of SwitchTopic
Disable GroupTopic change of SwitchTopic (#6467)
2019-09-23 17:30:37 +02:00
Theo Arends d364bb29bc
Merge pull request #6472 from s-hadinger/zigbee_fix_20190922
Fix Zigbee bug in reconfiguration and removed timecode from ZigbeeZNPReceived
2019-09-22 18:35:07 +02:00
Stephan Hadinger 784f2e068e Fix Zigbee bug in reconfiguration and removed timecode from ZigbeeZNPReceived 2019-09-22 18:32:17 +02:00
Theo Arends 075485e124 Fix energy usage/export resolution
Fix energy usage/export resolution (#6444)
2019-09-22 18:30:55 +02:00
Theo Arends ae3ebf1c94 Tiny refactor
Tiny refactor
2019-09-22 16:33:14 +02:00
Theo Arends 181ac5539b Add JSON array index support to rules
Add JSON array index support to rules evaluation allowing trigger on ENERGY#POWER[2]>0.60 from JSON ..,"Power":[0.00,0.68],.. (#6160)
2019-09-22 16:14:34 +02:00
Theo Arends 917021ca1e Refactor HX711 sensor driver
Refactor HX711 sensor driver
2019-09-22 14:13:06 +02:00
Theo Arends 15024fa348 Add Tariff export values to JSON message
Add Tariff export values to JSON message (#6429)
2019-09-22 14:00:34 +02:00
Theo Arends 957272dca4 Bump version to 6.6.0.13
* Add command EnergyReset4 x,x to initialize total usage for two tarrifs
 * Add command EnergyReset5 x,x to initialize total export (or production) for two tarrifs
 * Add command Sensor34 8,0 and Sensor34 8,1 to disable/enable JSON message on weight change over 4 gram
2019-09-22 12:53:15 +02:00
Theo Arends 763601ccb4 Fix JSON total usage resolution display
Fix JSON total usage resolution display (#6429)
2019-09-22 11:54:02 +02:00
Theo Arends 37d9cb4c92 Fix PZEM missing phase zeroing all readings
Fix PZEM missing phase zeroing all readings (#2315)
2019-09-21 17:10:52 +02:00
Theo Arends d6a5b651d5 Update cache usage
Update cache usage
2019-09-21 15:17:07 +02:00
Theo Arends 149d3380c4
Merge pull request #6469 from Jason2866/patch-1
Use Platformio cache function...
2019-09-21 14:55:35 +02:00
Theo Arends 206a502f36
Merge pull request #6468 from pablozg/development
NRG: Show usage/export stored values when EnergyReset command is sent
2019-09-21 14:55:17 +02:00
Jason2866 124d2d59e9
Use Platformio cache function...
for already compiled environment code. Speeds up rebuilding a lot.
In my test it worked reliable.
2019-09-21 13:57:15 +02:00
pablozg 2798561bda NRG: Show usage/export stored values when EnergyReset command is sent 2019-09-21 11:31:41 +02:00
Theo Arends 6c4a7508f0
Merge pull request #6464 from pablozg/development
Energy: Fix no usage/return updated and no usage/return value stored …
2019-09-21 10:03:28 +02:00
pablozg 4f17c93a83 Fix max value in EnergyReset command 2019-09-20 22:46:34 +02:00
pablozg d7d91583fd Energy: Fix no usage/return updated and no usage/return value stored after reboot 2019-09-20 22:35:56 +02:00
Theo Arends e18a4f4b1c
Merge pull request #6463 from pablozg/development
Energy: EnergyReset can now set the usage1, usage2, return1 and retur…
2019-09-20 19:12:57 +02:00
pablozg 60f55b8ea4 Energy: EnergyReset now can set the usage1, usage2, return1 and return2 totals used in Domoticz P1 smart meter sensor 2019-09-20 16:05:48 +02:00
Theo Arends c73799cb7d
Merge pull request #6462 from pablozg/development
Change Domoticz P1 smart meter sensor total usage logic, issue #6444
2019-09-20 15:31:59 +02:00
pablozg acf85db0da Check if RTC time is valid before energy sum 2019-09-20 14:37:55 +02:00
pablozg 254f3f3f6c Change Domoticz P1 smart meter sensor total usage logic, issue #6444 2019-09-20 12:59:34 +02:00
Theo Arends c822b65f34
Merge pull request #6461 from s-hadinger/zigbee_update_4
Minor update to Zigbee
2019-09-19 20:01:04 +02:00
Stephan Hadinger 62f7f8c557 Minor update to Zigbee 2019-09-19 19:25:08 +02:00
Theo Arends acd713c867
Merge pull request #6455 from Jason2866/patch-1
Disable mDNS for sonoff-sensors freeing IRAM
2019-09-19 09:59:40 +02:00
Theo Arends ca1252e5f5
Merge pull request #6454 from andrethomas/patch-1
Bracketing is an art... I was once told :)
2019-09-19 09:59:26 +02:00