Commit Graph

2896 Commits

Author SHA1 Message Date
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