mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-10 04:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed remaining table items, tested all types

Browse Source
This commit is contained in:
softplus
2022-09-04 20:35:12 +02:00
parent a738605a11
commit 18b78d8268
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/httpserver/http_fns.c
View File

@ -214,8 +214,9 @@ int http_fn_index(http_request_t *request) {
int iValue;
iValue = CHANNEL_Get(i);
poststr(request, "<tr><td>");
hprintf128(request,"Temperature Channel %i value %i C<br>",i, iValue);
poststr(request, "</td></tr>");
} else if(channelType == ChType_Temperature_div10) {
int iValue;
@ -224,14 +225,18 @@ int http_fn_index(http_request_t *request) {
iValue = CHANNEL_Get(i);
fValue = iValue * 0.1f;
poststr(request, "<tr><td>");
hprintf128(request,"Temperature Channel %i value %f C<br>",i, fValue);
poststr(request, "</td></tr>");
} else if(channelType == ChType_Humidity) {
int iValue;
iValue = CHANNEL_Get(i);
poststr(request, "<tr><td>");
hprintf128(request,"Humidity Channel %i value %i Percent<br>",i, iValue);
poststr(request, "</td></tr>");
} else if(channelType == ChType_Humidity_div10) {
int iValue;
@ -240,12 +245,16 @@ int http_fn_index(http_request_t *request) {
iValue = CHANNEL_Get(i);
fValue = iValue * 0.1f;
poststr(request, "<tr><td>");
hprintf128(request,"Humidity Channel %i value %f Percent<br>",i, fValue);
poststr(request, "</td></tr>");
} else if(channelType == ChType_LowMidHigh) {
const char *types[]={"Low","Mid","High"};
int iValue;
iValue = CHANNEL_Get(i);
poststr(request, "<tr><td>");
hprintf128(request,"<p>Select speed:</p><form action=\"index\">");
hprintf128(request,"<input type=\"hidden\" name=\"setIndex\" value=\"%i\">",i);
for(j = 0; j < 3; j++) {
@ -257,7 +266,8 @@ int http_fn_index(http_request_t *request) {
hprintf128(request,"<input type=\"radio\" name=\"set\" value=\"%i\" onchange=\"this.form.submit()\" %s>%s",j,check,types[j]);
}
hprintf128(request,"</form>");
hprintf128(request,"<br>");
poststr(request, "</td></tr>");
} else if(channelType == ChType_OffLowMidHigh || channelType == ChType_OffLowestLowMidHighHighest || channelType == ChType_LowestLowMidHighHighest) {
const char **types;
const char *types4[] = {"Off","Low","Mid","High"};
@ -279,6 +289,7 @@ int http_fn_index(http_request_t *request) {
iValue = CHANNEL_Get(i);
poststr(request, "<tr><td>");
hprintf128(request,"<p>Select speed:</p><form action=\"index\">");
hprintf128(request,"<input type=\"hidden\" name=\"setIndex\" value=\"%i\">",i);
for(j = 0; j < numTypes; j++) {
@ -290,23 +301,27 @@ int http_fn_index(http_request_t *request) {
hprintf128(request,"<input type=\"radio\" name=\"set\" value=\"%i\" onchange=\"this.form.submit()\" %s>%s",j,check,types[j]);
}
hprintf128(request,"</form>");
hprintf128(request,"<br>");
poststr(request, "</td></tr>");
} else if(channelType == ChType_TextField) {
int iValue;
iValue = CHANNEL_Get(i);
poststr(request, "<tr><td>");
hprintf128(request,"<p>Change channel %i value:</p><form action=\"index\">",i);
hprintf128(request,"<input type=\"hidden\" name=\"setIndex\" value=\"%i\">",i);
hprintf128(request,"<input type=\"number\" name=\"set\" value=\"%i\">",iValue);
hprintf128(request,"<input type=\"number\" name=\"set\" value=\"%i\" onblur=\"this.form.submit()\">",iValue);
hprintf128(request,"<input type=\"submit\" value=\"Set!\"/></form>");
hprintf128(request,"</form>");
hprintf128(request,"<br>");
poststr(request, "</td></tr>");
} else if(channelType == ChType_ReadOnly) {
int iValue;
iValue = CHANNEL_Get(i);
poststr(request, "<tr><td>");
hprintf128(request,"Channel %i = %i",i,iValue);
hprintf128(request,"<br>");
poststr(request, "</td></tr>");
}
else if (h_isChannelRelay(i) || channelType == ChType_Toggle) {
@ -341,6 +356,7 @@ int http_fn_index(http_request_t *request) {
poststr(request, "</td></tr>");
}
}
if(bRawPWMs == 0 || forceShowRGBCW) {
int c_pwms;
int lm;
@ -394,7 +410,7 @@ int http_fn_index(http_request_t *request) {
poststr(request, "<tr><td>");
hprintf128(request,"<h5> LED RGB Color %s </h5>",activeStr);
hprintf128(request,"<form action=\"index\" id=\"form%i\">",SPECIAL_CHANNEL_BASECOLOR);
hprintf128(request,"<input type=\"color\" name=\"%s\" id=\"color%i\" value=\"#%s\" onmouseup=\"this.form.submit()\">",inputName,SPECIAL_CHANNEL_BASECOLOR,colorValue);
hprintf128(request,"<input type=\"color\" name=\"%s\" id=\"color%i\" value=\"#%s\" onchange=\"this.form.submit()\">",inputName,SPECIAL_CHANNEL_BASECOLOR,colorValue);
hprintf128(request,"<input type=\"hidden\" name=\"%sIndex\" value=\"%i\">",inputName,SPECIAL_CHANNEL_BASECOLOR);
hprintf128(request,"<input type=\"submit\" style=\"display:none;\" value=\"Toggle Light\"/></form>");
poststr(request, "</td></tr>");
@ -480,8 +496,11 @@ int http_fn_index(http_request_t *request) {
"req=new XMLHttpRequest();"
"req.onreadystatechange=()=>{"
"if(req.readyState==4 && req.status==200){"
"var s=req.responseText;"
"eb('state').innerHTML=s;"
"if (!(document.activeElement.tagName=='INPUT' && "
"(document.activeElement.type=='number' || document.activeElement.type=='color'))) {"
"var s=req.responseText;"
"eb('state').innerHTML=s;"
"}"
"clearTimeout(firstTime);"
"clearTimeout(lastTime);"
"lastTime=setTimeout(showState, 3e3);"

1
src/httpserver/new_http.c
View File

@ -62,6 +62,7 @@ const char htmlHeadStyle[] =
".hele{width:210px;display:inline-block;margin-left:2px;}"
"div#state{padding:0} div#changed{padding:0}"
"div#main{text-align:left; display:inline-block; color:#eaeaea;min-width:340px;max-width:800px;}"
"table{table-layout:fixed}"
"</style>";
const char htmlBodyStart[] =
"<body>"