mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,445 Commits 9 Branches 110 Tags 1.2 GiB
Commit Graph

1906 Commits

Author SHA1 Message Date
Adrian Scillato ae1bb588bc
KNX: Add Scenes Support 2020-06-18 15:07:01 -03:00
Federico Leoni 0d6aaa64b5 Discovery Update 2020-06-18 14:43:18 -03:00
Theo Arends f9c03648a4
Merge pull request #8722 from hallard/teleinfo 
Added new features to Teleinfo
 2020-06-18 19:13:07 +02:00
Theo Arends bb9facda4e
Merge pull request #8723 from curzon01/development 
Add info display Ssid escape
 2020-06-18 19:11:05 +02:00
Norbert Richter fc3d38bbe7
Add info display Ssid escape 2020-06-18 18:16:16 +02:00
Charles 5bb51f3807 Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 18:14:36 +02:00
Charles 6da439c67c ESP32 template 65504 -> 1 2020-06-18 18:14:06 +02:00
Staars b71a5ae9e4 add decryption to xsns_61_MI_NRF24.ino 2020-06-18 17:57:16 +02:00
Theo Arends da87918d51 Fix ESP32 ethernet hostname 2020-06-18 17:47:29 +02:00
Charles dc745fc56b Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 17:12:43 +02:00
Charles c9c98a8ce3 Added Load on Telemetry 2020-06-18 17:12:23 +02:00
Charles a3a78d08af Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 16:21:29 +02:00
Charles 0c48aa3de3 Used ISOUSC for power contract 2020-06-18 16:10:48 +02:00
Theo Arends c533eb1186 BLM certify part 2 
- Change define USE_TASMOTA_SLAVE into USE_TASMOTA_CLIENT
- Change commands ``SlaveSend`` and ``SlaveReset`` into ``ClientSend`` and ``ClientReset``
 2020-06-18 16:05:55 +02:00
Theo Arends 4e3b547657 BLM certify part 1 2020-06-18 14:24:15 +02:00
Theo Arends 2af506e48b Change ESP32 USER GPIO template representation decreasing template message size 
Change ESP32 USER GPIO template representation decreasing template message size
 2020-06-18 12:55:10 +02:00
Charles dd6574520f Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 10:59:39 +02:00
Theo Arends 63f8a2aafd Fix ESP32 network checks 
Fix ESP32 network checks (#8503)
 2020-06-18 10:18:49 +02:00
Charles 748196dcd9 massive use of GetTextIndexed, avoid long also 2020-06-17 19:54:40 +02:00
Theo Arends 8414f73bf4 ESP32 check ethernet GPIO defined 2020-06-17 18:31:31 +02:00
Theo Arends 7853d8c8c4 ESP32 add support for ethernet phy IP101 
ESP32 add support for ethernet phy IP101 (#8503)
 2020-06-17 18:14:50 +02:00
Theo Arends 934526244f Add support for single wire LMT01 
Add support for single wire LMT01 temperature Sensor by justifiably (#8713)
 2020-06-17 17:22:41 +02:00
Theo Arends ec7bad1c5e
Merge pull request #8713 from justifiably/LMT01 
Add support for LMT01 temperature sensor
 2020-06-17 17:01:33 +02:00
gemu2015 c18977f655 Update xdrv_10_scripter.ino 2020-06-17 16:19:33 +02:00
Justifiably a4846c10fd Add D_SENSOR_LMT01_PULSE to language files. 2020-06-17 15:17:28 +01:00
Justifiably ad7c929d9b Add support for LMT01 temperature sensor 2020-06-17 14:53:38 +01:00
Theo Arends 1aa20baf92 Add wESP32 config 2020-06-17 15:27:12 +02:00
Theo Arends c4842b08f7 Add Esp32 wESP32 template 2020-06-17 15:10:52 +02:00
Theo Arends 7c785ab056 Add support for Energy sensor (Denky) 
Add support for Energy sensor (Denky) for French Smart Metering meter provided by global Energy Providers
 2020-06-17 15:00:48 +02:00
Theo Arends 5730ced6b8
Merge pull request #8695 from hallard/teleinfo 
Prep for French Metering xnrg_15_teleinfo
 2020-06-17 14:42:22 +02:00
Theo Arends 019400d77d Fix ESP32 ethernet gateway et al 
Fix ESP32 ethernet gateway et al (#8503)
 2020-06-17 14:32:48 +02:00
Theo Arends 5ec694b3f3 Make FALLBACK_MODULE configurable 
Make FALLBACK_MODULE configurable (#8464)
 2020-06-17 14:19:20 +02:00
Theo Arends 83bbe757db Add command ``Module2`` 
Add command ``Module2`` to configure fallback module on fast reboot (#8464)
 2020-06-17 14:06:46 +02:00
Charles cf039ef7bf Removed one denky reference 2020-06-17 12:42:08 +02:00
Charles 29f7506dd6 Fixed after Theo's review 2020-06-17 12:09:36 +02:00
Theo Arends a1d8fa755c Fix ESP32 AP information 2020-06-17 10:39:05 +02:00
Stephan Hadinger bf6083ff1c Fix wrong escape bit 2020-06-16 20:17:47 +02:00
Stephan Hadinger ee2bb0330a Add Zigbee initial support for EmberZNet protocol (raw send/receive only) 2020-06-16 20:01:14 +02:00
Charles fae80fc9dc
Merge branch 'development' into teleinfo 2020-06-16 19:04:39 +02:00
Charles a4e5b3e14e Rebuild Travis CI 2020-06-16 18:58:56 +02:00
Theo Arends 715697cb32 Add ESP32 ethernet commands 
Add ESP32 ethernet commands ``EthType 0/1``, ``EthAddress 0..31`` and ``EthClockMode 0..3`` (#8503)
 2020-06-16 18:36:49 +02:00
Theo Arends b8ab5b3d4e Add IP address info 
Add IP address info (#8503)
 2020-06-16 14:57:00 +02:00
gemu2015 865769767d scripter call >BS after sensor init 2020-06-16 10:36:16 +02:00
bovirus 477a2c33be
Update Italian language 2020-06-16 08:33:32 +02:00
Theo Arends daef0a759d Stop blinks when no network configured 2020-06-15 22:40:15 +02:00
Theo Arends 1c7d923a8f Fix ESP32 ILI9341 compilation 2020-06-15 22:30:25 +02:00
Charles 3b8c83deb1
Merge branch 'development' into teleinfo 2020-06-15 22:29:53 +02:00
Theo Arends c1d0d20996 Fix mdns related compile error 2020-06-15 22:10:49 +02:00
Charles 7a297d1828 Added code size 2020-06-15 22:01:45 +02:00
Charles 93a38e892c @s-hadinger requests before merging PR 2020-06-15 21:52:47 +02:00
Theo Arends 129ff5d4ab
Merge pull request #8703 from s-hadinger/zigbee_custom_name 
Move Manuf/Model in defines
 2020-06-15 21:29:38 +02:00
Stephan Hadinger 44f9112545 Move Manuf/Model in defines 2020-06-15 20:13:05 +02:00
Stephan Hadinger 2181b0c1a4 Add serial to TCP bridge, ``TCPStart`` and ``TCPBaudRate`` (needs #define USE_TCP_BRIDGE) 2020-06-15 19:22:56 +02:00
Theo Arends 04e06df0ec Oops 2020-06-15 18:36:26 +02:00
Theo Arends ef0b797686 Add basic support for ESP32 ethernet 
Add basic support for ESP32 ethernet adding commands ``Wifi 0/1`` and ``Ethernet 0/1`` both default ON (#8503)
 2020-06-15 18:27:04 +02:00
gemu2015 dd6bce9232 scripter fix hue, add ticker, add tesla json read 2020-06-15 17:20:50 +02:00
Charles b889a97bc1 Use PSTR for labels values 2020-06-15 14:47:39 +02:00
Charles d18e040c27 Merge branch 'teleinfo' of https://github.com/hallard/Tasmota into teleinfo 2020-06-15 11:52:58 +02:00
Charles 71b7b1632d cleaned Serial init (not perfect but better) 2020-06-15 11:52:51 +02:00
Charles ae9e770950
Merge branch 'development' into teleinfo 2020-06-15 10:22:44 +02:00
Theo Arends 82b4029eb2
Merge pull request #8696 from gemu2015/chartofloat_limit 
fix chartofloat digit overflow
 2020-06-15 09:26:51 +02:00
gemu2015 5f7a32af4c update ibeacon to export UID 2020-06-15 08:20:43 +02:00
gemu2015 7d1a275606 fix chartofloat digit overflow 2020-06-15 07:25:39 +02:00
Charles 5e5ebb0025 Added new tarif contract 2020-06-15 00:52:49 +02:00
Charles cf518463c1 Implemented serial into loop 2020-06-14 22:04:19 +02:00
Theo Arends cdf7aa74bf Add rule trigger ``System#Init`` 
Add rule trigger ``System#Init`` to allow early rule execution without wifi and mqtt initialized yet (#8673)
 2020-06-14 12:36:44 +02:00
gemu2015 4f108e0504 fix sml modbus raw mode 2020-06-14 12:07:12 +02:00
Theo Arends 5fa6670d74
Merge pull request #8678 from device111/VEML7700_TEST 
Fix VEML7700 lux measurement, add new command
 2020-06-13 16:50:34 +02:00
Theo Arends f46d3751a0 Refactor some energy monitoring 2020-06-13 15:10:12 +02:00
device111 1e577a8213 Fix VEML7700 lux measurement, add new command 2020-06-13 15:08:52 +02:00
gemu2015 fcc0a29909 scripter support for global vars 2020-06-13 13:05:25 +02:00
Theo Arends 57ffd27153 Alternative method of calculating energy usage 
Alternative method of calculating energy usage (#8175)
 2020-06-13 12:26:55 +02:00
Charles 6d38a67cda Added deviice Denky for French Metering Teleinfo 2020-06-12 21:53:54 +02:00
Theo Arends 2b327c96c9 Fix BL0940 invalid overtemp 
Fix BL0940 invalid overtemp (#8175)
 2020-06-12 17:42:04 +02:00
Theo Arends 0abfcf1954 Fix global temperature 
- Fix global temperature use of float solving intermittend power off (#8175)
- Fix BL0940 power monitoring when powered on but no load present
 2020-06-12 16:51:21 +02:00
bovirus d64c0a8179
Update Italian language 2020-06-12 16:33:19 +02:00
Charles 941e45ef4c Added French Smart Meter Teleinformation 2020-06-12 16:33:16 +02:00
Charles dbf4a3a205 Added French Smart Meter Teleinformation 2020-06-12 16:32:32 +02:00
Charles e7dd3e1756 Created French Smart Meter Teleinformation 2020-06-12 16:31:23 +02:00
Charles 9a5f410c46 Added French Smart Meter Teleinformation 2020-06-12 16:30:59 +02:00
Charles 4afbbca773 Added French Smart Meter Teleinformation 2020-06-12 16:28:57 +02:00
Theo Arends 03cd543127 Add support for HP303B 
Add support for HP303B Temperature and Pressure sensor by Robert Jaakke (#8638)
 2020-06-12 12:38:52 +02:00
Robert Jaakke 9835c55203 Merge branch 'development' into HP303B 
# Conflicts:
#	tasmota/support_features.ino Resolved
#	tools/decode-status.py Resolved
 2020-06-11 21:56:27 +02:00
Theo Arends ee2c289477
Merge pull request #8667 from s-hadinger/fix_dimmer_8654 
Fix Dimmer tele inconsistency when SO37 128
 2020-06-11 21:32:50 +02:00
Stephan Hadinger 5427fc937e Fix Dimmer tele inconsistency when SO37 128 2020-06-11 21:14:30 +02:00
Theo Arends 5367302735 Fix compile error 2020-06-11 19:14:39 +02:00
Theo Arends 11d6486534 Fix time 4 display with SO52 1 2020-06-11 19:13:08 +02:00
Theo Arends 24cd427625 Remove debugging info from telegram 2020-06-11 18:18:03 +02:00
Theo Arends 18b00f9cbe Change telegram command prefix to Tm 2020-06-11 17:52:10 +02:00
Theo Arends 4c5b2f37fd Add initial support for Telegram 
Add initial support for Telegram bot (#8619)
 2020-06-11 17:30:33 +02:00
Charles ac65758cc3 Added support of TELEINFO 2020-06-11 14:53:10 +02:00
Theo Arends 33d5f3e7e7
Merge pull request #8661 from Staars/chirp 
bugfix xsns_48_chirp.ino
 2020-06-11 10:07:39 +02:00
Staars ce4f987367 bugfix 2020-06-11 09:55:07 +02:00
Theo Arends 63f0c43d2a
Merge pull request #8660 from gemu2015/scripter-fix 
scripter fix sdcard regression
 2020-06-11 07:53:58 +02:00
Theo Arends 0b81563d57
Merge pull request #8659 from phildubach/development 
Fix thermostat when using local sensor
 2020-06-11 07:53:44 +02:00
gemu2015 2453beb30f scripter fix sdcard regression 2020-06-11 06:43:24 +02:00
Phil Dubach 440219fd91 Fix thermostat when using local sensor 
Macros are not expanded in string constants, so the thermostat driver
never managed to obtain the current temperature from the local sensor
(SensorInputSet 1).
 2020-06-10 19:55:49 -07:00
Stephan Hadinger dc8d354f16 Fix asm for gcc17 2020-06-10 21:14:18 +02:00
Stephan Hadinger 1d68fe9bc6 Cleaned TLS options and prepare for TELEGRAM 2020-06-10 20:14:46 +02:00
Theo Arends 127254b283 Attempt to solve string corruption 
Attempt to solve string corruption (#8651)
 2020-06-10 12:59:14 +02:00
Robert Jaakke ec247f7906 Merge branch 'development' into HP303B 2020-06-10 10:05:06 +02:00
Robert Jaakke 325564fbc7 Added option to set i2c address in measure...Once in lib 2020-06-10 10:03:02 +02:00
Federico Leoni 152c2801ae Prep for Tuya MCU Discovery 2020-06-09 14:08:57 -03:00
Adrian Scillato 78e40da9d8
Update comment on MQTT Retained messages at my_user_config.h file 2020-06-09 11:10:08 -03:00
Theo Arends 5f9b5c377d Revert "Revert "Merge pull request #8645 from Staars/timers"" 
This reverts commit 3756127608.
 2020-06-09 13:55:21 +02:00
Theo Arends 3756127608 Revert "Merge pull request #8645 from Staars/timers" 
This reverts commit c9126cec19, reversing
changes made to 947ccc9275.
 2020-06-09 13:50:59 +02:00
Theo Arends c9126cec19
Merge pull request #8645 from Staars/timers 
add unishox compression to xdrv_09_timers.ino
 2020-06-09 13:42:35 +02:00
Theo Arends 56c491050e Fix AP switch 
Fix AP switch (#8635)
 2020-06-09 11:25:43 +02:00
Robert Jaakke 9d2d22558c Resolved review comments 2020-06-09 09:14:44 +02:00
Staars 4b8c58ce56 add unishox compression to xdrv_09_timers.ino 2020-06-08 21:14:43 +02:00
Robert Jaakke d2815c5322 Merge branch 'development' into HP303B 2020-06-08 20:37:47 +02:00
Robert Jaakke 92643e89d0 Added support for multiple i2c addresses 2020-06-08 20:37:04 +02:00
Theo Arends 61ea7535a8 Refactor and Domoticzify VL53L0X driver 
Refactor and Domoticzify VL53L0X driver (#8637, #8640)
 2020-06-08 15:09:51 +02:00
Theo Arends 6643241942
Merge pull request #8633 from Staars/development 
adding unishox compression to the webserver
 2020-06-08 12:51:05 +02:00
Theo Arends 0b41d321d4 Fix BL0940 checksum message 2020-06-08 11:13:57 +02:00
Theo Arends b16621dde4 Fix BL0940 temperature calculation 2020-06-08 11:04:45 +02:00
Theo Arends 59141403d2
Merge pull request #8642 from gemu2015/scripter-update 
scripter upload scripts
 2020-06-08 10:55:51 +02:00
Theo Arends 56ea7279bd Fix ESP32 compilation 2020-06-08 10:55:12 +02:00
Robert Jaakke abfa4f4fcd refactored implementation 2020-06-08 10:19:51 +02:00
gemu2015 6038921f93 scripter upload scripts 2020-06-08 09:24:49 +02:00
Robert Jaakke d6e1ecbe26 Moved global variables to struct 2020-06-08 09:13:01 +02:00
Robert Jaakke 601317d5f3 Merge branch 'development' into HP303B 
# Conflicts:
#	tasmota/support_features.ino Resolved
#	tools/decode-status.py Resolved
 2020-06-08 09:01:43 +02:00
Robert Jaakke aa5587f9e1 Mover begin() to detect function 2020-06-08 08:58:38 +02:00
Theo Arends e54c85f83e Add full support for BL0940 
Add support for BL0940 energy monitor as used in Blitzwolf BW-SHP10 (#8175)
 2020-06-07 17:59:54 +02:00
Theo Arends c6fede2bf4 Basic support for BL0940 
Basic support for BL0940 (#8175)
 2020-06-07 17:21:29 +02:00
Robert Jaakke caa539e236 Merge branch 'development' into HP303B 2020-06-07 16:36:34 +02:00
Robert Jaakke d3a59fd65c Changed driver to measure float 2020-06-07 16:33:28 +02:00
Robert Jaakke 2da09526ba switched to float values and converted Pa to hPa 2020-06-06 23:05:55 +02:00
Robert Jaakke 6667951505 Working sample 2020-06-06 22:35:41 +02:00
Staars 71d5ca5036 adding unishox compression to the webserver 2020-06-06 21:52:20 +02:00
Staars 7077a80541 unify USE_*_COMPRESSION to USE_UNISHOX_COMPRESSION 2020-06-06 20:04:10 +02:00
Theo Arends d45b019dba
Merge pull request #8629 from malbinola/fix/windmeter-isr 
Windmeter: make ISR variables volatile
 2020-06-06 12:53:28 +02:00
Matteo Albinola 8a67477cab Make ISR variables volatile 2020-06-06 09:25:00 +02:00
Theo Arends a476ac6407
Merge pull request #8627 from s-hadinger/zigbee_fix_time 
Fix Zigbee Time and add TimeEpoch
 2020-06-06 08:25:34 +02:00
Theo Arends 28631a7bc3
Merge pull request #8624 from gemu2015/scripter-update 
scripter update, eeprom support
 2020-06-06 08:24:35 +02:00
Stephan Hadinger 0bfb79e694 Fix Zigbee Time and add TimeEpoch 2020-06-05 22:27:47 +02:00
gemu2015 9987b3f2d5 scripter update, eeprom support 2020-06-05 20:15:16 +02:00
Stephan Hadinger 0ebcbc76dc Fix wrong sign of attributes 2020-06-05 18:24:31 +02:00
Theo Arends 9d86c15685 Some webserver code saving 2020-06-05 11:53:53 +02:00
Janusz Kostorz c20bb9ab58
increasing in color temperature change speed 2020-06-04 22:27:30 +02:00
Theo Arends dac14073c9 Fix windmeter interrupt service routine 
Fix windmeter interrupt service routine (#8614)
 2020-06-04 12:28:01 +02:00
Theo Arends 41f77f688c Add command ``SetOption94 0/1`` 
Add command ``SetOption94 0/1`` to select MAX31855 or MAX6675 thermocouple support (#8616)
 2020-06-04 11:36:58 +02:00
Theo Arends 676a13f0c2
Merge pull request #8616 from aik/development-v2 
Add MAX6675 sensor (v2)
 2020-06-04 09:40:58 +02:00
Alexey Kardashevskiy 5558da527a Add MAX6675 sensor 
This is basically a cut down version of MAX31855 without reference
temperature reading and lower resolution (only positive, 12bit only).

This implements 16bit protocol (31855 uses 32bit). SetOption94 enables
the new behavior.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
Changes:
v2:
* treat occasional 0xfff as an error
* do not add new sensor pins, use SetOption94 instead
 2020-06-04 10:00:00 +10:00
Stephan Hadinger 45397293e1 Add Zigbee auto-responder for common attributes 2020-06-03 22:39:04 +02:00
Theo Arends f035932c74 Change BH1750 indexes to I2C address 2020-06-03 15:12:23 +02:00
m-hume 3748bb2121
Label sensors with hex address 2020-06-03 13:06:01 +01:00
Theo Arends 7e8c1368a8
Merge pull request #8606 from halfbakery/support_switches_with_ac_detection 
Add support for switches using an AC detection circuitry
 2020-06-03 13:37:49 +02:00
Theo Arends 61b47e345d
Merge pull request #8605 from device111/development 
AS3935, add stage to json, fix overwrite nf-floor
 2020-06-02 22:26:32 +02:00
halfbakery 6dd50a394c Add support for switches using an AC detection circuitry 2020-06-02 22:17:20 +02:00