mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,233 Commits 6 Branches 113 Tags 1.2 GiB
Commit Graph

4233 Commits

Author SHA1 Message Date
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
Jason2866 619ba5e172
Disable mDNS for freeing IRAM 
Compile fails (IRAM), mDNS is not a sensor and disabled by default.
 2019-09-18 23:52:51 +02:00
Andre Thomas de198ba861
Bracketing is an art... I was once told :) 2019-09-18 22:49:19 +02:00
Theo Arends e4ab7ebfe2
Merge pull request #6452 from gemu2015/scripter-bugs 
scripter bugs
 2019-09-18 19:35:33 +02:00
Theo Arends d9391dca01
Merge pull request #6451 from gemu2015/sgp30-fix 
fix sgp30
 2019-09-18 19:35:02 +02:00
gemu2015 8e4b91837b fix sgp30 2019-09-18 18:54:28 +02:00
gemu2015 e8b905f491 scripter bugs 2019-09-18 18:50:25 +02:00
Theo Arends 4488d7a3cf
Merge pull request #6449 from meingraham/patch-6 
Chat links
 2019-09-18 16:21:59 +02:00
Theo Arends bd6636f2ef
Merge pull request #6448 from meingraham/patch-5 
Chat links
 2019-09-18 16:21:45 +02:00
Theo Arends 13290eb14a
Merge pull request #6445 from pablozg/development 
Autoupdate Energy.total with the value reported by hardware (sdm120, …
 2019-09-18 16:21:28 +02:00
Michael Ingraham e89c46d66c
Chat links 2019-09-18 09:25:33 -04:00
Michael Ingraham aa5bc8e2d9
Chat links 2019-09-18 09:25:30 -04:00
pablozg 40657bd256 Autoupdate Energy.total with the value reported by hardware (sdm120, etc) 2019-09-18 11:42:28 +02:00
Theo Arends f8ea106e5d
Merge pull request #6441 from meingraham/patch-4 
Additional information
 2019-09-18 08:42:40 +02:00
Theo Arends fcf84b727c
Merge pull request #6440 from meingraham/patch-3 
Formatting
 2019-09-18 08:42:26 +02:00
Theo Arends 6d4ad05c63
Merge pull request #6439 from meingraham/patch-2 
Additional information
 2019-09-18 08:42:01 +02:00
Theo Arends 94d3ee2977
Merge pull request #6438 from meingraham/patch-1 
2.6 Core
 2019-09-18 08:41:45 +02:00
Michael Ingraham 0fbd5afd94
Update Bug_report.md 2019-09-17 22:41:46 -04:00
Michael Ingraham 04f59d3ece
Additional information 2019-09-17 22:40:35 -04:00
Michael Ingraham 93ff15c556
Formatting 2019-09-17 22:31:38 -04:00
Michael Ingraham fd859919e3
Additional information 2019-09-17 22:29:35 -04:00
Michael Ingraham 90c7ad41dd
2.6 Core 2019-09-17 21:47:26 -04:00
Theo Arends 8483a7113e
Merge pull request #6433 from gemu2015/sml-update 
sml, median filter, mutiple modbus, pzem
 2019-09-16 20:48:02 +02:00
Theo Arends 2db5edde86
Merge pull request #6432 from gemu2015/scripter-update 
scripter web user io
 2019-09-16 20:45:36 +02:00
gemu2015 37f6fc6bac sml, median filter, mutiple modbus, pzem 2019-09-16 19:58:22 +02:00
gemu2015 7fa3185024 scripter web user io 2019-09-16 19:52:53 +02:00
Theo Arends 7d768905cd Change modbus log buffer size 
Change modbus log buffer size
 2019-09-16 17:11:38 +02:00
Theo Arends d107933e80 Revert "Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development" 
This reverts commit d82afa1190, reversing
changes made to 7b70c042bd.
 2019-09-16 16:59:05 +02:00
Theo Arends d82afa1190 Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2019-09-16 16:56:45 +02:00
Theo Arends 7b70c042bd Add command ModuleAddress 1/2/3 
Add command ModuleAddress 1/2/3 to set Pzem module address when a single module is connected (#2315)
 2019-09-16 16:56:16 +02:00
Theo Arends a50c62ebc6
Merge pull request #6424 from effelle/development 
Need feedback: new sensors for Home Assistant discovery
 2019-09-16 16:50:53 +02:00
Theo Arends d193b8cb1a Update TasmotaModbus to 1.2.0 
Update TasmotaModbus to 1.2.0
 2019-09-16 16:27:35 +02:00
Theo Arends 9c6b4259a4 Fix SDM630_2 phase display 
Fix SDM630_2 phase display (#6431)
 2019-09-16 15:55:59 +02:00
Theo Arends 7e5b9eb810 Fix SDM630 template 
Fix SDM630 template
 2019-09-16 10:14:09 +02:00
Theo Arends a964bd0a9c Add Energy Tariff info to JSON message 
Add Energy Tariff info to JSON TOTAL energy message (#6429)
 2019-09-15 18:05:23 +02:00
Theo Arends 26361bd8c3 Add driver USE_SDM630_2 
Add driver USE_SDM630_2 as future replacement for USE_SDM630 - Pls test and report
 2019-09-15 17:06:23 +02:00
Theo Arends 36d1f51a82 Add initial support for up to three PZEM-003/-017 
Add initial support for up to three PZEM-003/-017 on serial modbus connection with addresses 1 (default), 2 and 3 (#2315)
 2019-09-15 16:02:00 +02:00
Theo Arends 7e192cf624 Add initial support for up to three PZEM-004T 
Add initial support for up to three PZEM-004T on serial connection with addresses x.x.x.1 (default), 2 and 3 (#2315)
 2019-09-15 15:40:18 +02:00
Theo Arends 098a2b27c3 Add initial support for up to three PZEM-014/-016 
Add initial support for up to three PZEM-014/-016 on serial modbus connection with addresses 1 (default), 2 and 3 (#2315)
 2019-09-15 15:19:19 +02:00
Theo Arends 5eb85075e5 Add Energy 3 phase/channel support 
* Change energy sensors for three phase/channel support
 * Add Shelly 2.5 energy dual channel support (#6160)
 2019-09-15 13:10:32 +02:00
Theo Arends 180128dc4a
Merge pull request #6427 from s-hadinger/zigbee_phase_3 
Zigbee support phase 3 - support for Xiaomi lumi.weather air quality sensor, Osram mini-switch
 2019-09-15 11:39:05 +02:00