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

3156 Commits

Author SHA1 Message Date
Jason2866 809d11dabd
Mqtt translate 2019-10-03 15:26:11 +02:00
Theo Arends fef7faa5be Add MQTTLog option to GUI 
Add MQTTLog option to GUI
 2019-10-03 14:45:24 +02:00
Theo Arends a0c7db7f7c Add Mqtt log level text 
Add Mqtt log level text
 2019-10-03 14:27:01 +02:00
Theo Arends 0580ceb0b6 Add support for Chint DDSU666 Modbus energy meter 
Add support for Chint DDSU666 Modbus energy meter by Pablo Zerón
 2019-10-03 14:18:04 +02:00
Theo Arends aeaea9f0b8
Merge pull request #6555 from pablozg/ddsu666 
add support to chint ddsu666
 2019-10-03 14:02:11 +02:00
Theo Arends aebe37c890 Fix PulseTime command responses 
Fix PulseTime command responses
 2019-10-03 13:11:43 +02:00
pablozg 9e71109549 add support to chint ddsu666 2019-10-03 10:06:51 +02:00
Theo Arends cbb3f9e0af Change command PulseTime JSON message 
Change command PulseTime JSON message format and allow display of all pulsetimer information (#6519)
 2019-10-03 10:02:57 +02:00
Theo Arends 913a809242 Bump version 6.6.0.15 
Bump version 6.6.0.15
 2019-10-03 09:58:23 +02:00
Federico Leoni 11d4cd9058
Update my_user_config.h 2019-10-02 16:58:52 -03:00
Federico Leoni 4eef80e4d9
Update xdrv_12_home_assistant.ino 2019-10-02 13:16:14 -03:00
Theo Arends bc55237154 Fix domoticz core 2.3.0 compilation error 
Fix domoticz core 2.3.0 compilation error
 2019-10-02 17:39:27 +02:00
Theo Arends 7735f95058
Merge branch 'development' into serial_iarm_send 2019-10-02 17:33:51 +02:00
Theo Arends 8c34b9edbd Change command handling 
* Change command SetOption43 to make it more general. Now supports PS_16_DZ driver too (#6547)
 * Change command handling by moving buffers up in chain solving MQTTlog support (#6524)
 * Change detection of non-MQTT commands by allowing non-space characters as delimiter (#6540)
 2019-10-02 16:45:53 +02:00
Theo Arends 97de80bba1
Merge pull request #6547 from shantur/ps_16_dz-dimmer-max 
Ps 16 dz dimmer max
 2019-10-02 16:13:40 +02:00
gemu2015 da2b2efae0 update scripter hue without devices 2019-10-02 13:38:05 +02:00
Theo Arends bac30bbe1b Try to catch domoticz test 
Try to catch domoticz test (#6529)
 2019-10-02 12:51:37 +02:00
Shantur Rathore 39b201898d PS_16_DZ: Implement SetOption43 (Dimmer Max) for PS_16_DZ dimmers. Fixes #6544 2019-10-02 11:28:44 +01:00
Shantur Rathore f946ebaf7b Dimmer: Change SetOption43 (Dimmer Max) generic instead of Tuya only 2019-10-02 11:11:50 +01:00
Theo Arends 37fc7d2259 Add command SetOption71 for DDS238-2 
Add command SetOption71 0/1 to switch between different Modbus Active Energy registers on DDS238-2 energy meters (#6531)
 2019-10-02 11:24:51 +02:00
Jason2866 6379677218
Shutter and PC8574 2019-10-02 10:39:14 +02:00
Stephan Hadinger 838e571d10 Fix TasmotaSerial: move serial send to IRAM for high speed baud rates 2019-10-01 22:58:08 +02:00
Adrian Scillato c7308e2dff
Updated Spanish Translation 2019-10-01 17:05:58 -03:00
Theo Arends d9aeb95503 Update xdrv_27_shutter.ino 2019-10-01 17:20:43 +02:00
Theo Arends ea7718c810 Fix ShutterClose Index display 
Fix ShutterClose Index display (#6535)
 2019-10-01 17:19:37 +02:00
Theo Arends be4867e7f6 Fix compilation error 
Fix compilation error
 2019-10-01 16:45:53 +02:00
Theo Arends aa5b5e891e Add initial support for PCF8574 I2C I/O Expander 
Add initial support for PCF8574 I2C I/O Expander (currently output only) by Stefan Bode
 2019-10-01 16:33:39 +02:00
Theo Arends 92c2196e73 Fix possible I2C init errors 
Fix possible I2C init errors
 2019-10-01 16:21:39 +02:00
Theo Arends c311632b7a
Merge pull request #6533 from andrethomas/mcp230xx 
Mcp230xx
 2019-10-01 14:36:22 +02:00
Theo Arends f847763ad1 Update xdrv_01_webserver.ino 2019-10-01 10:49:42 +02:00
Andre Thomas 26fc172df4
Update _changelog.ino 2019-10-01 08:54:44 +02:00
Andre Thomas 9884cfaf16
MCP230xx Add sensor29 pin,2 for toggle 2019-10-01 08:49:40 +02:00
Andre Thomas dea255db26
MCP230xx: Prevent inadvertent pinmode change 
We've added support for sensor29 pin,0/1 for OFF/ON but the current code would allow the pinmode to be changed without specifying a default state e.g. sensor29 pin,3 would cause the pinmode to be changed to input even if it was previously configured for output (pinmode 5/6)

This change prevents these instances by enforcing the configuration rules as outlined in the wiki e.g.

sensor29 pin,pinmode,pullup/default state (if used for output)
 2019-09-30 21:31:23 +02:00
Theo Arends d7d0316769 Fix open/close to limits 
Fix open/close to limits (#6516)
 2019-09-30 19:27:54 +02:00
Andre Thomas b38a8bd8eb
MCP230xx - Add sensor29 pin,1 and sensor29 pin,0 
MCP230xx - Add sensor29 pin,1 and sensor29 pin,0 as an alternative to sensor29 pin,ON and sensor29 pin,OFF respectively.
 2019-09-30 17:26:07 +02:00
Andre Thomas bed26fd121
MCP230xx - Add 1 and 0 as option for ON and OFF 
MCP230xx - Add 1 and 0 as option for ON and OFF
 2019-09-30 17:19:15 +02:00
Theo Arends 9cc4bc67ba Refactor shutter code 
Refactor shutter code
 2019-09-30 11:34:33 +02:00
Theo Arends 7689534cf5 Refactor shutter support 
Refactor shutter support (#6516)
 2019-09-30 11:21:43 +02:00
Theo Arends f2ed754f11
Merge pull request #6515 from Staars/chirp 
support for i2c-moisture-sensor AND Chirp!-sensor
 2019-09-30 11:02:47 +02:00
Theo Arends 2fe54c9b38
Merge pull request #6523 from gemu2015/sml-update 
sml fix obis dump mode
 2019-09-30 11:01:47 +02:00
gemu2015 62cda21cec sml fix obis dump mode 2019-09-30 10:53:16 +02:00
gemu2015 8f2ba87ced Update xdrv_10_scripter.ino 2019-09-30 10:41:04 +02:00
gemu2015 768c264d04 Update xdrv_20_hue.ino 2019-09-30 10:31:13 +02:00
gemu2015 6eb3c74689 scripter update 2019-09-30 10:25:02 +02:00
Staars e6824ff903 remove #define USE_CHIRP 2019-09-29 18:38:14 +02:00
Staars 6da17ccb6b last fixes for the Chirp-sensor 2019-09-29 18:35:02 +02:00
Theo Arends e90f67bbbb Add driver JSON if available 
Add driver JSON if available
 2019-09-29 18:11:36 +02:00
Theo Arends e40475b563 Add initial support for shutters 
Add initial support for shutters by Stefan Bode (#288)
 2019-09-29 18:00:01 +02:00
Theo Arends 728d162be8
Merge pull request #6512 from s-hadinger/fix_6508 
Fix 6508
 2019-09-29 17:11:51 +02:00
Stephan Hadinger 9ce32790db Fix 6508 2019-09-29 16:06:18 +02:00
Stephan Hadinger d86cd34905 Add Zigbee more support - collect endpoints and clusters, added ZigbeeDump command 2019-09-29 15:38:26 +02:00
Staars ab70dd2755 various fixes for the Chirp-sensor 2019-09-29 13:27:50 +02:00
Theo Arends 4c21e46512 Fix compilation error 
Fix compilation error (#6509)
 2019-09-29 12:37:33 +02:00
Theo Arends ea72671018 Fix Energy Off-Peak detection calculation 
Fix Energy Off-Peak detection calculation (#6500)
 2019-09-29 12:18:09 +02:00
Theo Arends 702df2b29f Prep for I2C Active control 
Prep for I2C Active control
 2019-09-29 11:52:22 +02:00
Theo Arends 55ab9639e6
Merge pull request #6504 from laurentdong/ExpressionBracket 
Missed one character previous of closure bracket
 2019-09-28 10:18:02 +02:00
Theo Arends 0f0febef11
Merge pull request #6503 from laurentdong/AcceptNegativeNumber 
Accept negative number
 2019-09-28 10:17:37 +02:00
Theo Arends 42fe7e275b
Merge pull request #6502 from laurentdong/ExpressionBugFix 
Expression evaluation got exception
 2019-09-28 10:16:43 +02:00
Laurent 9327329b0f Missed one character previous of closure bracket 
For example:
Var1 = (1+2)
will be treat as:
Var1 = 1+
 2019-09-27 22:15:42 -04:00
Laurent dbd234ef81 Accept negative number 
Expression should support negative number
 2019-09-27 21:58:32 -04:00
Laurent 834e9c7b21 Expression evaluation got exception 
Should use pgm_read_byte to access PROGMEM data
 2019-09-27 21:52:33 -04:00
Staars e6eaa42bfe Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into chirp 2019-09-27 18:41:22 +02:00
Theo Arends b7aa3cd884 Add initial support for MQTT logging 
Add initial support for MQTT logging using command MqttLog <loglevel> (#6498)
 2019-09-27 18:13:00 +02:00
Theo Arends 82b7225332 Fix divide 
Fix divide
 2019-09-26 16:16:38 +02:00
Theo Arends 81b081f620 Add max current checks to SM2135 
Add max current checks to SM2135 (#6495)
 2019-09-26 16:06:05 +02:00
Theo Arends febb93788c Experimental support for SM2135 
Experimental support for SM2135 (#6495)
 2019-09-26 12:30:21 +02:00
Stephan Hadinger 9c885079f0 Allow Hue emulation friendly names to go beyond 13 2019-09-25 18:14:58 +02:00
Stephan Hadinger 902dc6b69c Fix rounding issue when reading Channel value 2019-09-25 17:56:03 +02:00
Theo Arends fa826d33d9 Refactor ds18x20.ino 2019-09-25 16:28:54 +02:00
Theo Arends f03ec437fe Delete xsns_05_ds18x20_legacy.ino 2019-09-25 15:07:23 +02:00
Theo Arends 3eb219ccaa Remove support for define USE_DS18x20_LEGACY 
Remove support for define USE_DS18x20_LEGACY and legacy DS18x20 driver (#6486)
 2019-09-25 14:35:37 +02:00
Theo Arends 5bd19d54db Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00 
Change command Tariffx to allow time entries like 23 (hours), 1320 (minutes) or 23:00. NOTE: As this is development branch previous tariffs are lost! (#6488)
 2019-09-25 14:24:49 +02:00
Theo Arends 6ad2d3b86f Bump version 6.6.0.14 
Bump version 6.6.0.14
 2019-09-25 14:17:20 +02:00
gemu2015 c369289cb5 Update xdrv_10_scripter.ino 2019-09-24 15:30:26 +02:00
gemu2015 854b60ac7a Update support_command.ino 2019-09-24 08:51:09 +02:00
gemu2015 31a269a82f Update xdrv_01_webserver.ino 2019-09-24 08:43:13 +02:00
gemu2015 56c3de022b Update xdrv_01_webserver.ino 2019-09-24 08:32:55 +02:00
gemu2015 5e5fc79ca1 Delete sonoff.ino.cpp 2019-09-24 08:27:43 +02:00
gemu2015 4c79e0c627 scripter command support, up to 4 buttons in a row, bug fixes 2019-09-24 08:25:32 +02:00
Theo Arends 9add50b679
Merge pull request #6478 from s-hadinger/hue_32_relays 
Support up to 32 devices for Hue emulation
 2019-09-23 23:57:48 +02:00
Stephan Hadinger 93c031eb01 Support up to 32 devices for Hue emulation 2019-09-23 22:57:20 +02:00
Theo Arends 397070900a Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2019-09-23 17:30:42 +02:00
Theo Arends 58c1851f93 Disable GroupTopic change of SwitchTopic 
Disable GroupTopic change of SwitchTopic (#6467)
 2019-09-23 17:30:37 +02:00
Theo Arends d364bb29bc
Merge pull request #6472 from s-hadinger/zigbee_fix_20190922 
Fix Zigbee bug in reconfiguration and removed timecode from ZigbeeZNPReceived
 2019-09-22 18:35:07 +02:00
Stephan Hadinger 784f2e068e Fix Zigbee bug in reconfiguration and removed timecode from ZigbeeZNPReceived 2019-09-22 18:32:17 +02:00
Theo Arends 075485e124 Fix energy usage/export resolution 
Fix energy usage/export resolution (#6444)
 2019-09-22 18:30:55 +02:00
Theo Arends ae3ebf1c94 Tiny refactor 
Tiny refactor
 2019-09-22 16:33:14 +02:00
Theo Arends 181ac5539b Add JSON array index support to rules 
Add JSON array index support to rules evaluation allowing trigger on ENERGY#POWER[2]>0.60 from JSON ..,"Power":[0.00,0.68],.. (#6160)
 2019-09-22 16:14:34 +02:00
Theo Arends 917021ca1e Refactor HX711 sensor driver 
Refactor HX711 sensor driver
 2019-09-22 14:13:06 +02:00
Theo Arends 15024fa348 Add Tariff export values to JSON message 
Add Tariff export values to JSON message (#6429)
 2019-09-22 14:00:34 +02:00
Theo Arends 957272dca4 Bump version to 6.6.0.13 
* Add command EnergyReset4 x,x to initialize total usage for two tarrifs
 * Add command EnergyReset5 x,x to initialize total export (or production) for two tarrifs
 * Add command Sensor34 8,0 and Sensor34 8,1 to disable/enable JSON message on weight change over 4 gram
 2019-09-22 12:53:15 +02:00
Theo Arends 763601ccb4 Fix JSON total usage resolution display 
Fix JSON total usage resolution display (#6429)
 2019-09-22 11:54:02 +02:00
Theo Arends 37d9cb4c92 Fix PZEM missing phase zeroing all readings 
Fix PZEM missing phase zeroing all readings (#2315)
 2019-09-21 17:10:52 +02:00
pablozg 2798561bda NRG: Show usage/export stored values when EnergyReset command is sent 2019-09-21 11:31:41 +02:00
pablozg 4f17c93a83 Fix max value in EnergyReset command 2019-09-20 22:46:34 +02:00
pablozg d7d91583fd Energy: Fix no usage/return updated and no usage/return value stored after reboot 2019-09-20 22:35:56 +02:00
pablozg 60f55b8ea4 Energy: EnergyReset now can set the usage1, usage2, return1 and return2 totals used in Domoticz P1 smart meter sensor 2019-09-20 16:05:48 +02:00
pablozg acf85db0da Check if RTC time is valid before energy sum 2019-09-20 14:37:55 +02:00
pablozg 254f3f3f6c Change Domoticz P1 smart meter sensor total usage logic, issue #6444 2019-09-20 12:59:34 +02:00
Stephan Hadinger 62f7f8c557 Minor update to Zigbee 2019-09-19 19:25:08 +02:00
Theo Arends acd713c867
Merge pull request #6455 from Jason2866/patch-1 
Disable mDNS for sonoff-sensors freeing IRAM
 2019-09-19 09:59:40 +02:00
Jason2866 619ba5e172
Disable mDNS for freeing IRAM 
Compile fails (IRAM), mDNS is not a sensor and disabled by default.
 2019-09-18 23:52:51 +02:00
Andre Thomas de198ba861
Bracketing is an art... I was once told :) 2019-09-18 22:49:19 +02:00
Staars a066acd7f2 remove a double quote from TELE-message 2019-09-18 21:06:14 +02:00
Staars eb8539dd91 name it DARKNESS, handle non-reading of temperature, small bugfixes 2019-09-18 20:57:35 +02:00
Theo Arends e4ab7ebfe2
Merge pull request #6452 from gemu2015/scripter-bugs 
scripter bugs
 2019-09-18 19:35:33 +02:00
gemu2015 8e4b91837b fix sgp30 2019-09-18 18:54:28 +02:00
gemu2015 e8b905f491 scripter bugs 2019-09-18 18:50:25 +02:00
pablozg 40657bd256 Autoupdate Energy.total with the value reported by hardware (sdm120, etc) 2019-09-18 11:42:28 +02:00
Staars a02c733073 enable slow reads for original CHIRP-sensor 2019-09-17 22:03:30 +02:00
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
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 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
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
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
gemu2015 777956b634 scripter bug fix 
fix bug that webfrefresh was affected by permanent variables p:var
 2019-09-14 07:48:55 +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 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
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 7e27eec94c
Merge pull request #6397 from Leuselator/development 
Expose motor-commands directly
 2019-09-10 16:29:39 +02:00
Theo Arends 19c42f3893
Update xdrv_25_A4988_Stepper.ino 2019-09-10 16:29:19 +02:00
Tim Leuschner 72990ad9ae
Add files via upload 
Hi all,
now that it's in the world I found the implementation of my A4988 - module not good concerning usability.

I use ioBroker as Backend and the device reports there as expected with a Property named "MOTOR" but no reasonable way to pass the commands to it.
Iv'e forked Tasmota again and changed the xdrv_25_A4988_Stepper.ino.
I expose the commands directly and changed the names so they can be found close together in the propertylist.
New CommandNames: 
motorMove
motorRotate
motorTurn
motorMIS
motorSPR
motorRPM
if you pull it, I instantly would change the wiki.
 2019-09-10 16:19:23 +02:00
Theo Arends 4b647928aa Bump version to 6.6.0.12 
* Redesign command Tariff to now default to 0 (=disabled) and allowing to set both Standard Time (ST) and Daylight Savings Time (DST) start hour (#6282)
 *  Commands Tariff1 23 = Tariff1 ST, Tariff2 7 = Tariff2 ST, Tarriff3 22 = Tarrif1 DST, Tariff4 6 = Tariff2 DST, Tariff9 0/1 = Weekend toggle
 2019-09-10 16:18:23 +02:00
Theo Arends 657dbff570 Add support for Hiking DDS238-2 Modbus energy meter 
Add support for Hiking DDS238-2 Modbus energy meter by Matteo Campanella (#6384)
 2019-09-10 15:14:51 +02:00
Theo Arends 0e3a88bbe2 Add Energy Export if available 
Add Energy Export if available (#6282)
 2019-09-10 12:31:08 +02:00
Theo Arends b811956d2f Fix rules on core 2.3.0 compilation error 
Fix rules on core 2.3.0 compilation error (#6392)
 2019-09-10 11:05:53 +02:00
Federico Leoni cee2248129
Update xdrv_12_home_assistant.ino 2019-09-09 15:29:05 -03:00
Laurent Dong 96098e4e09 Support If in Rules 
The major features of IF statement are:
 - Support IF, ELSEIF, ELSE
 - Support not only comparison but also using logical expression as condition
 - Support run multiple commands
 - Support nested IF statement
 - All the commands run by IF statement will go to the BACKLOG!
 - No limit for logical operators, parenthesis and nested IF statement. Depends on your RAM!

Extended Backus-Naur Form of IF statement:
<if-statement> ::=
IF "(" <logical-expression> ")" <statement-list> {ELSEIF "(" <logical-expression> ")" <statement-list>} [ELSE <statement-list>] ENDIF
<logical-expression> :=
<comparison-expression> |
(<comparison-expression> | <logical-expression>) {(AND | OR) <logical-expression>} |
"(" <logical-expression ")" {(AND | OR) <logical expression>}
<comparison-expression> ::=
<math-expression> ("=" | "<" | ">" | "|" | "==" | "<=" | ">=" | "!=") <math-expression>
<statement-list> ::=
<statement> {";" <statement>}
<statement> ::=
<Sonoff-Tasmota-command> | <if-statement>

In English:
If statement support 3 format:
1. IF (<condition>) <statement-list> ENDIF
2. IF (<condition>) <statement-list> ELSE <statement-list> ENDIF
3. IF (<condition>) <statement-list> [ELSEIF (<condition>) <statement-list> ]* ELSE <statement-list> ENDIF

<condition> is a logical expression which can be:
1. A comparison expression for example:
   VAR1 >= 10
2. Multiple comparison expression with logical operator "AND" or "OR" between them. "AND" has higher priority than "OR". Fox example:
   UPTIME > 100 AND MEM1 == 1 OR MEM2 == 1
3. Parenthesis can be used to change the priority of logical expression. For example:
   UPTIME > 100 AND (MEM1 == 1 OR MEM2 == 1)

<statement-list> can be:
1. A Sonoff-Tasmota command. For example:
   ledpower on
2. A IF statement ("IF .... ENDIF")
3. Multiple Sonoff-Tasmota command or IF statement split with ";". For example:
   Power1 off; Ledpower on; if (mem1 == 0) Var1 Var1+1; mem1==1 endif; Delay 10; POWER1 on
4. Do not need to lead with "BACKLOG" for multiple commands.
 2019-09-09 11:24:27 -04:00
gemu2015 710b576d6b epaper display 29 fix 2019-09-08 20:48:47 +02:00
Tim Leuschner eb858ed485
Update _changelog.ino 
Name was misspelled ... ;-)
 2019-09-08 18:56:15 +02:00
Stephan Hadinger 8e1a90932e Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into serial_115200_2 2019-09-08 18:34:50 +02:00
Theo Arends 4910ea308a Add support for A4988 stepper-motor-driver-circuit 
Add support for A4988 stepper-motor-driver-circuit by Tim Leuscher (#6370)
 2019-09-08 18:32:35 +02:00
Stephan Hadinger 41d6dd2683 Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into serial_115200_2 2019-09-08 18:29:11 +02:00
Theo Arends 17eb9727a5
Merge pull request #6370 from Leuselator/A4988_Stepper 
A4988 stepper
 2019-09-08 18:14:07 +02:00
Tim Leuschner 2345828b39 Merge branch 'A4988_Stepper' of https://github.com/Leuselator/Sonoff-Tasmota into A4988_Stepper 2019-09-08 17:31:35 +02:00
Tim Leuschner fafb837120 removed my changes to platformio&my_user_config, removed the unnessesary digitalwrites in adjustMicrosteps() 2019-09-08 17:30:17 +02:00
Theo Arends 612654ffca Refactor energy driver selection 
Refactor energy driver selection
 2019-09-08 17:21:26 +02:00
Theo Arends 75abfc5fd9 Refactor energy driver detection 
Refactor energy driver detection and function call
 2019-09-08 16:57:56 +02:00
Stephan Hadinger 1d58501c49 Change Improve reliability of TasmotaSerial at 115200 bauds and reduce IRAM usage for Stage/pre-2.6 2019-09-08 16:41:31 +02:00
Theo Arends cea6592945 Remove Total Reactive from SDM120 
Remove Total Reactive from SDM120 (#6282)
 2019-09-08 15:14:48 +02:00
Theo Arends 17a0049fa2 Use SDM120 Import Active as Total 
Use SDM120 Import Active as Total Energy when available (#6282)
 2019-09-08 15:07:28 +02:00
Theo Arends da35643f63 Revert "Merge pull request #6373 from s-hadinger/serial_115200" 
This reverts commit a59dea5a74, reversing
changes made to e0b07391c9.
 2019-09-08 12:59:32 +02:00
Theo Arends 1d39db76b3
Merge branch 'development' into serial_115200 2019-09-08 12:49:21 +02:00
gemu2015 c2f560312d sml individual decimal precision on insertion, comments in >W and >J 2019-09-08 12:14:28 +02:00
Stephan Hadinger 7dda2fba0e Change Improve reliability of TasmotaSerial at 115200 bauds and reduce IRAM usage for Stage/pre-2.6 2019-09-08 12:07:51 +02:00
Tim Leuschner ff3701e1ce
Merge branch 'development' into A4988_Stepper 2019-09-08 11:49:15 +02:00
Theo Arends 3d9a73f826 Add support for up to 4 INA226 Voltage and Current sensors 
Add support for up to 4 INA226 Voltage and Current sensors by Steve Rogers (#6342)
 2019-09-08 11:26:54 +02:00
Tim Leuschner 4533039c9f removed my user-settings 2019-09-08 04:02:47 +02:00
Tim Leuschner e0a17cda55 this compiles... 2019-09-08 04:01:02 +02:00
Tim Leuschner 4e1480d0f0 works fine... 2019-09-08 03:28:19 +02:00
srodgers 27ecd09e9d Update from testing branch 2019-09-07 15:30:51 -07:00
srodgers 4a41c13738 Merged from upstream 2019-09-07 14:38:57 -07:00
srodgers 0a9166dde7 Update files 2019-09-07 14:28:08 -07:00
Tim Leuschner e516262904 ..to be tested 2019-09-07 21:37:01 +02:00
Tim Leuschner 179d74ab08 it compiles... 2019-09-07 20:38:06 +02:00
Theo Arends 2e9f06f8bf Bump version to 6.6.0.11 
Change Settings crc calculation allowing short term backward compatibility
 2019-09-07 18:32:11 +02:00
Theo Arends fc2be92478 Move SDM120 modbus updates out of ticker interrupt 
Move SDM120 modbus updates out of ticker interrupt (#6282)
 2019-09-07 16:31:39 +02:00
Federico Leoni 299a14fed4
Update pt-BR.h 2019-09-07 11:25:53 -03:00
Federico Leoni 5eb09495c2
Update it-IT.h 2019-09-07 11:24:57 -03:00
Tim Leuschner 8350be64a0 . 2019-09-07 14:09:44 +02:00
Tim Leuschner 5eac2dd939 Support Stepper-motors connected to A4988-stepper-driver-circuit 2019-09-07 14:03:07 +02:00
Federico Leoni 0c8ac27b54
Update pt-BR.h 2019-09-06 20:30:49 -03:00
Federico Leoni 8b15fe8c0b
Update it-IT.h 2019-09-06 20:03:42 -03:00
Theo Arends 53235a3382 Redesign Energy Total calculation 
* Redesign Energy Total calculation
* Increase SDM120 modbus interval time to 200mS (#6282)
 2019-09-06 18:02:31 +02:00
Theo Arends 2fa583392a Change command Time 1/2/3 for legacy reason 
Change command Time 1/2/3 to select JSON time format ISO, ISO + Epoch or Epoch for legacy reason
 2019-09-06 15:46:40 +02:00
gemu2015 c671eaecb9 touch button update, fix display settings font and size 2019-09-06 10:11:50 +02:00
Theo Arends a1e9c2d2ac Fix SDM120 modbus dump and Domoticz Energy Consumed or Produced 
Fix SDM120 modbus dump exception and Domoticz Energy Consumed or Produced (#6282)
 2019-09-05 18:02:36 +02:00
Theo Arends ab89bb53a9 Oops 
Oops
 2019-09-05 17:45:43 +02:00
srodgers e620f75785 Remove extra space 2019-09-05 08:25:03 -07:00
srodgers 553c5e4a9c Sync to testing branch 2019-09-05 08:20:40 -07:00
Theo Arends ea0fb65845 Refactor Sendmail 
Refactor Sendmail
 2019-09-05 17:19:19 +02:00
Theo Arends aaf542bf97
Merge pull request #6352 from gemu2015/sendmail 
sendmail support
 2019-09-05 16:56:30 +02:00
Theo Arends a01de9a9b2 Remove obsolete Tuya code 
Remove obsolete Tuya code
 2019-09-05 16:56:02 +02:00
Theo Arends c9df1d6942
Merge pull request #6355 from shantur/tuya-mcu 
TuyaMCU: Cleanup unused tuya_disable_dimmer
 2019-09-05 12:58:10 +02:00
Shantur Rathore e0f5ed38af TuyaMCU: Cleanup unused tuya_disable_dimmer 2019-09-05 11:32:39 +01:00
Theo Arends db44b058e2 Add command Reset 99 to reset bootcount to zero 
Add command Reset 99 to reset bootcount to zero (#684, #6351)
 2019-09-05 12:32:28 +02:00
Theo Arends d1ca5d1bde Fix exception on AddLogBuffer 
Fix exception on AddLogBuffer (#6282)
 2019-09-05 12:22:06 +02:00