mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,413 Commits 10 Branches 111 Tags 1.1 GiB
Commit Graph

4413 Commits

Author SHA1 Message Date
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
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
Staars a066acd7f2 remove a double quote from TELE-message 2019-09-18 21:06:14 +02:00
Staars eb8539dd91 name it DARKNESS, handle non-reading of temperature, small bugfixes 2019-09-18 20:57:35 +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
Jason2866 b8b8bb0b1d
Update .travis.yml 2019-09-18 13:13:11 +02:00
Jason2866 3f7b4999c7
Merge pull request #8 from arendst/development 
Update
 2019-09-18 13:12:02 +02: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