Update xdrv_01_webserver.ino

Tune webserver
This commit is contained in:
Theo Arends 2019-02-18 11:35:49 +01:00
parent c37a4a4398
commit 8d2b9e4734

View File

@ -155,13 +155,21 @@ const char HTTP_SCRIPT_MODULE_TEMPLATE[] PROGMEM =
"var o=os.replace(/}1/g,\"<option value=\").replace(/}2/g,\"</option>\");" "var o=os.replace(/}1/g,\"<option value=\").replace(/}2/g,\"</option>\");"
"eb('g'+g).innerHTML=o;" "eb('g'+g).innerHTML=o;"
"eb('g'+g).value=s;" "eb('g'+g).value=s;"
"}"
"function ld(u,f){"
"var x=new XMLHttpRequest();"
"x.onreadystatechange=function(){"
"if(this.readyState==4&&this.status==200){"
"f(this);"
"}"
"};"
"x.open('GET',u,true);"
"x.send();"
"}"; "}";
const char HTTP_SCRIPT_TEMPLATE[] PROGMEM = const char HTTP_SCRIPT_TEMPLATE[] PROGMEM =
"function st(t){" "var c;" // Need a global for BASE
"b=new XMLHttpRequest();" "function x1(b){"
"b.onreadystatechange=function(){"
"if(b.readyState==4&&b.status==200){"
"var i,j,g,k,m,o=b.responseText;" "var i,j,g,k,m,o=b.responseText;"
"k=o.indexOf(\"}1\");" // Template name until }1 "k=o.indexOf(\"}1\");" // Template name until }1
"if(eb('s1').value==''){" "if(eb('s1').value==''){"
@ -171,58 +179,45 @@ const char HTTP_SCRIPT_TEMPLATE[] PROGMEM =
"os=o.substring(k,m);" // Complete GPIO sensor list "os=o.substring(k,m);" // Complete GPIO sensor list
"g=o.substring(m+2).split(',');" // +2 is length "}3" "g=o.substring(m+2).split(',');" // +2 is length "}3"
"j=0;" "j=0;"
"for(i=0;i<13;i++){" "for(i=0;i<13;i++){" // Supports 13 GPIOs
"if(6==i){j=9;}" "if(6==i){j=9;}"
"if(8==i){j=12;}" "if(8==i){j=12;}"
"sk(g[i],j);" // Set GPIO "sk(g[i],j);" // Set GPIO
"j++;" "j++;"
"}" "}"
"for(i=0;i<1;i++){" "for(i=0;i<1;i++){" // Supports 1 FLAG
"p=(g[13]>>i)&1;" "p=(g[13]>>i)&1;"
"eb('c'+i).checked=p;" // Set FLAG checkboxes "eb('c'+i).checked=p;" // Set FLAG checkboxes
"}" "}"
"if(255==t){" "if(" STR(USER_MODULE) "==c){"
"eb('g99').value=g[14];" // Set BASE for initial select "eb('g99').value=g[14];" // Set BASE for initial select
"}" "}"
"}" "}"
"};" "function st(t){"
"b.open('GET','tp?t='+t,true);" // ?t related to WebGetArg("t", stemp, sizeof(stemp)); "c=t;" // Needed for initial BASE select
"b.send();" "var a='tp?t='+t;"
"ld(a,x1);" // ?t related to WebGetArg("t", stemp, sizeof(stemp));
"}" "}"
"function sl(){"
"a=new XMLHttpRequest();" "function x2(a){"
"a.onreadystatechange=function(){"
"if(a.readyState==4&&a.status==200){"
"os=a.responseText;" "os=a.responseText;"
"sk(17,99);" "sk(17,99);" // 17 = WEMOS
"st(255);" "st(" STR(USER_MODULE) ");"
"}" "}"
"};" "window.onload=ld('tp?m=1',x2);"; // ?m related to WebServer->hasArg("m")
"a.open('GET','tp?m=1',true);" // ?m related to WebServer->hasArg("m")
"a.send();"
"}"
"window.onload=sl;";
const char HTTP_SCRIPT_MODULE1[] PROGMEM = const char HTTP_SCRIPT_MODULE1[] PROGMEM =
"function sl(){" "function x1(a){"
"a=new XMLHttpRequest();"
"a.onreadystatechange=function(){"
"if(a.readyState==4&&a.status==200){"
"os=a.responseText;" "os=a.responseText;"
"sk(}4,99);" "sk(}4,99);"
"}" "}"
"};" "function x2(b){"
"a.open('GET','md?m=1',true);" // ?m related to WebServer->hasArg("m")
"a.send();"
"b=new XMLHttpRequest();"
"b.onreadystatechange=function(){"
"if(b.readyState==4&&b.status==200){"
"os=b.responseText;"; "os=b.responseText;";
const char HTTP_SCRIPT_MODULE2[] PROGMEM = const char HTTP_SCRIPT_MODULE2[] PROGMEM =
"}" "}"
"};" "function sl(){"
"b.open('GET','md?g=1',true);" // ?g related to WebServer->hasArg("g") "ld('md?m=1',x1);" // ?m related to WebServer->hasArg("m")
"b.send();" "ld('md?g=1',x2);" // ?m related to WebServer->hasArg("m")
"}" "}"
"window.onload=sl;"; "window.onload=sl;";
const char HTTP_SCRIPT_MODULE3[] PROGMEM = const char HTTP_SCRIPT_MODULE3[] PROGMEM =