Commit Graph

1772 Commits

Author SHA1 Message Date
Charles dd6574520f Merge branch 'teleinfo-dev' into teleinfo 2020-06-18 10:59:39 +02:00
Charles 748196dcd9 massive use of GetTextIndexed, avoid long also 2020-06-17 19:54:40 +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
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