Commit Graph

7322 Commits

Author SHA1 Message Date
Charles 5d4328a1a7 Merge branch 'teleinfo-dev' into teleinfo 2020-06-19 02:40:00 +02:00
Charles 51c1cd3148 Added Teleinfo template 2020-06-19 02:38:15 +02:00
Charles 8f3821d862 Merge branch 'development' into teleinfo-dev 2020-06-19 02:37:11 +02:00
Charles 19a63e944c Merge branch 'development' into teleinfo 2020-06-19 02:31:05 +02:00
Charles 2cf1abff83 Updated ESP32 template 2020-06-19 02:28:09 +02:00
Charles b66f9e0351 Merge branch 'teleinfo-dev' into teleinfo 2020-06-19 02:15:06 +02:00
Charles 01e3198524 Sync from upstream 2020-06-19 02:13:17 +02:00
Theo Arends 47c27481f2
Merge pull request #8729 from Staars/nrf24
Adding payload decryption to the xsns_61_MI_NRF24.ino-driver
2020-06-18 21:41:50 +02:00
Theo Arends 11ee93eaa1
Merge pull request #8728 from ascillato/patch-1
KNX: Add Scene Support
2020-06-18 20:58:51 +02:00
ascillato e48d47233d Merge branch 'patch-1' of https://github.com/ascillato/Tasmota_KNX into patch-1 2020-06-18 15:26:49 -03:00
ascillato 98798d4c11 KNX: Add Scene Translation Keys 2020-06-18 15:25:59 -03:00
Adrian Scillato bd011493e5
KNX: Add Scenes Slot 2020-06-18 15:23:58 -03:00
Theo Arends 2a87fa4612
Merge pull request #8724 from effelle/development
Discovery Update
2020-06-18 20:09:35 +02:00
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 37028ce74f add stripped down mbedtls-lib 2020-06-18 17:58: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
Theo Arends 9a8722fa70
Merge pull request #8714 from gemu2015/scripter_timer-fix
scripter timer fix
2020-06-17 16:49:27 +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 1181a701ce Update BUILDS.md 2020-06-17 15:03:09 +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