Commit Graph

2139 Commits

Author SHA1 Message Date
localhost61 ba7c4cd49b fr-FR.h update 2019-02-17 21:32:07 +01:00
Jason 10bdb7c975 mqtt password GUI aligned to revised wifi version 2019-02-17 18:45:58 +00:00
Theo Arends 4d0ab9448d Fix unsupported sensor ids
Fix unsupported sensor ids popping up after a config restore
2019-02-17 16:43:52 +01:00
Theo Arends a201dd1222 Remove command SetOption62
Remove command SetOption62 as it's functionality is replaced by user changing the device template (#5255)
2019-02-17 16:05:53 +01:00
Theo Arends f33c59249e Fix calibration calculation
Fix calibration calculation (#5246)
2019-02-17 15:30:15 +01:00
Theo Arends 3f6db36187 Update xdrv_01_webserver.ino
Fix 404 error
2019-02-17 14:43:07 +01:00
Jason2866 94f1683616
Update de-DE.h
Template changes
2019-02-17 12:32:46 +01:00
Theo Arends 577791440e Add Configure Template menu option
Add Configure Template menu option to GUI (#5222)
2019-02-17 11:32:53 +01:00
Theo Arends e2540f0afe Update sonoff.ino
Prep for template menu
2019-02-17 10:42:55 +01:00
Xavier MULLER f94c2245af
Update fr-FR.h 2019-02-17 01:02:52 +01:00
Xavier MULLER 4ed82140af
Update fr-FR.h 2019-02-17 01:01:26 +01:00
Theo Arends ed0d50a3aa Fix template support
Fix template support
2019-02-16 18:01:54 +01:00
Theo Arends 14d5f7fb54 Fix GUI password and Add rule expression
* Fix GUI wifi password acception starting with asteriks (*) (#5231, #5242)
 * Add rule expression enabled  by define USE_EXPRESSION in my_user_config.h (#5210)
2019-02-16 16:17:17 +01:00
Theo Arends 7c9720de9d
Merge pull request #5210 from laurentdong/development
Introduce Expression in Rules - Updated
2019-02-16 15:49:46 +01:00
Jason e6029e18be Fix typos. 2019-02-16 12:51:43 +00:00
Jason 02f1052440 Amended wifi password UI to show "****".
Only store passwords which are not equal to "****".
Removes previous behaviour where wifi password with an asterisk was
ignored.
2019-02-16 12:48:16 +00:00
Theo Arends 1fde362998 Fix regression from 6.4.1.16
Fix regression from 6.4.1.16 where GPIO9 and GPIO10 connected devices did not work (#5197)
2019-02-16 11:33:29 +01:00
Theo Arends 77db7ba0ff 6.4.1.17 Change template stability
6.4.1.17 20190214
 * Change template update by removing possibility to add user module config keeping template as defined (#5222)
2019-02-14 16:48:28 +01:00
Theo Arends 166a625eb8 Revert "Hide templated GPIOs"
This reverts commit 4af4ff681d.
2019-02-14 11:13:47 +01:00
Theo Arends 4af4ff681d Hide templated GPIOs
Hide templated GPIOs in user template too (#5222)
2019-02-14 11:04:11 +01:00
Theo Arends 4e3d2c63db Fix timer GUI tab colors
Fix timer GUI tab colors
2019-02-13 17:30:07 +01:00
Jason2866 75943f5ea4
Update de-DE.h
Changed Template to Vorlage
2019-02-13 17:19:57 +01:00
Theo Arends 8cb33b86cf Fix compile error (#5216)
Fix compile error (#5216)
2019-02-13 17:03:00 +01:00
Theo Arends 74affa1440 Fix Edge and Safari margins
Fix Edge and Safari margins
2019-02-13 16:26:16 +01:00
Theo Arends c39e2da6b5 Update GUI
Update GUI
2019-02-13 16:05:25 +01:00
Theo Arends b9f6bf402a Add CFG_HOLDER to status 1
Add parameter CFG_HOLDER to status 1 message (#5206)
2019-02-13 10:50:02 +01:00
Laurent 4b4b3709ad Introduce Expression in Rules
Support use an expression as paramter in some rule commands, include Var<x>, Mem<x> and Ruletimer<x>.
Expression is constructed by constants (float number), variables (var<x>, mem<x>, Time, Uptime, Sunrise, Sunset),  operators and round brackets.
Currently support 6 operators, order by priority from high to low:
^  (power)
% (modulo)
*, /
+, -
Commands examples:
Var1 3.14 * (MEM1 * (10 + VAR2 ^2) - 100) % 10 + uptime / (2 + MEM2)
Ruletimer4 Time - Sunrise + MEM2/2
2019-02-12 21:46:42 -05:00
Jörg R. Weimar e8df8c4fa6 corrected sliding hour rounding for pixels < 60 2019-02-12 15:28:45 +01:00
Theo Arends 567bc93623 Add Template GUI update
Initial support for online template change using command Template or GUI Configure Other (#5177)
2019-02-12 11:55:47 +01:00
Jörg R. Weimar c05e42f563 Changed ws2812 clock to local time instead of UTC 2019-02-12 11:22:46 +01:00
Theo Arends 9dc445f949
Update xdsp_01_lcd.ino 2019-02-11 21:30:30 +01:00
Theo Arends be82878bd2
Merge pull request #5196 from kevinbaluha/tsl2561interop
verify that tsl2561 works with new ads1115
2019-02-11 21:28:25 +01:00
Kevin Baluha 86a56b7b71 verify that tsl2561 works with new ads1115 2019-02-11 11:22:14 -07:00
Theo Arends 98ae3eaf54 6.4.1.16 Online template change
6.4.1.16 20190211
 * Initial support for online template change using command Template (#5177)
2019-02-11 19:21:49 +01:00
Theo Arends de5023fb43 Fix LCD center text
Fix LCD center text (#5195)
2019-02-11 16:53:46 +01:00
Theo Arends 7146b5fd4d Fix LCD clipped center text
Fix LCD clipped center text (#5193)
2019-02-11 15:43:02 +01:00
Gabor Simon 2d892f64cd Init delay of SM16716 increased to 1 ms
As per measurements by @damondins:
https://github.com/gsimon75/Sonoff-Tasmota/pull/3#issuecomment-462059310
2019-02-10 08:33:05 +00:00
Theo Arends e18263d796 Add optional smart plug
Add optional smart plug (#5171, #5175)
2019-02-09 17:01:44 +01:00
Theo Arends cc8c13b240 Update xdrv_08_serial_bridge.ino
SerialBridge revisited
2019-02-09 16:08:09 +01:00
Theo Arends b3d6857f6a Remove duplicates
Remove duplicates
2019-02-09 15:04:58 +01:00
Theo Arends 3a59084377 Enable group status messages
Add status message to former declined group commands (#5145)
2019-02-09 13:37:27 +01:00
Theo Arends ab11096f3a Add command SerialDelimiter 128
Add command SerialDelimiter 128 to filter reception of only characters between ASCII 32 and 127 (#5131)
2019-02-09 13:25:15 +01:00
Theo Arends 10802d11dc Update sonoff_template.h
Housekeeping
2019-02-09 13:24:35 +01:00
Theo Arends 78b2bd3bd5
Merge pull request #4991 from gsimon75/sm16716
Add support for the SM16716 RGB LED controller
2019-02-08 20:07:50 +01:00
Andre Thomas c254410723
PN532: Add // #define USE_PN532_CAUSE_EVENTS
PN532: Add // #define USE_PN532_CAUSE_EVENTS

Forgot to include it in the my_user_config.h
2019-02-08 19:26:02 +02:00
Colin Kuebler f1247a61e5 Renamed SM16716 PWR as per https://github.com/arendst/Sonoff-Tasmota/pull/4991#pullrequestreview-201622697 2019-02-08 12:10:01 -05:00
Gabor Simon 7b93df4978
Merge branch 'development' into sm16716 2019-02-08 20:00:53 +04:00
Theo Arends 953bcd26af Update xsns_40_pn532.ino
Cleanup and use flush
2019-02-08 15:35:28 +01:00
Theo Arends ae277f59cf Change image defines
6.4.1.15 20190208
 * Change image name BE_MINIMAL to FIRMWARE_MINIMAL (#5106)
 * Change image names USE_xyz to FIRMWARE_xyz (#5106)
2019-02-08 14:55:45 +01:00
Theo Arends bfcc357573 Housekeeping
Housekeeping
2019-02-08 14:25:46 +01:00
Theo Arends 776486f390 Add MHZ19 Temperature to Domoticz
Add MHZ19 Temperature as Domoticz Temperature selection (#5128)
2019-02-08 13:00:11 +01:00
Theo Arends e7f67f9b88 Update sonoff_template.h
Fix PN532 compile error
2019-02-08 12:46:07 +01:00
Theo Arends f587510d2e
Merge pull request #5083 from kevinbaluha/ads1115_multi
add functionality to use multiple ads1115's on one i2cbus
2019-02-08 12:29:15 +01:00
Theo Arends a7d9a1aae3
Merge pull request #5154 from emontnemery/improve_weblog
Improve weblog robustness
2019-02-08 12:27:40 +01:00
Andre Thomas 567b12e1ce
PN532: Update resource requirements in config
PN532: Update resource requirements in my_user_config.h
2019-02-08 09:59:33 +02:00
andrethomas 707b51f292 PN532: Implement HSU (Serial) 2019-02-08 01:06:54 +02:00
andrethomas b76b615a6e PN532: Deprecate I2C support 2019-02-08 00:41:46 +02:00
Erik 6f4e658f03 Increase length of name in HA AD msg. 2019-02-07 20:54:30 +01:00
Erik afe797fd6e Improve weblog robustness 2019-02-07 20:42:46 +01:00
andrethomas2 fd9f66ed6e
ADS1115: Housekeeping 2019-02-07 19:09:49 +02:00
Kevin Baluha da3f4bcab7 add a check for TLS2561 to prevent false positives 2019-02-07 03:54:56 -07:00
Kevin Baluha 58c7fac140 check id reg 2019-02-07 03:40:44 -07:00
Kevin Baluha a1ef7b254e check if TSL2561::begin returns true to prevent false positives 2019-02-07 03:08:13 -07:00
Colin Kuebler 4dc4f38323 Added USE_SM16716 to the feature list 2019-02-06 18:53:44 -05:00
Colin Kuebler 1bf7d32544 Renamed SM16716 Select to SM16716 Enable to avoid confusion with a SM16726 feature also called select 2019-02-06 18:51:54 -05:00
Jason2866 08314bd9f8
Rf Bridge Gpio12 / 14 selectable
Add GPIO12 and GPIO14 in Rf Bridge as GpioUser. This Gpio are not used and easy reachable via solder pads
2019-02-06 22:34:41 +01:00
Theo Arends 6c934ca8f6
Merge pull request #5139 from emontnemery/hass_status_sensor
Add HASS status sensor + improve HASS discovery
2019-02-06 20:29:04 +01:00
Erik 3281055438 Add HASS status sensor 2019-02-06 20:07:28 +01:00
Theo Arends ee2660b2bc Update xdrv_10_rules.ino
Move const to flash
2019-02-05 17:45:35 +01:00
Laurent Dong 09732c9f2d Add new compare operators ("==", "!=" ,">=" and "<=") for rule
Introduce new compare operators for rules and did some optimization as well.
The new "==" operator act as a real number comparison instead of the previous "=" operator which is doing string comparison which result in FALSE for "1 + 1 = 2". For example:
rule1 on event#test do backlog var1 1;add1 1; event CompareWith2=2 endon on event#CompareWith2=%var1% do ledpower on endon
ledpower off
rule1 on
event test
2019-02-05 09:34:17 -05:00
Theo Arends 9c8af6428e Update xdrv_08_serial_bridge.ino
Fix regression
2019-02-05 14:13:53 +01:00
Theo Arends adecf6a9ce Fixes and Tuning
Fixes and Tuning
2019-02-05 12:21:31 +01:00
Theo Arends e9ad78c616 Update xnrg_04_mcp39f501.ino
Fix Exception 9 (Buffer overflow)
2019-02-05 10:13:22 +01:00
Gabor Simon 9b3a204ae5
Merge branch 'development' into sm16716 2019-02-04 22:14:05 +04:00
Theo Arends b839d7e80e Add user configuration of MCP39F501
Add user configuration of MCP39F501 Energy Monitoring as used in Shelly2
2019-02-04 18:18:47 +01:00
Theo Arends 48faabc1cf Revert "Add user configuration of MCP39F501"
This reverts commit c340e2b8bd.
2019-02-04 18:17:50 +01:00
Theo Arends c340e2b8bd Add user configuration of MCP39F501
Add user configuration of MCP39F501 Energy Monitoring as used in Shelly2
2019-02-04 18:17:17 +01:00
Theo Arends 16ec25bdff Prep for user config
Prep CSE7766 (S31 and PowR2) and MCP39F501 (Shelly2) for user configuration
2019-02-04 14:57:20 +01:00
Gabor Simon e23d4201c1
Merge branch 'development' into sm16716 2019-02-04 16:48:49 +04:00
Theo Arends d061d5abb8 Add user configuration
Add user configuration of HLW8012 and HJL-01/BL0937 Energy Monitoring
2019-02-04 12:53:10 +01:00
Theo Arends 6ee3d1abc6 Fix IR local echo
Fix IR local echo
2019-02-03 18:45:20 +01:00
Theo Arends 54aaaf50c9 6.4.1.14 Add diag info to status 3
6.4.1.14 20190203
 * Add SetOption32 until SetOption49 diagnostic information to Status 3 report as replacement for second property value in SetOption property name
 * Add Resolution property to Status 3 report providing previous SetOption second value property
2019-02-03 12:38:41 +01:00
Gabor Simon 654826f78d
Merge branch 'development' into sm16716 2019-02-03 10:54:23 +04:00
Theo Arends ee5aed07d8
Merge pull request #5086 from netpok/device-waga
Device waga
2019-02-02 16:11:47 +01:00
Theo Arends 0c747a7499 Split module and GPIO ajax list
Split module and GPIO ajax list
2019-02-02 15:16:35 +01:00
Colin Kuebler 35060dfa45 Measured impact of USE_SM16716 on binary filesize 2019-02-01 20:12:13 -05:00
Colin Kuebler d7b8a6453d Added preprocessor constant for LT_SM16716 for improved code readability
Note that this differs from other LT_* in that it's not an enum
Ensure the SM16716 codepath is only taken when the top half of light_type is LT_SM16716
2019-02-01 19:41:12 -05:00
Colin Kuebler 6d19a9c998 Generalize the SYF05 a tiny bit so it can be easily adapted to similar bulbs 2019-02-01 19:28:16 -05:00
netpok 4dc1d2f260 Fix led polarity 2019-02-02 01:10:35 +01:00
Colin Kuebler 817d0af598 No need (and pointless) to call SM16716_Init until color updates, iff using sel pin 2019-02-01 17:37:37 -05:00
Colin Kuebler 99b027852b Fixed first color command failing; need to wait for chip to power up 2019-02-01 17:33:21 -05:00
andrethomas 7e56dc538d MHZ19: Allow enable and disable of ABC 2019-02-01 18:46:37 +02:00
netpok b927237aad Fix LED numbering 2019-02-01 15:01:45 +01:00
netpok b2109c3eab Merge branch 'development' into device-waga 2019-02-01 14:56:28 +01:00
netpok 1bb22c06a6 Update SP10 descriptions 2019-02-01 14:55:33 +01:00
netpok edb0cf8f69 Add WAGA life CHCZ02MB device 2019-02-01 14:54:35 +01:00
Theo Arends de41a88bec Fix stop flash rotate functionality
Fix stop flash rotate functionality
2019-02-01 14:05:55 +01:00
Colin Kuebler 25856c323a Track sm16716 select pin state so we don't waste cycles continuously enabling/disabling color
Added some comments; disabled sm16716 debug messages by default
Removed delay after setting select pin; didn't seem to help anyway
2019-02-01 00:59:53 -05:00
Gabor Simon 737cd7a2d0 Merge branch 'sm16716' of https://github.com/gsimon75/Sonoff-Tasmota into sm16716 2019-02-01 04:38:15 +00:00
Gabor Simon ef40aff62a Added SM16716_SEL pin to SYF05 template, enabled SM16716 support 2019-02-01 04:37:22 +00:00
Gabor Simon bbce19a74e
Merge branch 'development' into sm16716 2019-02-01 08:27:35 +04:00
Kevin Baluha 8be3da63e1 add functionality to use multiple ads1115's on one i2cbus 2019-01-31 20:13:23 -07:00
Colin Kuebler 04f1ed1659 Implemented sm16716 select
If SM16716_SEL is specified, it will toggle it on/off depending on whether or not there is color data
2019-01-31 17:17:01 -05:00
Theo Arends 79e001caae
Merge pull request #5071 from netpok/device-sp10
Add Tuya SP10
2019-01-31 21:14:17 +01:00
andrethomas 12361df705 PN532: Fix regression 2019-01-31 22:03:47 +02:00
Colin Kuebler 1c76991c7f Added sm16716 select to the pin definitions 2019-01-31 13:28:38 -05:00
Colin Kuebler f60dd3c06a Moved pin mode selection for sm16716 out of init function
Made void
Call SM16716_Init before setting the color
2019-01-30 18:32:37 -05:00
Colin Kuebler 4b6ddfb76f Moved PWM control to its own block while using SM16716 to skip RGB values 2019-01-30 18:15:25 -05:00
Colin Kuebler adcfeeaed5 Fixed bug in web config page caused by merge from dev 2019-01-30 17:57:47 -05:00
Colin Kuebler ec984ab841 Fixed compiler errors
Missing #endif oops
Vestigial function call
2019-01-30 17:32:17 -05:00
Colin Kuebler fa7440fb9a Allow PWM while SM16716 is enabled, for mixed control devices 2019-01-30 17:28:25 -05:00
Colin Kuebler 3a43050d93 Integrated Gabor's SM16716 code into the light driver code
Removed redundant processing and variables
Added new light type to distinguish SM16716 devices
2019-01-30 17:19:40 -05:00
netpok ed41370d24 Add Tuya SP10 2019-01-30 19:44:48 +01:00
Theo Arends 9825d6ffb6 Add resiliency to saved Settings
Add resiliency to saved Settings (#5065)
2019-01-30 16:27:17 +01:00
Theo Arends 0007df121a Update settings.ino
Fix for new installs
2019-01-30 15:14:24 +01:00
Theo Arends 2c164a8b4b 6.4.1.13 Add boot loop offset
6.4.1.13 20190130
 * Add command SetOption36 to control boot loop default restoration (#4645, #5063)
2019-01-30 14:34:31 +01:00
Theo Arends cb13e8b05e Update xdrv_12_home_assistant.ino
Minor gain in string length
2019-01-30 14:33:20 +01:00
Gabor Simon e2d8040338 Type changed from boolean to bool applied to xdrv_20_sm16716.ino as well
The upstream commit that changed the types in the interface:
	commit 304ac6fe44
	Author: Theo Arends <11044339+arendst@users.noreply.github.com>
	Date:   Mon Jan 28 14:08:33 2019 +0100
	    6.4.1.12 code changes (byte/boolean)
2019-01-30 07:05:38 +00:00
Gabor Simon e0033fbaa0
Merge branch 'development' into sm16716 2019-01-29 17:38:27 +04:00
Theo Arends ea59ed6abd
Merge pull request #5052 from Jason2866/development
Fix Alexa bug in Core v.2.4.2
2019-01-29 13:34:01 +01:00
Gabor Simon a770f54e90 misplaced #endif fixed 2019-01-29 06:58:52 +00:00
Theo Arends 4509019d64 Fix valid button range check
Fix valid button range check
2019-01-28 18:04:33 +01:00
Jason2866 82b69885fe
Fix Alexa bug in Core 2.4.2.
Use patched Parsing.cpp only for Core 2.4.2 to fix Alexa bug
2019-01-28 17:53:25 +01:00
Theo Arends 15c5e15f7c Update support_wifi.ino
Add TLS remarks (#4952)
2019-01-28 15:13:14 +01:00
Theo Arends 304ac6fe44 6.4.1.12 code changes (byte/boolean)
6.4.1.12 20190128
 * Change code use of boolean to bool and byte to uint8_t
 * Change code uint8_t flags to bool flags
2019-01-28 14:08:33 +01:00
Theo Arends 6c8e15dadd Fix inverted buttons
Fix inverted buttons
2019-01-28 10:18:44 +01:00
Theo Arends 2fc2535c7b Remove functionality not present
Remove functionality not present (#5043)
2019-01-27 15:13:57 +01:00
Theo Arends dc75b473cf Add support for inverted buttons
* Add core version conditional compile options to provided PWM files (#4917)
 * Add support for inverted buttons and inverted buttons without pullup (#4914)
2019-01-27 14:54:28 +01:00
Theo Arends d1c6cfb6f9 Disable patched core PWM
Disable patched core PWM starting with core 2.5.0-beta3
2019-01-27 12:42:05 +01:00
Theo Arends f8350d65c4
Merge pull request #5031 from andrethomas/patch-1
Disable sleep 0 for scheme 0
2019-01-27 11:25:41 +01:00
Theo Arends 269258bde5
Update xdrv_04_light.ino 2019-01-27 11:25:28 +01:00
Theo Arends 2827de40a3 Set initial legacy interlock state
Set initial legacy interlock state
2019-01-27 11:02:12 +01:00
Andre Thomas 13b8401089
Update xsns_40_pn532_i2c.ino 2019-01-27 01:11:55 +02:00
andrethomas 5dfc8a951b PN532:Allow RAW DATA usage by define 2019-01-27 00:53:52 +02:00
Andre Thomas f23d18723e
Disable sleep 0 for scheme 0
Disable sleep 0 for scheme 0 as there is no animation required
2019-01-26 16:43:36 +02:00
Theo Arends 1fb7eb646f Add 50 mSec delay
Add 50 mSec delay between interlocked relay switch
2019-01-25 18:30:10 +01:00
Theo Arends 505c4794d1 6.4.1.11 Rewrite interlock
6.4.1.11 20190124
 * Remove command SetOption14 as it has been superseded by command Interlock
 * Remove command SetOption63 as it has been superseded by command Interlock
 * Add command Interlock 0 / 1 / 1,2 3,4 .. to control interlock ON/OFF and add up to 8 relays in 1 to 4 interlock groups (#5014)
2019-01-25 17:46:27 +01:00
Theo Arends eab6be8bcb Fix WS2812 led command
Fix WS2812 led command to address last pixel (#5015)
2019-01-24 11:55:31 +01:00
Theo Arends ced019eaa5 Add support for MAX44009
Add support for MAX44009 Ambient Light sensor (#4907)
2019-01-24 11:41:52 +01:00
Theo Arends 669f6c86c9
Merge pull request #4907 from llagendijk/development
Add support for MAX44009 ambient light sensor
2019-01-24 11:21:40 +01:00
Theo Arends caabada214
Update my_user_config.h 2019-01-24 11:21:16 +01:00
Louis Lagendijk 4cdc3d5404 Implemented changes suggested by Theo (Thanks!):
- use functions from support.ino (had to split reading in Max4409Detect
  in 2 8 bits reads as the MAX44009 only supports 16 bits reads for
  luminance registers)
- Used the << instead of pow() to save a lot of xompiled code
- Improved float -> string conversion along the suggested lines
- Code size is now +/- 750 bytes (without other I2C sensors compiled in
  I think
2019-01-23 22:20:29 +01:00
Louis Lagendijk ee3ab87d07 Made requested changes:
- Added checks for improved MAX44009 detection
- removed HTTP_SNS_ILLUMINANCE_S (show only integer in web-interface)
- removed missed readings and repeated detection
2019-01-23 16:06:06 +01:00
Theo Arends 1fe1839690 Force Hass fulltopic change
Force Hass fulltopic change (#4988)
2019-01-22 16:07:16 +01:00
Theo Arends bda3126d9c
Merge pull request #5001 from araczkowski/development
fixed some typos in Polish translation
2019-01-22 13:45:11 +01:00
araczkowski e13fd7983e fix 2019-01-22 12:56:35 +01:00
araczkowski 2f8b083bda fixed some typos 2019-01-22 12:53:02 +01:00
Theo Arends 7745e1e779 Fix Hass Software Watchdog
Fix Hass Software Watchdog exception during discovery (#4988)
2019-01-22 12:46:55 +01:00
Theo Arends dcabb9c6dc 6.4.1.10 Fix Hass discovery of MHZ19(B)
6.4.1.10 20190121
 * Fix Hass discovery of MHZ19(B) sensors (#4992)
2019-01-21 22:18:19 +01:00
Gabor Simon f833dd07ad Enabled 'warm white' pwm in the module config, code comments added, coding style improved 2019-01-21 06:44:07 +00:00