mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
3,186 Commits 3 Branches 119 Tags 270 MiB
1400a15076
Commit Graph

2192 Commits

Author SHA1 Message Date
Theo Arends
4ba3331bc7
Merge pull request #5417 from emontnemery/fix_bad_snprintf 
Fix bad snprintf in format()
 2019-03-08 16:45:07 +01:00
Erik
b72df698a2 Add more information to status sensor 2019-03-08 16:38:36 +01:00
Erik
168b1332e0 Fix bad snprintf in format() 2019-03-08 16:28:46 +01:00
Theo Arends
06a9fbd792 Changed logging message handling 
Changed logging message handling
 2019-03-08 15:15:42 +01:00
Theo Arends
fb9b1c83f3 Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development 2019-03-07 18:59:44 +01:00
Theo Arends
89f55563f7 Add secure test 
Add secure test
 2019-03-07 18:59:24 +01:00
Theo Arends
578d12c4fb
Merge pull request #5414 from emontnemery/fix_hass_button 
Fix broken hass button announcement
 2019-03-07 18:58:11 +01:00
Erik
32c69ff0c2 Fix broken hass button announcement 2019-03-07 18:40:50 +01:00
Theo Arends
ae50f663fe Merge branch 'dev-chunks' into development 2019-03-07 18:34:51 +01:00
Theo Arends
58fe50d81a Update webserver layout 
Update webserver layout
 2019-03-07 18:18:30 +01:00
Theo Arends
cfcf125b7e Default disable new rule features 
Default disable rule USE_EXPRESSION and SUPPORT_MQTT_EVENT (#5369)
 2019-03-07 17:47:14 +01:00
Theo Arends
7ab884afc9 Fix compile error 
Fix compile error
 2019-03-06 20:38:13 +01:00
Theo Arends
2ec545d739 Fix float calculations 
Fix float calculations in range from 0 to -1 (#5386)
 2019-03-06 17:59:18 +01:00
Theo Arends
b393cdc9f1 Replace menu button list 
Replace menu button list
 2019-03-04 18:32:23 +01:00
Theo Arends
d790b1cfca 6.4.1.20 Webserver uses chunks 
6.4.1.20 20190304
 * Changed webserver content handling from single String to small Chunks increasing RAM
 2019-03-04 18:16:07 +01:00
Theo Arends
3e1e565dff Update xdrv_01_webserver.ino 
Fix webpage redirect
 2019-03-04 12:36:44 +01:00
killadm
de220cefd0
zh-CN language updated 2019-03-03 00:35:44 +08:00
Theo Arends
9f42e6dced Fix DS18S20 temperature calculation 
Fix DS18S20 temperature calculation (#5375)
 2019-03-02 12:33:52 +01:00
Theo Arends
d70ed77f1a Update xdrv_01_webserver.ino 
Prep for chunks
 2019-03-01 18:25:46 +01:00
Theo Arends
9e8ed1ae79 Kudos and houskeeping 
Kudos and houskeeping
 2019-03-01 15:37:22 +01:00
Theo Arends
f0a7a1f2a1 Fix Energy TotalStartTime 
Fix Energy TotalStartTime when commands EnergyReset0 and/or EnergyReset3 used (#5373)
 2019-03-01 12:08:41 +01:00
Theo Arends
4b69a7d115 Update xdrv_04_light.ino 
Fix core 2.3.0 compile error
 2019-02-26 10:54:27 +01:00
Theo Arends
16e14558ea
Merge pull request #5349 from sensor-freak/development 
Refactor initialization of NeoPixel instance
 2019-02-26 10:30:01 +01:00
Theo Arends
5871c7ebae Add Korean language translations 
Add Korean language translations (#5344)
 2019-02-26 10:16:56 +01:00
Theo Arends
278e9fe95d
Merge pull request #5344 from NyaamZ/development 
a Korean translation
 2019-02-26 10:11:01 +01:00
Franz-Josef Kaiser
cfabceca06 Refactor initialization of NeoPixel instance to make it easier to select communication speed option 2019-02-26 09:10:41 +01:00
NyaamZ
8aba96c894
Korean translate 
Korean translate
 2019-02-26 11:00:38 +09:00
netpok
61099c4ead Fix indentation 2019-02-25 22:36:18 +01:00
netpok
01ce2a31d3 Implement RGB CT linking 2019-02-25 22:29:39 +01:00
netpok
38433e56f7 Replace compare cycle with memcmp 2019-02-25 22:24:53 +01:00
netpok
6d1cfe5a07 Force light update on color mapping change 2019-02-25 22:24:06 +01:00
netpok
d8eac1d8fc Replace if with min 
saves ~30 bytes
 2019-02-25 21:37:27 +01:00
Theo Arends
9a670be95b Fix buffer overflow 
Fix buffer overflow (#5310)
 2019-02-25 21:23:18 +01:00
Theo Arends
9f00978a79 Fix Domoticz Color regression 
Fix Domoticz Color regression (#5310 )
 2019-02-25 19:47:45 +01:00
Daddelgreis
61e9e8a361
GPIO_LED1 
change
GPIO_LED1 to GPIO_LED1_INV 

right attitude
 2019-02-25 17:56:53 +01:00
Theo Arends
c0f20d31ff 6.4.1.19 Add command SetOption37 
6.4.1.19 20190222
 * Add command SetOption37 for RGBCW color mapping (#5326)
 2019-02-25 11:14:33 +01:00
Theo Arends
813d2fd3f1
Merge pull request #5326 from gsimon75/issue_5310_rgb_order_setoption 
Added SetOption37 for RGB remapping
 2019-02-25 10:55:43 +01:00
Theo Arends
6c1709a674
Merge pull request #5332 from znanev/patch-3 
Update Bulgarian translation
 2019-02-25 10:52:29 +01:00
Gabor Simon
48f6b09987 Initialisation and updating of color mapping added 2019-02-24 23:48:03 +00:00
znanev
0ed7920b0f
Note updated version of language file 2019-02-24 21:42:34 +00:00
netpok
430334e604 Replace vector with array 
it saves 24 bytes of code
 2019-02-24 21:56:44 +01:00
netpok
945e7000dd Implement full color remapper 2019-02-24 21:03:33 +01:00
localhost61
886fe48115 Update fr-FR to 6.4.1.18 2019-02-24 20:44:26 +01:00
znanev
6544d002ad
Update Bulgarian translation 2019-02-24 19:38:52 +00:00
Jason2866
d464344f1f
Update de-DE.h 2019-02-24 17:37:17 +01:00
Theo Arends
bc5db6a079 Remove topic from local sensors 
Remove topic from local sensors in DisplayMode 2/3 (#5212)
 2019-02-24 17:29:28 +01:00
Theo Arends
e16178d912
Merge pull request #5320 from laurentdong/development 
Support subscribe/unsubscribe MQTT topics and trigger specified event with the subscribed MQTT topic.
 2019-02-24 17:02:45 +01:00
Laurent
49053f163f Update language files 
D_UNSUBSCRIBE_FROM
 2019-02-24 10:15:39 -05:00
Theo Arends
1d0348e636 Update xdrv_01_webserver.ino 
Optimizations
 2019-02-24 15:32:54 +01:00
Theo Arends
9b6e5bd122 Webserver Ajax optimizations 
Webserver Ajax optimizations
 2019-02-24 15:05:18 +01:00
Gabor Simon
0a4a21a038
Delete .gitignore 
created by mistake
 2019-02-24 16:43:42 +04:00
Gabor Simon
0bb05bb604
Delete .travis.yml 
meanwhile removed at adc781b8fc
 2019-02-24 16:41:54 +04:00
Gabor Simon
4492a14574 Added SetOption37 for RGB remapping 2019-02-24 12:07:15 +00:00
Gabor Simon
38b81302e3 sm16716: added config option for custom rgb order 2019-02-24 09:26:10 +04:00
Laurent
dd27ade7ef Rules: Trigger Event with MQTT Subscriptions 
Support subscribe/unsubscribe MQTT topics and trigger specified event with the subscribed MQTT topic.
You can subscribe a MQTT topic and assign an event name. Once we received subscribed MQTT message, an event will be automatically triggered. So you can set up a rule with "ON EVENT#<event_name> DO ..." to do whatever you want based on this MQTT message. The payload is passed as a parameter once the event been triggered. If the payload is in JSON format, you are able to get the value of specified key as parameter.
For example, if you have a Tasmota based thermostat and multiple temperature sensors in different place, usually you have to set up a centre home automation system like Domoticz to control the thermostat. Right now, with this new feature, you can write a rule to do this.
Two new commands in Rules:
1. Subscribe
Subscribe a MQTT topic (with or without key) and assign an event name to it.
Command format:
	Subscribe [<event_name>, <topic> [, <key>]]
		This command will subscribe a <topic> and give it an event name <event_name>.
		The optional parameter <key> is for parse the specified key/value from MQTT message
			payload with JSON format.
		In order to parse value from two level JSON data, you can use one dot (".") to split the key into two section.
		Subscribe command without any parameter will list all topics currently subscribed.
2. Unsubscribe
Unsubscribe specified MQTT event.
Command format:
	Unsubscribe [<event_name>]
		Unsubscribe a topic subscribed by specify the event name.
		If no event specified, Unsubscribe all topics subscribed.
Examples:
1.
	Subscribe BkLight, Tasmota/BackyardLight/stat/POWER
		And define a rule like:
	Rule1 on event#BkLight=ON do ruletimer4 60 endon
2.
	Subscribe DnTemp, Tasmota/RoomSensor1/stat/SENSOR, DS18B20.Temperature
		Define a rule to deal with the MQTT message like {"Time":"2017-02-16T10:13:52", "DS18B20":{"Temperature":20.6}}
	Rule1 ON EVENT#DnTemp>=21 DO ... ENDON
 2019-02-23 22:33:09 -05:00
Laurent
3298048c60 Update support_rtc.ino 2019-02-23 17:41:06 -05:00
Theo Arends
68c60c321e Handle too many command data 
Handle too many command data
 2019-02-23 19:19:31 +01:00
Theo Arends
93d07c1acc Webserver memory optimizations 
Webserver memory optimizations
 2019-02-23 18:38:36 +01:00
Theo Arends
19bdf7e803 Free flash space (WSSend) 
Free flash space (WSSend)
 2019-02-23 15:29:42 +01:00
Theo Arends
1cb956b541 Free flash space 
Free flash space
 2019-02-23 13:17:02 +01:00
Theo Arends
5d8ae266d0 Fix RemoveSpace and tune Websend 
Fix RemoveSpace and tune Websend
 2019-02-23 12:48:39 +01:00
Theo Arends
06bec0d95e Update _changelog.ino 
Back from the future
 2019-02-23 11:18:57 +01:00
Laurent
2cc15a8c34 Merge remote-tracking branch 'upstream/development' into development 2019-02-22 22:53:01 -05:00
Jörg R. Weimar
f0dde50f39 Merge remote-tracking branch 'upstream/development' into development 
Merge all recent changes into my branch
 2019-02-22 15:29:36 +01:00
Theo Arends
e315be0619 Fix command WebSend 
Fix command WebSend when using a port number as regression from 6.4.1.17 (#5304)
 2019-02-22 15:19:59 +01:00
Theo Arends
d219d1c9b5 Update support.ino 
Houskeeping
 2019-02-22 12:11:15 +01:00
Theo Arends
49f0b514eb Fix some exceptions and watchdogs 
* Fix some exceptions and watchdogs due to lack of stack space - part 2
 * Add command SetOption62 0/1 to disable retain on Button or Swith hold messages (#5299)
 * Add option WifiConfig 7 to allow reset of device in AP mode without admin password (#5297)
 2019-02-22 12:04:05 +01:00
Theo Arends
8df6bb76d1
Merge pull request #5297 from netpok/wificonfig-7 
WifiConfig 7, a reset only WifiManager for smart bulbs
 2019-02-22 11:44:04 +01:00
netpok
6cbfb0308a Check no hold retain flag on hold action sending 2019-02-21 21:30:30 +01:00
netpok
b3adab4097 Add flag for no hold retain 2019-02-21 21:27:52 +01:00
netpok
e2bcef16bf Merge remote-tracking branch 'upstream/development' into wificonfig-7 2019-02-21 19:45:34 +01:00
netpok
e9396d0ed4 Add missing localization strings 2019-02-21 19:45:21 +01:00
netpok
731154cc9b Handle authentication on reset/restart 2019-02-21 19:45:03 +01:00
netpok
4993d16ecb Implement WifiConfig 7 2019-02-21 17:49:11 +01:00
netpok
e035a3253a Add password validation to WebUI 2019-02-21 15:58:37 +01:00
netpok
3c58f5b7b9 Add password validation to password command 2019-02-21 15:57:45 +01:00
Theo Arends
95da493325 Update xdrv_01_webserver.ino 
Fix compile error
 2019-02-21 14:56:39 +01:00
Theo Arends
05b0280019 6.4.1.18 - Fix some exceptions and watchdogs 
6.4.1.18 20191221
 * Fix some exceptions and watchdogs due to lack of stack space - part 1 (#5215)
 2019-02-21 14:31:31 +01:00
Theo Arends
cfd3f3f4f5 Fix WebSend compile warning 
Fix WebSend compile warning
 2019-02-21 09:48:58 +01:00
Laurent
4e66dce049 Merge remote-tracking branch 'upstream/development' into development 2019-02-19 20:15:43 -05:00
Theo Arends
280dd25a8b Optimize RAM for expression 
Optimize RAM for expression and add two more constant variables (#5275)
 2019-02-19 14:49:15 +01:00
Theo Arends
06c97c4e19 Fix command WebSend 
Fix command WebSend intermittent results (#5273)
 2019-02-19 12:51:38 +01:00
Theo Arends
32c1e2d13c Tuning uptime and add utctime 
Tuning uptime and add utctime
 2019-02-19 10:48:19 +01:00
Laurent
660d0106c2 Revert "Support HttpGet command" 
This reverts commit c527d4dc99.
 2019-02-18 16:18:01 -05:00
Laurent
6f2f0b6fea Add two constant varibles in rules expression 
Add two variables:
- UtcTime
The number of seconds that have elapsed since January 1, 1970 (midnight UTC/GMT)
- LocalTime
Seconds passed after Jan 1, 1970 midnight base on current timezone and daylight saving setting.
 2019-02-18 16:17:32 -05:00
Laurent
2bc84a9aad Optimize RAM usage for Expression 2019-02-18 16:12:14 -05:00
Laurent
c527d4dc99 Support HttpGet command 
HttpGet command send a HTTP Get request to specified URL and return the response from website or error message if failed.
Note: This command support URL encoding, so you do not have to do encode by yourself. For example replacing all " " with %20 is no necessary.
Format:
httpget <url>
With HttpGet command you can do a lot of things.
For example:
- Retrieve your physical location:
httpget http://ipinfo.io/geo
Result is a JSON object
{
  "ip": "8.8.8.8",
  "city": "Mountain View",
  "region": "California",
  "country": "US",
  "loc": "37.3860,-122.0840",
  "postal": "94035",
  "phone": "650"
}
- Control another Sonoff switch directly:
httpget http://192.168.1.130/cm?cmnd=power off
 2019-02-18 15:41:40 -05:00
andrethomas
1da8f94a05 Introduce Reset 6 2019-02-18 21:52:22 +02:00
Theo Arends
3c3b5bb8ca Add property Downtime 
Add property Downtime to state and status 11 message representing the duration of wifi connection loss
 2019-02-18 18:02:22 +01:00
Theo Arends
4884a94b6d Add LinkCount and MqttCount 
* Add property LinkCount to state and status 11 message representing number of Wifi Link re-connections
 * Add property MqttCount to status 6 message representing number of Mqtt re-connections
 2019-02-18 17:05:25 +01:00
Theo Arends
0658ae1959 Update sonoff_template.h 
Fix compile error
 2019-02-18 16:19:46 +01:00
Theo Arends
e898dc03e7 Add Wifi Link Connection Count 
Add Wifi Link Connection (Retry) count to state message. Always starts with 1 being the initial connection.
 2019-02-18 15:41:41 +01:00
Theo Arends
a6c7e3b5f4 Update xdrv_01_webserver.ino 
Force restart on any template change to fix page refresh hang (#5222)
 2019-02-18 15:13:37 +01:00
Theo Arends
483eb4dd44 Change Flags to Options 
Change Flags to Options and enforce Activate for already active template (#5256)
 2019-02-18 13:10:10 +01:00
Theo Arends
8d2b9e4734 Update xdrv_01_webserver.ino 
Tune webserver
 2019-02-18 11:35:49 +01:00
Theo Arends
c37a4a4398 Update xsns_01_counter.ino 
Fix non floating point use function (#5265)
 2019-02-18 11:06:16 +01:00
znanev
bd582980e9
Abbreviate translation for D_SENSOR_USER 2019-02-18 09:52:29 +00:00
znanev
8c73cddfed
Update Bulgarian translations 2019-02-18 09:29:23 +00:00
Theo Arends
590c883bbe
Merge pull request #5262 from gfrancesco/development 
Configuration parameter to send MQTT telemetry on status change
 2019-02-18 10:15:29 +01:00
Andre Thomas
5b71095e02
Make sleep for light scheme0 optional 
Make sleep for light scheme0 optional with compile directive (enabled by default)
 2019-02-18 08:21:57 +02:00