jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 11:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
# Conflicts:
#	README.md
#	sonoff/_releasenotes.ino
#	sonoff/sonoff.ino
#	sonoff/xdrv_snfled.ino
#	sonoff/xdrv_ws2812.ino
This commit is contained in:
arendst 2017-09-09 19:03:18 +02:00
commit 5bd5e28652
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fxttipe0.oib.txt Normal file
View File

@ -0,0 +1,33 @@
Merge branch 'development'
# Conflicts:
# README.md
# sonoff/_releasenotes.ino
# sonoff/sonoff.ino
# sonoff/xdrv_snfled.ino
# sonoff/xdrv_ws2812.ino
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
# .git/MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: README.md
# modified: sonoff/_releasenotes.ino
# modified: sonoff/sonoff.ino
# modified: sonoff/webserver.ino
# modified: sonoff/xdrv_snfled.ino
# modified: sonoff/xdrv_wemohue.ino
# modified: sonoff/xdrv_ws2812.ino
#

2
sonoff/webserver.ino
View File

@ -102,7 +102,7 @@ const char HTTP_SCRIPT_CONSOL[] PROGMEM =
"t=document.getElementById('t1');"
"if(p==1){"
"c=document.getElementById('c1');"
"o='&c1='+encodeURI(c.value);"
"o='&c1='+encodeURIComponent(c.value);"
"c.value='';"
"t.scrollTop=sn;"
"}"

8
sonoff/xdrv_wemohue.ino
View File

@ -99,7 +99,7 @@ const char HUE_RESPONSE[] PROGMEM =
"CACHE-CONTROL: max-age=100\r\n"
"EXT:\r\n"
"LOCATION: http://{r1}:80/description.xml\r\n"
"SERVER: FreeRTOS/7.4.2 UPnP/1.0 IpBridge/1.16.0\r\n"
"SERVER: Linux/3.14.0 UPnP/1.0 IpBridge/1.17.0\r\n"
"hue-bridgeid: {r2}\r\n";
const char HUE_ST1[] PROGMEM =
"ST: upnp:rootdevice\r\n"
@ -110,7 +110,7 @@ const char HUE_ST2[] PROGMEM =
"USN: uuid:{r3}\r\n"
"\r\n";
const char HUE_ST3[] PROGMEM =
"ST: urn:schemas-upnp-org:device:Basic:1\r\n"
"ST: urn:schemas-upnp-org:device:basic:1\r\n"
"USN: uuid:{r3}\r\n"
"\r\n";
@ -400,8 +400,8 @@ const char HUE_CONFIG_RESPONSE_JSON[] PROGMEM =
"\"last use date\":\"{dt}\","
"\"create date\":\"{dt}\","
"\"name\":\"Remote\"}},"
"\"swversion\":\"01036659\","
"\"apiversion\":\"1.16.0\","
"\"swversion\":\"01039019\","
"\"apiversion\":\"1.17.0\","
"\"swupdate\":{\"updatestate\":0,\"url\":\"\",\"text\":\"\",\"notify\": false},"
"\"linkbutton\":false,"
"\"portalservices\":false"