Commit Graph

7328 Commits

Author SHA1 Message Date
Theo Arends bea5130d35
Merge pull request #8683 from gemu2015/sml_modbus_fix
fix sml modbus raw mode
2020-06-14 12:14: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
Theo Arends 8c83a0e21a
Merge pull request #8676 from gemu2015/scripter-globals
scripter support for global vars
2020-06-13 13:35:24 +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 6fd972d7a8 Bumped to version 1.1.1 2020-06-13 02:18:01 +02:00
Charles 6d38a67cda Added deviice Denky for French Metering Teleinfo 2020-06-12 21:53:54 +02:00
Charles 4929d3c8e5 Added French Metering Teleinfo 2020-06-12 21:53:26 +02:00
Charles 6cbae1fafe Added French Metering Teleinfo 2020-06-12 21:53:12 +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
Theo Arends f14057d587
Merge pull request #8671 from bovirus/patch-1
Update Italian language
2020-06-12 16:47:55 +02:00
Charles 481576c353 Added Include 2020-06-12 16:34:19 +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 acc67b9e9f Fix Debug 2020-06-12 16:31:36 +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 a97f391f91 Update I2CDEVICES.md 2020-06-12 12:40:42 +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
Theo Arends 79196788aa
Merge pull request #8638 from rjaakke/HP303B
HP303B Sensor support
2020-06-12 11:51:19 +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
Charles e05e9ea713 Creation 2020-06-11 14:52:31 +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
Theo Arends b2cef9de32
Merge pull request #8658 from s-hadinger/telegram_prep
Cleaned TLS options and prepare for TELEGRAM
2020-06-11 07:52:50 +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
Robert Jaakke 8cbb35ec4f Removed m_initFail check because we moved it to begin() 2020-06-10 21:54:32 +02: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
Theo Arends e4958c4a18
Merge pull request #8653 from s-hadinger/asm_gcc17
Fix compilation with gnu++17 / c17
2020-06-10 09:24:54 +02:00