diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c index 1e2d85d6f..2c6349858 100644 --- a/src/httpserver/http_fns.c +++ b/src/httpserver/http_fns.c @@ -120,7 +120,7 @@ int http_fn_index(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); poststr(request,""); - poststr(request,g_header); + HTTP_AddHeader(request); if(http_getArg(request->url,"tgl",tmpA,sizeof(tmpA))) { j = atoi(tmpA); hprintf128(request,"

Toggled %i!

",j); @@ -328,7 +328,7 @@ int http_fn_index(http_request_t *request) { int http_fn_about(http_request_t *request){ http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Open source firmware for BK7231N, BK7231T, XR809 and BL602 by OpenSHWProjects

"); poststr(request,htmlReturnToMenu); HTTP_AddBuildFooter(request); @@ -344,7 +344,7 @@ int http_fn_cfg_mqtt(http_request_t *request) { int i; http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Use this to connect to your MQTT

"); poststr(request,"
\
\ @@ -383,7 +383,7 @@ int http_fn_cfg_mqtt_set(http_request_t *request) { char tmpA[128]; http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); if(http_getArg(request->url,"host",tmpA,sizeof(tmpA))) { CFG_SetMQTTHost(tmpA); @@ -422,7 +422,7 @@ int http_fn_cfg_mqtt_set(http_request_t *request) { int http_fn_cfg_webapp(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Use this to set the URL of the Webapp

"); poststr(request,"\
\ @@ -442,7 +442,7 @@ int http_fn_cfg_webapp_set(http_request_t *request) { char tmpA[128]; http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); if(http_getArg(request->url,"url",tmpA,sizeof(tmpA))) { if(CFG_SetWebappRoot(tmpA)) { @@ -474,7 +474,7 @@ int http_fn_cfg_ping(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); bChanged = 0; poststr(request,"

Ping watchdog (backup reconnect mechanism)

"); poststr(request,"

By default, all OpenBeken devices automatically tries to reconnect to WiFi when a connection is lost."); @@ -548,7 +548,7 @@ int http_fn_cfg_wifi(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); /*bChanged = 0; if(http_getArg(recvbuf,"ssid",tmpA,sizeof(tmpA))) { CFG_SetWiFiSSID(tmpA); @@ -644,7 +644,7 @@ int http_fn_cfg_name(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Change device names for display.

Remember that short name is used by MQTT.
"); if(http_getArg(request->url,"shortName",tmpA,sizeof(tmpA))) { @@ -682,7 +682,7 @@ int http_fn_cfg_wifi_set(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); if(http_getArg(request->url,"open",tmpA,sizeof(tmpA))) { CFG_SetWiFiSSID(""); CFG_SetWiFiPass(""); @@ -721,7 +721,7 @@ int http_fn_cfg_loglevel_set(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); if(http_getArg(request->url,"loglevel",tmpA,sizeof(tmpA))) { #if WINDOWS #else @@ -760,7 +760,7 @@ int http_fn_cfg_mac(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); if(http_getArg(request->url,"mac",tmpA,sizeof(tmpA))) { for( i = 0; i < 6; i++ ) @@ -808,7 +808,7 @@ int http_fn_flash_read_tool(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Flash Read Tool

"); if( http_getArg(request->url,"hex",tmpA,sizeof(tmpA))){ hex = atoi(tmpA); @@ -901,7 +901,7 @@ int http_fn_cmd_tool(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Command Tool

"); if( http_getArg(request->url,"cmd",tmpA,sizeof(tmpA))) { @@ -936,7 +936,7 @@ int http_fn_startup_command(http_request_t *request) { const char *cmd; http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Set/Change/Clear startup command line

"); poststr(request,"
Startup command is a shorter, smaller alternative to LittleFS autoexec.bat." "The startup commands are ran at device startup." @@ -974,7 +974,7 @@ int http_fn_uart_tool(http_request_t *request) { int resultLen = 0; http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

UART Tool

"); @@ -1026,7 +1026,7 @@ int http_fn_uart_tool(http_request_t *request) { int http_fn_config_dump_table(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"Not implemented
"); @@ -1045,7 +1045,7 @@ int http_fn_cfg_quick(http_request_t *request) { int j; http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Quick Config

"); if(http_getArg(request->url,"dev",tmpA,sizeof(tmpA))) { @@ -1080,7 +1080,7 @@ int http_fn_cfg_ha(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"

Home Assistant Cfg

"); hprintf128(request,"

Note that your short device name is: %s

",baseName); poststr(request,"

Paste this to configuration yaml

"); @@ -1175,7 +1175,7 @@ int http_fn_cm(http_request_t *request) { int http_fn_cfg(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"
"); poststr(request,"
"); poststr(request,"
"); @@ -1224,7 +1224,7 @@ int http_fn_cfg_pins(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"
First textfield is used to enter channel index (relay index), used to support multiple relays and buttons
"); poststr(request,"
(so, first button and first relay should have channel 1, second button and second relay have channel 2, etc)
"); poststr(request,"
Second textfield (only for buttons) is used to enter channel to toggle when doing double click
"); @@ -1358,7 +1358,7 @@ int http_fn_cfg_generic(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); if( http_getArg(request->url,"boot_ok_delay",tmpA,sizeof(tmpA))) { i = atoi(tmpA); @@ -1433,7 +1433,7 @@ int http_fn_cfg_startup(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); hprintf128(request,"
Here you can set pin start values
"); hprintf128(request,"
For relays, simply use 1 or 0
"); @@ -1491,7 +1491,7 @@ int http_fn_cfg_dgr(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); hprintf128(request,"
Here you can configure Tasmota Device Groups
"); @@ -1627,7 +1627,7 @@ int http_fn_ota(http_request_t *request) { int http_fn_other(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); - poststr(request,g_header); + HTTP_AddHeader(request); poststr(request,"Not found.
"); poststr(request,htmlReturnToMenu); HTTP_AddBuildFooter(request); diff --git a/src/httpserver/http_fns.h b/src/httpserver/http_fns.h index b5964baf7..00aea98ea 100644 --- a/src/httpserver/http_fns.h +++ b/src/httpserver/http_fns.h @@ -1,7 +1,6 @@ #include "new_http.h" -extern const char *g_header; int http_fn_about(http_request_t *request); int http_fn_cfg_mqtt(http_request_t *request); diff --git a/src/httpserver/new_http.c b/src/httpserver/new_http.c index 9ca43961a..725baabcc 100644 --- a/src/httpserver/new_http.c +++ b/src/httpserver/new_http.c @@ -283,36 +283,22 @@ void setupAllWB2SPinsAsButtons() { } -#if PLATFORM_XR809 -const char *g_header = "

OpenXR809

[Read more][Support project]

"; -#elif PLATFORM_BK7231N -const char *g_header = "

OpenBK7231N

[Read more][Support project]

"; +const char *g_header_start = "

"; +const char *g_header_end = "

[Read more][Support project]

"; -#elif PLATFORM_BK7231T - -const char *g_header = "

OpenBK7231T

[Read more][Support project]

"; - -#elif PLATFORM_BL602 - -const char *g_header = "

OpenBL602

[Read more][Support project]

"; - -#elif WINDOWS - -const char *g_header = "

OpenBK7231 [Win test]

[Read more][Support project]

"; - -#else - -const char *g_header = "

error

"; -#error "Platform not supported" -//Platform not supported -#endif +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,"
"); poststr(request,g_build_str); poststr(request,"
Online for "); @@ -323,6 +309,8 @@ void HTTP_AddBuildFooter(http_request_t *request) { sprintf(upTimeStr,"
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,"
Short name: %s, Chipset %s",CFG_GetShortDeviceName(),PLATFORM_MCU_NAME); + poststr(request,upTimeStr); } // add some more output safely, sending if necessary. diff --git a/src/httpserver/new_http.h b/src/httpserver/new_http.h index 58771fe44..04a16f870 100644 --- a/src/httpserver/new_http.h +++ b/src/httpserver/new_http.h @@ -56,6 +56,7 @@ int poststr(http_request_t *request, const char *str); int postany(http_request_t *request, const char *str, int len); void misc_formatUpTimeString(int totalSeconds, char *o); void HTTP_AddBuildFooter(http_request_t *request); +void HTTP_AddHeader(http_request_t *request); int http_getArg(const char *base, const char *name, char *o, int maxSize); int http_getArgInteger(const char *base, const char *name); diff --git a/src/new_common.h b/src/new_common.h index dcd704a20..d7c78ac8f 100644 --- a/src/new_common.h +++ b/src/new_common.h @@ -14,18 +14,23 @@ #if WINDOWS #define DEVICENAME_PREFIX_FULL "WinTest" #define DEVICENAME_PREFIX_SHORT "WT" +#define PLATFORM_MCU_NAME "WIN32" #elif PLATFORM_XR809 #define DEVICENAME_PREFIX_FULL "OpenXR809" #define DEVICENAME_PREFIX_SHORT "oxr" +#define PLATFORM_MCU_NAME "XR809" #elif PLATFORM_BK7231N #define DEVICENAME_PREFIX_FULL "OpenBK7231N" #define DEVICENAME_PREFIX_SHORT "obk" +#define PLATFORM_MCU_NAME "BK7231N" #elif PLATFORM_BK7231T #define DEVICENAME_PREFIX_FULL "OpenBK7231T" #define DEVICENAME_PREFIX_SHORT "obk" +#define PLATFORM_MCU_NAME "BK7231T" #elif PLATFORM_BL602 #define DEVICENAME_PREFIX_FULL "OpenBL602" #define DEVICENAME_PREFIX_SHORT "obl" +#define PLATFORM_MCU_NAME "BL602" #else #error "You must define a platform.." This platform is not supported, error!