diff --git a/.gitignore b/.gitignore index 8805fcc9a..2c36f266b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ output/** *.ncb **/*.d /custom.mk +/.vs diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c index 2ca10bbe1..30f7a7bc2 100644 --- a/src/httpserver/http_fns.c +++ b/src/httpserver/http_fns.c @@ -121,7 +121,7 @@ int http_fn_index(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,""); + //poststr(request,""); HTTP_AddHeader(request); if(http_getArg(request->url,"tgl",tmpA,sizeof(tmpA))) { j = atoi(tmpA); @@ -251,9 +251,9 @@ int http_fn_index(http_request_t *request) { } else if(h_isChannelRelay(i) || channelType == ChType_Toggle) { const char *c; if(CHANNEL_Check(i)) { - c = "r"; + c = "bgrn"; } else { - c = "g"; + c = "bred"; } poststr(request,"
"); hprintf128(request,"",i); @@ -292,7 +292,7 @@ int http_fn_index(http_request_t *request) { poststr(request,"\ \ - \ + \
"); poststr(request,"
"); @@ -1303,13 +1303,14 @@ int http_fn_cfg_pins(http_request_t *request) { // if available.. alias = HAL_PIN_GetPinNameAlias(i); + poststr(request, "
"); if(alias) { poststr(request,alias); poststr(request," "); } else { hprintf128(request, "P%i ",i); } - hprintf128(request, "",i); for(j = 0; j < IOR_Total_Options; j++) { // do not show hardware PWM on non-PWM pin if(j == IOR_PWM) { @@ -1325,14 +1326,14 @@ int http_fn_cfg_pins(http_request_t *request) { } } poststr(request, ""); - hprintf128(request, "",i,ch); + hprintf128(request, "",i,ch); if(si == IOR_Button || si == IOR_Button_n) { // extra param. For button, is relay index to toggle on double click - hprintf128(request, "",i,ch2); + hprintf128(request, "",i,ch2); } - poststr(request,"
"); + poststr(request,"
"); } poststr(request,""); diff --git a/src/httpserver/new_http.c b/src/httpserver/new_http.c index 2635337ec..6de142a86 100644 --- a/src/httpserver/new_http.c +++ b/src/httpserver/new_http.c @@ -19,8 +19,8 @@ const char httpMimeTypeHTML[] = "text/html" ; // HTML MIME type const char httpMimeTypeText[] = "text/plain" ; // TEXT MIME type const char httpMimeTypeJson[] = "application/json" ; // TEXT MIME type const char httpMimeTypeBinary[] = "application/octet-stream" ; // binary/file MIME type -const char htmlHeader[] = "" ; -const char htmlEnd[] = "" ; +const char htmlHeader[] = "
" ; +const char htmlEnd[] = "
" ; const char htmlReturnToMenu[] = "Return to menu"; const char htmlReturnToCfg[] = "Return to cfg";