Mirrors/OpenBK7231T_App
2
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-03-13 18:58:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tweaks' of https://github.com/softplus/OpenBK7231T_App into tweaks2

Browse Source
This commit is contained in:
softplus
2022-09-04 00:02:37 +02:00
parent cadf9fc90a 6667faaf5c
commit b05944cb0a
5 changed files with 282 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/httpserver/new_http.c
View File

@@ -60,7 +60,7 @@ const char htmlHeadStyle[] =
".hf{display:none;}"
".hdiv{width:95%;white-space:nowrap;}"
".hele{width:210px;display:inline-block;margin-left:2px;}"
"div#state{padding:0} div#changed{padding:0}"
"div#statediv{padding:0}"
"div#main{text-align:left; display:inline-block; color:#eaeaea;min-width:340px;max-width:800px;}"
"</style>";
const char htmlBodyStart[] =
@@ -200,46 +200,6 @@ void http_setup(http_request_t *request, const char *type){
poststr(request,"\r\n");
}
void http_html_start(http_request_t *request, const char *pagename) {
// void HTTP_AddHeader(http_request_t *request) {
poststr(request, htmlDoctype);
poststr(request, "<title>");
poststr(request, CFG_GetDeviceName()); // todo: check escaping
if (pagename) {
poststr(request, " - ");
poststr(request, pagename);
}
poststr(request, "</title>");
poststr(request, htmlHeadMain);
poststr(request, htmlHeadStyle);
poststr(request, htmlBodyStart);
poststr(request, CFG_GetDeviceName()); // todo: check escaping
poststr(request, htmlBodyStart2);
}
void http_html_end(http_request_t *request) {
// was void HTTP_AddBuildFooter(http_request_t *request) {
char upTimeStr[128];
unsigned char mac[32];
poststr(request, " | ");
poststr(request, htmlFooterInfo);
poststr(request, "<br>");
poststr(request, g_build_str);
poststr(request, "<br>Online for ");
misc_formatUpTimeString(Time_getUpTimeSeconds(), upTimeStr);
poststr(request, upTimeStr);
WiFI_GetMacAddress((char *)mac);
sprintf(upTimeStr, "<br>Device MAC: %02X:%02X:%02X:%02X:%02X:%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
poststr(request, upTimeStr);
sprintf(upTimeStr, "<br>Short name: %s, Chipset %s",CFG_GetShortDeviceName(),PLATFORM_MCU_NAME);
poststr(request, upTimeStr);
poststr(request, htmlBodyEnd);
}
const char *http_checkArg(const char *p, const char *n) {
while(1) {
if(*n == 0 && (*p == 0 || *p == '='))
@@ -393,6 +353,37 @@ void setupAllWB2SPinsAsButtons() {
PIN_SetPinChannelForPinIndex(27,1);
}
const char *g_header_start = "<h1><a href=\"https://github.com/openshwprojects/OpenBK7231T_App/\">";
const char *g_header_end = "</a></h1><h3><a href=\"https://www.elektroda.com/rtvforum/viewtopic.php?p=19841301#19841301\">[Read more]</a><a href=\"https://paypal.me/openshwprojects\">[Support project]</a></h3>";
void HTTP_AddHeader(http_request_t *request) {
poststr(request,g_header_start);
poststr(request,CFG_GetDeviceName());
poststr(request,g_header_end);
}
void HTTP_AddBuildFooter(http_request_t *request) {
char upTimeStr[128];
unsigned char mac[32];
poststr(request,"<br>");
poststr(request,g_build_str);
poststr(request,"<br> Online for ");
misc_formatUpTimeString(Time_getUpTimeSeconds(), upTimeStr);
poststr(request,upTimeStr);
WiFI_GetMacAddress((char *)mac);
sprintf(upTimeStr,"<br> Device MAC: %02X%02X%02X%02X%02X%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
poststr(request,upTimeStr);
sprintf(upTimeStr,"<br> Short name: %s, Chipset %s",CFG_GetShortDeviceName(),PLATFORM_MCU_NAME);
poststr(request,upTimeStr);
}
// add some more output safely, sending if necessary.
// call with str == NULL to force send. - can be binary.
// supply length