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

2932 Commits

Author SHA1 Message Date
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
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
pablozg 2798561bda NRG: Show usage/export stored values when EnergyReset command is sent 2019-09-21 11:31:41 +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
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
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
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
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
gemu2015 8e4b91837b fix sgp30 2019-09-18 18:54:28 +02:00
gemu2015 e8b905f491 scripter bugs 2019-09-18 18:50:25 +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 8483a7113e
Merge pull request #6433 from gemu2015/sml-update 
sml, median filter, mutiple modbus, pzem
 2019-09-16 20:48:02 +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 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