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

4508 Commits

Author SHA1 Message Date
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
Stephan Hadinger f91f99a2e7 Zigbee support phase 3 - support for Xiaomi lumi.weather air quality sensor, Osram mini-switch 2019-09-15 11:10:59 +02:00
Theo Arends 41c259767f
Merge pull request #6426 from laurentdong/pullrequest 
Increase MQTT subscribe JSON data size.
 2019-09-15 09:02:34 +02:00
Theo Arends fdd4a8745f
Merge pull request #6425 from laurentdong/pullrequest1 
IF command always report a command error
 2019-09-15 09:01:19 +02:00
Laurent 8f1a3ebdd0 IF command alwasy report a command error 
IF command did not send command finish signal.
 2019-09-14 21:39:21 -04:00
Laurent c3638289e2 Increase MQTT subscribe JSON data size. 2019-09-14 21:35:55 -04:00
Federico Leoni 1e07b47529
Need feedback: Home Assistant discovery 2019-09-14 21:50:45 -03:00
Theo Arends ee7dc4e5bc
Merge pull request #6419 from s-hadinger/asm_gitignore 
Adding firmware.asm to .gitignore
 2019-09-14 10:58:50 +02:00
Stephan Hadinger fa7796a2b2 Adding firmware.asm to .gitignore 2019-09-14 10:55:23 +02:00
Theo Arends e126faa114
Merge pull request #6418 from gemu2015/scripter-bugfix 
scripter bug fix
 2019-09-14 09:56:36 +02:00
Theo Arends 50d66dc39a
Merge pull request #6416 from curzon01/development 
decode-config.py: adapt settings
 2019-09-14 09:56:04 +02:00
Theo Arends 05727d907b
Merge pull request #6415 from Staars/obj_dump 
Create an objdump from firmware.elf automatically
 2019-09-14 09:54:49 +02:00
gemu2015 777956b634 scripter bug fix 
fix bug that webfrefresh was affected by permanent variables p:var
 2019-09-14 07:48:55 +02:00
Norbert Richter 622fc70566 decode-config.py: adapt settings 
- add Sensor54 (ina226_r_shunt, ina226_i_fs)
- add/change Tariffx (register8)
- add crc32 calc
 2019-09-13 15:39:57 +02:00
Staars 28bd411311 call obj-dump.py as extra_script 2019-09-13 09:10:36 +02:00
Staars 83b2c85815 call obj_dump.py as extra_script 2019-09-13 09:08:15 +02:00
Staars 188e3bb65a obj_dump after .elf creation 2019-09-13 08:57:09 +02:00
Theo Arends 6aec536819
Merge pull request #6410 from effelle/development 
Update it-IT.h
 2019-09-12 17:52:30 +02:00
Federico Leoni 37c5bad95d
Update it-IT.h 2019-09-12 12:45:47 -03:00
Theo Arends 4db3947dc9
Merge pull request #6390 from effelle/development 
Home Assistant discovery class detection
 2019-09-12 14:33:34 +02:00
Theo Arends 1341db1392 Change JSON output format for some commands 
Change JSON output format for commands Adc, Adcs, Modules, Gpio and Gpios from list to dictionary (#6407)
 2019-09-12 14:19:44 +02:00
Theo Arends 3a0fce2503 Add command Gpios 255/All to show all available GPIO components 
Add command Gpios 255/All to show all available GPIO components (#6407)
 2019-09-12 12:32:33 +02:00
Theo Arends d9877e8086
Merge pull request #6409 from gemu2015/touch-fix 
fixes touch controller on core > 2.42
 2019-09-12 11:00:54 +02:00
gemu2015 65532af236 Update FT6236.cpp 2019-09-12 10:58:47 +02:00
Theo Arends 7479236864
Merge pull request #6406 from laurentdong/pullrequest 
Rule did not been triggered if there's no comparation operator
 2019-09-12 08:40:53 +02:00
Laurent ea3fcaf22c Rule did not been triggered if there's no comparation operator 
Rule did not been triggered if there's no comparation operator provided as trigger.
For example:
Rule1 ON EVENT#POWERON DO ... ENDON
The rule_name should be assigned as "POWERON" by default.
 2019-09-11 21:46:01 -04:00
Theo Arends 05b9317b75 Allow user control over clock text size 
Allow user control over clock text size (#6395)
 2019-09-11 17:04:39 +02:00
Theo Arends 56b0f6efdc Fix interlocked relays turning off 
Fix interlocked relays turning off (#6385)
 2019-09-11 12:14:37 +02:00
Theo Arends 33baadfafd
Merge pull request #6399 from s-hadinger/ir_hash 
Rename "Data" to "Hash" and limit to 32 bits when receiving UNKNOWN IR protocol
 2019-09-10 21:03:38 +02:00
Stephan Hadinger 05e9604116 Change rename "Data" to "Hash" and limit to 32 bits when receiving UNKNOWN IR protocol (see DECODE_HASH from IRremoteESP8266) 2019-09-10 20:45:27 +02:00
Theo Arends a4e1c10953 Change commands Tariff 
Change commands Tariff1 22,23 = Tariff1 (Off-Peak) ST,DST   Tariff2 (Standard) 6,7 = Tariff2 ST,DST   Tariff9 0/1 = Weekend toggle (1 = Off-Peak during weekend)
 2019-09-10 18:04:56 +02:00
Theo Arends 99dcfaff35
Merge pull request #6396 from Jason2866/patch-1 
Use Python 3.7. for Travis...
 2019-09-10 16:30:44 +02:00