userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added system timer for utime

Browse Source 
added template of main application page
This commit is contained in:
Bogdan Pilyugin 2022-08-28 16:13:02 +02:00
parent 34be6b7dab
commit ee9c573032
6 changed files with 238 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/NetTransport.h
View File

@ -111,4 +111,7 @@ void StartTimeGet(void);
esp_err_t StartOTA(void); esp_err_t StartOTA(void);
void StartSystemTimer(void);
uint32_t GetUpTime(void);
#endif /* MAIN_INCLUDE_NETTRANSPORT_H_ */ #endif /* MAIN_INCLUDE_NETTRANSPORT_H_ */

2
include/SystemConfiguration.h
View File

@ -115,7 +115,7 @@
struct struct
{ {
int TimeZone; int TimeZone;
uint8_t SntpServerAdr[33]; char SntpServerAdr[33];
struct struct
{ {
char bIsWifiEnabled :1; char bIsWifiEnabled :1;

102
src/HTTPPostSystem.c
View File

@ -295,28 +295,27 @@ static HTTP_IO_RESULT HTTPPostServicesSettings(httpd_req_t *req, char *PostData)
#if CONFIG_MQTT_CLIENTS_NUM == 2 #if CONFIG_MQTT_CLIENTS_NUM == 2
httpd_query_key_value(PostData, "cld2", GetSysConf()->mqttStation[1].ServerAddr, httpd_query_key_value(PostData, "cld2", GetSysConf()->mqttStation[1].ServerAddr,
sizeof(GetSysConf()->mqttStation[1].ServerAddr)); sizeof(GetSysConf()->mqttStation[1].ServerAddr));
httpd_query_key_value(PostData, "idd2", GetSysConf()->mqttStation[1].ClientID, httpd_query_key_value(PostData, "idd2", GetSysConf()->mqttStation[1].ClientID,
sizeof(GetSysConf()->mqttStation[1].ClientID)); sizeof(GetSysConf()->mqttStation[1].ClientID));
httpd_query_key_value(PostData, "top2", GetSysConf()->mqttStation[1].RootTopic, httpd_query_key_value(PostData, "top2", GetSysConf()->mqttStation[1].RootTopic,
sizeof(GetSysConf()->mqttStation[1].RootTopic)); sizeof(GetSysConf()->mqttStation[1].RootTopic));
httpd_query_key_value(PostData, "clnm2", GetSysConf()->mqttStation[1].UserName, httpd_query_key_value(PostData, "clnm2", GetSysConf()->mqttStation[1].UserName,
sizeof(GetSysConf()->mqttStation[1].UserName)); sizeof(GetSysConf()->mqttStation[1].UserName));
if (httpd_query_key_value(PostData, "mqttenb2", tmp, sizeof(tmp)) == ESP_OK) if (httpd_query_key_value(PostData, "mqttenb2", tmp, sizeof(tmp)) == ESP_OK)
{ {
if (!strcmp((const char*) tmp, (const char*) "1")) if (!strcmp((const char*) tmp, (const char*) "1"))
TempIsMQTT2Enabled = true; TempIsMQTT2Enabled = true;
} }
if (httpd_query_key_value(PostData, "mprt2", tmp, sizeof(tmp)) == ESP_OK) if (httpd_query_key_value(PostData, "mprt2", tmp, sizeof(tmp)) == ESP_OK)
if (httpd_query_key_value(PostData, "mprt2", tmp, sizeof(tmp)) == ESP_OK) if (httpd_query_key_value(PostData, "mprt2", tmp, sizeof(tmp)) == ESP_OK)
{ {
uint16_t tp = atoi((const char*) tmp); uint16_t tp = atoi((const char*) tmp);
if (tp < 65535 && tp >= 1000) if (tp < 65535 && tp >= 1000)
GetSysConf()->mqttStation[1].ServerPort = tp; GetSysConf()->mqttStation[1].ServerPort = tp;
} }
if (httpd_query_key_value(PostData, "clps2", tmp, sizeof(tmp)) == ESP_OK && if (httpd_query_key_value(PostData, "clps2", tmp, sizeof(tmp)) == ESP_OK &&
strcmp(tmp, (const char*) "******")) strcmp(tmp, (const char*) "******"))
@ -326,14 +325,39 @@ static HTTP_IO_RESULT HTTPPostServicesSettings(httpd_req_t *req, char *PostData)
#endif #endif
if (httpd_query_key_value(PostData, "sav", tmp, 4) == ESP_OK) /*SNTP*/
bool TempIsSNTPEnabled = false;
if (httpd_query_key_value(PostData, "sntpen", tmp, sizeof(tmp)) == ESP_OK)
{ {
if (!strcmp(tmp, (const char*) "prs")) if (!strcmp((const char*) tmp, (const char*) "1"))
TempIsSNTPEnabled = true;
}
httpd_query_key_value(PostData, "tsr", GetSysConf()->sntpClient.SntpServerAdr,
sizeof(GetSysConf()->sntpClient.SntpServerAdr));
if (httpd_query_key_value(PostData, "save", tmp, 5) == ESP_OK ||
httpd_query_key_value(PostData, "apply", tmp, 5) == ESP_OK)
{
if (!strcmp(tmp, (const char*) "mqtt"))
{ {
GetSysConf()->mqttStation[0].Flags1.bIsGlobalEnabled = TempIsMQTT1Enabled; GetSysConf()->mqttStation[0].Flags1.bIsGlobalEnabled = TempIsMQTT1Enabled;
#if CONFIG_MQTT_CLIENTS_NUM == 2 #if CONFIG_MQTT_CLIENTS_NUM == 2
GetSysConf()->mqttStation[1].Flags1.bIsGlobalEnabled = TempIsMQTT2Enabled; GetSysConf()->mqttStation[1].Flags1.bIsGlobalEnabled = TempIsMQTT2Enabled;
#endif #endif
}
else if (!strcmp(tmp, (const char*) "sntp"))
{
GetSysConf()->sntpClient.Flags1.bIsGlobalEnabled = TempIsSNTPEnabled;
}
if (httpd_query_key_value(PostData, "save", tmp, 5) == ESP_OK)
{
WriteNVSSysConfig(GetSysConf());
return HTTP_IO_DONE;
}
else if (httpd_query_key_value(PostData, "apply", tmp, 5) == ESP_OK)
{
WriteNVSSysConfig(GetSysConf()); WriteNVSSysConfig(GetSysConf());
memcpy(PostData, "/reboot.html", sizeof "/reboot.html"); memcpy(PostData, "/reboot.html", sizeof "/reboot.html");
return HTTP_IO_REDIRECT; return HTTP_IO_REDIRECT;
@ -346,8 +370,6 @@ static HTTP_IO_RESULT HTTPPostServicesSettings(httpd_req_t *req, char *PostData)
static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData) static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
{ {
char tmp[64]; char tmp[64];
bool TempIsTCPConfirm = false;
bool TempIsLoRaConfirm = false;
bool TempIsOTAEnabled = false; bool TempIsOTAEnabled = false;
if (httpd_query_key_value(PostData, "nam", tmp, sizeof(tmp)) == ESP_OK) if (httpd_query_key_value(PostData, "nam", tmp, sizeof(tmp)) == ESP_OK)
@ -355,11 +377,6 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
UnencodeURL(tmp); UnencodeURL(tmp);
strcpy(GetSysConf()->NetBIOSName, tmp); strcpy(GetSysConf()->NetBIOSName, tmp);
} }
if (httpd_query_key_value(PostData, "otaurl", tmp, sizeof(tmp)) == ESP_OK)
{
UnencodeURL(tmp);
strcpy(GetSysConf()->OTAURL, tmp);
}
httpd_query_key_value(PostData, "lgn", GetSysConf()->SysName, sizeof(GetSysConf()->SysName)); httpd_query_key_value(PostData, "lgn", GetSysConf()->SysName, sizeof(GetSysConf()->SysName));
@ -369,24 +386,18 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
strcpy(GetSysConf()->SysPass, tmp); strcpy(GetSysConf()->SysPass, tmp);
} }
if (httpd_query_key_value(PostData, "lrdel", tmp, sizeof(tmp)) == ESP_OK)
{
if (!strcmp((const char*) tmp, (const char*) "1"))
TempIsLoRaConfirm = true;
}
if (httpd_query_key_value(PostData, "tcpdel", tmp, sizeof(tmp)) == ESP_OK)
{
if (!strcmp((const char*) tmp, (const char*) "1"))
TempIsTCPConfirm = true;
}
if (httpd_query_key_value(PostData, "ota", tmp, sizeof(tmp)) == ESP_OK) if (httpd_query_key_value(PostData, "ota", tmp, sizeof(tmp)) == ESP_OK)
{ {
if (!strcmp((const char*) tmp, (const char*) "1")) if (!strcmp((const char*) tmp, (const char*) "1"))
TempIsOTAEnabled = true; TempIsOTAEnabled = true;
} }
if (httpd_query_key_value(PostData, "otaurl", tmp, sizeof(tmp)) == ESP_OK)
{
UnencodeURL(tmp);
strcpy(GetSysConf()->OTAURL, tmp);
}
if (httpd_query_key_value(PostData, "upd", tmp, sizeof(tmp)) == ESP_OK) if (httpd_query_key_value(PostData, "upd", tmp, sizeof(tmp)) == ESP_OK)
{ {
@ -398,26 +409,35 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
} }
if (httpd_query_key_value(PostData, "rst", tmp, sizeof(tmp)) == ESP_OK) if (httpd_query_key_value(PostData, "rst", tmp, sizeof(tmp)) == ESP_OK)
{ {
if (!strcmp(tmp, (const char*) "prs")) if (!strcmp(tmp, (const char*) "prs"))
{ {
memcpy(PostData, "/reboot.html", sizeof "/reboot.html"); memcpy(PostData, "/reboot.html", sizeof "/reboot.html");
return HTTP_IO_REDIRECT; return HTTP_IO_REDIRECT;
} }
} }
if (httpd_query_key_value(PostData, "sav", tmp, sizeof(tmp)) == ESP_OK)
{
if (!strcmp(tmp, (const char*) "prs"))
{
GetSysConf()->Flags1.bIsTCPConfirm = TempIsTCPConfirm;
GetSysConf()->Flags1.bIsLoRaConfirm = TempIsLoRaConfirm;
GetSysConf()->Flags1.bIsOTAEnabled = TempIsOTAEnabled;
if (httpd_query_key_value(PostData, "save", tmp, sizeof(tmp)) == ESP_OK ||
httpd_query_key_value(PostData, "apply", tmp, sizeof(tmp)) == ESP_OK)
{
if (!strcmp(tmp, (const char*) "syst"))
{
GetSysConf()->Flags1.bIsOTAEnabled = TempIsOTAEnabled;
}
if (httpd_query_key_value(PostData, "save", tmp, 5) == ESP_OK)
{
WriteNVSSysConfig(GetSysConf());
return HTTP_IO_DONE;
}
else if (httpd_query_key_value(PostData, "apply", tmp, 5) == ESP_OK)
{
WriteNVSSysConfig(GetSysConf()); WriteNVSSysConfig(GetSysConf());
memcpy(PostData, "/reboot.html", sizeof "/reboot.html"); memcpy(PostData, "/reboot.html", sizeof "/reboot.html");
return HTTP_IO_REDIRECT; return HTTP_IO_REDIRECT;
} }
} }
return HTTP_IO_DONE; return HTTP_IO_DONE;
} }

276
src/HTTPPrintSystem.c
View File

@ -120,7 +120,7 @@ static void HTTPPrint_time(char *VarData, void *arg)
} }
static void HTTPPrint_uptime(char *VarData, void *arg) static void HTTPPrint_uptime(char *VarData, void *arg)
{ {
snprintf(VarData, MAX_DYNVAR_LENGTH, "%s", "-"); snprintf(VarData, MAX_DYNVAR_LENGTH, "%d", GetUpTime());
} }
static void HTTPPrint_status_fail(char *VarData, void *arg) static void HTTPPrint_status_fail(char *VarData, void *arg)
@ -192,7 +192,6 @@ static void HTTPPrint_otaurl(char *VarData, void *arg)
snprintf(VarData, MAX_DYNVAR_LENGTH, "%s", GetSysConf()->OTAURL); snprintf(VarData, MAX_DYNVAR_LENGTH, "%s", GetSysConf()->OTAURL);
} }
static void HTTPPrint_tshift(char *VarData, void *arg) static void HTTPPrint_tshift(char *VarData, void *arg)
{ {
snprintf(VarData, MAX_DYNVAR_LENGTH, "7200"); snprintf(VarData, MAX_DYNVAR_LENGTH, "7200");
@ -217,7 +216,6 @@ static void HTTPPrint_defadp(char *VarData, void *arg)
GetDefaultNetIFName(VarData); GetDefaultNetIFName(VarData);
} }
#if CONFIG_WEBGUIAPP_WIFI_ENABLE #if CONFIG_WEBGUIAPP_WIFI_ENABLE
static void HTTPPrint_wfen(char *VarData, void *arg) static void HTTPPrint_wfen(char *VarData, void *arg)
@ -399,13 +397,11 @@ static void HTTPPrint_emacadr(char *VarData, void *arg)
#endif #endif
void HTTPPrint_gsmstat(char *VarData, void *arg) void HTTPPrint_gsmstat(char *VarData, void *arg)
{ {
PrintInterfaceState(VarData, arg, GetPPPNetifAdapter()); PrintInterfaceState(VarData, arg, GetPPPNetifAdapter());
} }
#if CONFIG_WEBGUIAPP_GPRS_ENABLE #if CONFIG_WEBGUIAPP_GPRS_ENABLE
/*GSM MODEM*/ /*GSM MODEM*/
void HTTPPrint_gsmen(char *VarData, void *arg) void HTTPPrint_gsmen(char *VarData, void *arg)
@ -561,71 +557,90 @@ static void HTTPPrint_mqtt2st(char *VarData, void *arg)
} }
//Default string if not found handler /* Pass build configuration to web interface*/
static void HTTPPrint_DEF(char *VarData, void *arg) static void HTTPPrint_ifc_gprs(char *VarData, void *arg)
{ {
snprintf(VarData, MAX_DYNVAR_LENGTH, "#DEF"); #if CONFIG_WEBGUIAPP_GPRS_ENABLE
snprintf(VarData, MAX_DYNVAR_LENGTH, "1");
#else
snprintf(VarData, MAX_DYNVAR_LENGTH, "0");
#endif
}
static void HTTPPrint_ifc_mq2(char *VarData, void *arg)
{
#if CONFIG_MQTT_CLIENTS_NUM == 2
snprintf(VarData, MAX_DYNVAR_LENGTH, "1");
#else
snprintf(VarData, MAX_DYNVAR_LENGTH, "0");
#endif
} }
//Default string if not found handler
static void HTTPPrint_DEF(char *VarData, void *arg)
{
snprintf(VarData, MAX_DYNVAR_LENGTH, "#DEF");
}
dyn_var_handler_t HANDLERS_ARRAY[] = { dyn_var_handler_t HANDLERS_ARRAY[] = {
/*Ststem settings*/ /*Ststem settings*/
{ "dname", sizeof("dname") - 1, &HTTPPrint_dname }, { "dname", sizeof("dname") - 1, &HTTPPrint_dname },
{ "login", sizeof("login") - 1, &HTTPPrint_login }, { "login", sizeof("login") - 1, &HTTPPrint_login },
{ "pass", sizeof("pass") - 1, &HTTPPrint_pass }, { "pass", sizeof("pass") - 1, &HTTPPrint_pass },
{ "ota", sizeof("ota") - 1, &HTTPPrint_ota }, { "ota", sizeof("ota") - 1, &HTTPPrint_ota },
{ "fver", sizeof("fver") - 1, &HTTPPrint_fver }, { "fver", sizeof("fver") - 1, &HTTPPrint_fver },
{ "idfver", sizeof("idfver") - 1, &HTTPPrint_idfver }, { "idfver", sizeof("idfver") - 1, &HTTPPrint_idfver },
{ "builddate", sizeof("builddate") - 1, &HTTPPrint_builddate }, { "builddate", sizeof("builddate") - 1, &HTTPPrint_builddate },
{ "serial", sizeof("serial") - 1, &HTTPPrint_serial }, { "serial", sizeof("serial") - 1, &HTTPPrint_serial },
{ "serial10", sizeof("serial10") - 1, &HTTPPrint_serial10 }, { "serial10", sizeof("serial10") - 1, &HTTPPrint_serial10 },
{ "otaurl", sizeof("otaurl") - 1, &HTTPPrint_otaurl }, { "otaurl", sizeof("otaurl") - 1, &HTTPPrint_otaurl },
{ "time", sizeof("time") - 1, &HTTPPrint_time }, { "time", sizeof("time") - 1, &HTTPPrint_time },
{ "uptime", sizeof("uptime") - 1, &HTTPPrint_uptime }, { "uptime", sizeof("uptime") - 1, &HTTPPrint_uptime },
{ "tshift", sizeof("tshift") - 1, &HTTPPrint_tshift }, { "tshift", sizeof("tshift") - 1, &HTTPPrint_tshift },
{ "tz", sizeof("tz") - 1, &HTTPPrint_tz }, { "tz", sizeof("tz") - 1, &HTTPPrint_tz },
{ "defadp", sizeof("defadp") - 1, &HTTPPrint_defadp }, { "defadp", sizeof("defadp") - 1, &HTTPPrint_defadp },
{ "wlev", sizeof("wlev") - 1, &HTTPPrint_wlev }, { "wlev", sizeof("wlev") - 1, &HTTPPrint_wlev },
#if CONFIG_WEBGUIAPP_WIFI_ENABLE #if CONFIG_WEBGUIAPP_WIFI_ENABLE
/*WiFi network*/ /*WiFi network*/
{ "wfen", sizeof("wfen") - 1, &HTTPPrint_wfen }, { "wfen", sizeof("wfen") - 1, &HTTPPrint_wfen },
{ "wfstat", sizeof("wfstat") - 1, &HTTPPrint_wfstat }, { "wfstat", sizeof("wfstat") - 1, &HTTPPrint_wfstat },
{ "cln", sizeof("cln") - 1, &HTTPPrint_cln }, { "cln", sizeof("cln") - 1, &HTTPPrint_cln },
{ "apn", sizeof("apn") - 1, &HTTPPrint_apn }, { "apn", sizeof("apn") - 1, &HTTPPrint_apn },
{ "ssidap", sizeof("ssidap") - 1, &HTTPPrint_ssidap }, { "ssidap", sizeof("ssidap") - 1, &HTTPPrint_ssidap },
{ "wkeyap", sizeof("wkeyap") - 1, &HTTPPrint_wkeyap }, { "wkeyap", sizeof("wkeyap") - 1, &HTTPPrint_wkeyap },
{ "ipap", sizeof("ipap") - 1, &HTTPPrint_ipap }, { "ipap", sizeof("ipap") - 1, &HTTPPrint_ipap },
{ "ssid", sizeof("ssid") - 1, &HTTPPrint_ssid }, { "ssid", sizeof("ssid") - 1, &HTTPPrint_ssid },
{ "wkey", sizeof("wkey") - 1, &HTTPPrint_wkey }, { "wkey", sizeof("wkey") - 1, &HTTPPrint_wkey },
{ "cbdh", sizeof("cbdh") - 1, &HTTPPrint_cbdh }, { "cbdh", sizeof("cbdh") - 1, &HTTPPrint_cbdh },
{ "ip", sizeof("ip") - 1, &HTTPPrint_ip }, { "ip", sizeof("ip") - 1, &HTTPPrint_ip },
{ "msk", sizeof("msk") - 1, &HTTPPrint_msk }, { "msk", sizeof("msk") - 1, &HTTPPrint_msk },
{ "gate", sizeof("gate") - 1, &HTTPPrint_gate }, { "gate", sizeof("gate") - 1, &HTTPPrint_gate },
{ "dns", sizeof("dns") - 1, &HTTPPrint_dns }, { "dns", sizeof("dns") - 1, &HTTPPrint_dns },
{ "dns2", sizeof("dns2") - 1, &HTTPPrint_dns2 }, { "dns2", sizeof("dns2") - 1, &HTTPPrint_dns2 },
{ "dns3", sizeof("dns3") - 1, &HTTPPrint_dns3 }, { "dns3", sizeof("dns3") - 1, &HTTPPrint_dns3 },
{ "macadr", sizeof("macadr") - 1, &HTTPPrint_macadr }, { "macadr", sizeof("macadr") - 1, &HTTPPrint_macadr },
{ "apmacadr", sizeof("apmacadr") - 1, &HTTPPrint_apmacadr }, { "apmacadr", sizeof("apmacadr") - 1, &HTTPPrint_apmacadr },
#endif #endif
#if CONFIG_WEBGUIAPP_ETHERNET_ENABLE #if CONFIG_WEBGUIAPP_ETHERNET_ENABLE
/*ETHERNET network*/ /*ETHERNET network*/
{ "ethen", sizeof("ethen") - 1, &HTTPPrint_ethen }, { "ethen", sizeof("ethen") - 1, &HTTPPrint_ethen },
{ "ecbdh", sizeof("ecbdh") - 1, &HTTPPrint_ecbdh }, { "ecbdh", sizeof("ecbdh") - 1, &HTTPPrint_ecbdh },
{ "ethstat", sizeof("ethstat") - 1, &HTTPPrint_ethstat }, { "ethstat", sizeof("ethstat") - 1, &HTTPPrint_ethstat },
{ "eip", sizeof("eip") - 1, &HTTPPrint_eip }, { "eip", sizeof("eip") - 1, &HTTPPrint_eip },
{ "emsk", sizeof("emsk") - 1, &HTTPPrint_emsk }, { "emsk", sizeof("emsk") - 1, &HTTPPrint_emsk },
{ "egate", sizeof("egate") - 1, &HTTPPrint_egate }, { "egate", sizeof("egate") - 1, &HTTPPrint_egate },
{ "edns", sizeof("edns") - 1, &HTTPPrint_edns }, { "edns", sizeof("edns") - 1, &HTTPPrint_edns },
{ "bkedns", sizeof("bkedns") - 1, &HTTPPrint_bkedns }, { "bkedns", sizeof("bkedns") - 1, &HTTPPrint_bkedns },
{ "fledns", sizeof("fledns") - 1, &HTTPPrint_fledns }, { "fledns", sizeof("fledns") - 1, &HTTPPrint_fledns },
{ "emacadr", sizeof("emacadr") - 1, &HTTPPrint_emacadr }, { "emacadr", sizeof("emacadr") - 1, &HTTPPrint_emacadr },
#endif #endif
{ "gsmstat", sizeof("gsmstat") - 1, &HTTPPrint_gsmstat }, { "gsmstat", sizeof("gsmstat") - 1, &HTTPPrint_gsmstat },
#if CONFIG_WEBGUIAPP_GPRS_ENABLE #if CONFIG_WEBGUIAPP_GPRS_ENABLE
/*GSM modem*/ /*GSM modem*/
@ -645,15 +660,15 @@ dyn_var_handler_t HANDLERS_ARRAY[] = {
#endif #endif
#if CONFIG_WEBGUIAPP_MQTT_ENABLE #if CONFIG_WEBGUIAPP_MQTT_ENABLE
/*MQTT*/ /*MQTT*/
{ "mqtten1", sizeof("mqtten1") - 1, &HTTPPrint_mqtten1 }, { "mqtten1", sizeof("mqtten1") - 1, &HTTPPrint_mqtten1 },
{ "ipcld1", sizeof("ipcld1") - 1, &HTTPPrint_ipcld1 }, { "ipcld1", sizeof("ipcld1") - 1, &HTTPPrint_ipcld1 },
{ "mport1", sizeof("mport1") - 1, &HTTPPrint_mport1 }, { "mport1", sizeof("mport1") - 1, &HTTPPrint_mport1 },
{ "idcld1", sizeof("idcld1") - 1, &HTTPPrint_idcld1 }, { "idcld1", sizeof("idcld1") - 1, &HTTPPrint_idcld1 },
{ "topic1", sizeof("topic1") - 1, &HTTPPrint_topic1 }, { "topic1", sizeof("topic1") - 1, &HTTPPrint_topic1 },
{ "clname1", sizeof("clname1") - 1, &HTTPPrint_clname1 }, { "clname1", sizeof("clname1") - 1, &HTTPPrint_clname1 },
{ "clpass1", sizeof("clpass1") - 1, &HTTPPrint_clpass1 }, { "clpass1", sizeof("clpass1") - 1, &HTTPPrint_clpass1 },
#if CONFIG_MQTT_CLIENTS_NUM == 2 #if CONFIG_MQTT_CLIENTS_NUM == 2
{ "mqtten2", sizeof("mqtten2") - 1, &HTTPPrint_mqtten2 }, { "mqtten2", sizeof("mqtten2") - 1, &HTTPPrint_mqtten2 },
{ "ipcld2", sizeof("ipcld2") - 1, &HTTPPrint_ipcld2 }, { "ipcld2", sizeof("ipcld2") - 1, &HTTPPrint_ipcld2 },
{ "mport2", sizeof("mport2") - 1, &HTTPPrint_mport2 }, { "mport2", sizeof("mport2") - 1, &HTTPPrint_mport2 },
@ -663,81 +678,84 @@ dyn_var_handler_t HANDLERS_ARRAY[] = {
{ "clpass2", sizeof("clpass2") - 1, &HTTPPrint_clpass2 }, { "clpass2", sizeof("clpass2") - 1, &HTTPPrint_clpass2 },
#endif #endif
#endif #endif
/*SNTP*/ /*SNTP*/
{ "sntpen", sizeof("sntpen") - 1, &HTTPPrint_sntpen }, { "sntpen", sizeof("sntpen") - 1, &HTTPPrint_sntpen },
{ "tmsrv", sizeof("tmsrv") - 1, &HTTPPrint_tmsrv }, { "tmsrv", sizeof("tmsrv") - 1, &HTTPPrint_tmsrv },
{ "freeram", sizeof("freeram") - 1, &HTTPPrint_freeram }, { "freeram", sizeof("freeram") - 1, &HTTPPrint_freeram },
{ "minram", sizeof("minram") - 1, &HTTPPrint_minram }, { "minram", sizeof("minram") - 1, &HTTPPrint_minram },
{ "mqtt1st", sizeof("mqtt1st") - 1, &HTTPPrint_mqtt1st }, { "mqtt1st", sizeof("mqtt1st") - 1, &HTTPPrint_mqtt1st },
{ "mqtt2st", sizeof("mqtt2st") - 1, &HTTPPrint_mqtt2st }, { "mqtt2st", sizeof("mqtt2st") - 1, &HTTPPrint_mqtt2st },
/*ERROR report*/ /*ERROR report*/
{ "status_fail", sizeof("status_fail") - 1, &HTTPPrint_status_fail }, { "status_fail", sizeof("status_fail") - 1, &HTTPPrint_status_fail },
{ "ifc_gprs", sizeof("ifc_gprs") - 1, &HTTPPrint_ifc_gprs },
{ "ifc_mq2", sizeof("ifc_mq2") - 1, &HTTPPrint_ifc_mq2 },
}; };
int HTTPPrint(httpd_req_t *req, char *buf, char *var) int HTTPPrint(httpd_req_t *req, char *buf, char *var)
{ {
char VarData[MAX_DYNVAR_LENGTH]; char VarData[MAX_DYNVAR_LENGTH];
const char incPat[] = "inc:"; const char incPat[] = "inc:";
const int incPatLen = sizeof(incPat) - 1; const int incPatLen = sizeof(incPat) - 1;
if (!memcmp(var, incPat, incPatLen)) if (!memcmp(var, incPat, incPatLen))
{
const char rootFS[] = "/";
char filename[32];
filename[0] = 0x00;
var += incPatLen;
strcat(filename, rootFS);
strcat(filename, var);
espfs_file_t *file = espfs_fopen(fs, filename);
struct espfs_stat_t stat;
if (file)
{ {
const char rootFS[] = "/"; espfs_fstat(file, &stat);
char filename[32]; int readBytes = espfs_fread(file, buf, stat.size);
filename[0] = 0x00; espfs_fclose(file);
var += incPatLen; return readBytes;
strcat(filename, rootFS);
strcat(filename, var);
espfs_file_t *file = espfs_fopen(fs, filename);
struct espfs_stat_t stat;
if (file)
{
espfs_fstat(file, &stat);
int readBytes = espfs_fread(file, buf, stat.size);
espfs_fclose(file);
return readBytes;
}
} }
}
bool fnd = false; bool fnd = false;
char *p2 = var + strlen(var) - 1; //last var symbol char *p2 = var + strlen(var) - 1; //last var symbol
int arg = 0; int arg = 0;
//searching for tag in handles array //searching for tag in handles array
for (int i = 0; i < (sizeof(HANDLERS_ARRAY) / sizeof(HANDLERS_ARRAY[0])); ++i) for (int i = 0; i < (sizeof(HANDLERS_ARRAY) / sizeof(HANDLERS_ARRAY[0])); ++i)
{ {
if (*p2 == ')') if (*p2 == ')')
{ //found close brace { //found close brace
char *p1 = p2; char *p1 = p2;
while ((*p1 != '(') && (p1 > var)) while ((*p1 != '(') && (p1 > var))
--p1; --p1;
if (*p1 == '(') if (*p1 == '(')
{ //found open brace { //found open brace
*p1 = 0x00; //trim variable to name part *p1 = 0x00; //trim variable to name part
++p1; //to begin of argument ++p1; //to begin of argument
*p2 = 0x00; //set end of argument *p2 = 0x00; //set end of argument
arg = atoi(p1); arg = atoi(p1);
}
}
if (strcmp(var, HANDLERS_ARRAY[i].tag) == 0
&& HANDLERS_ARRAY[i].HandlerRoutine != NULL)
{
HANDLERS_ARRAY[i].HandlerRoutine(VarData, (void*) &arg);
fnd = true;
break;
} }
} }
if (!fnd) if (strcmp(var, HANDLERS_ARRAY[i].tag) == 0
&& HANDLERS_ARRAY[i].HandlerRoutine != NULL)
{ {
if (HTTPPrintCust != NULL) HANDLERS_ARRAY[i].HandlerRoutine(VarData, (void*) &arg);
return HTTPPrintCust(req, buf, var); fnd = true;
else break;
HTTPPrint_DEF(VarData, NULL);
} }
int dLen = strlen(VarData); }
memcpy(buf, VarData, dLen); if (!fnd)
return dLen; {
if (HTTPPrintCust != NULL)
return HTTPPrintCust(req, buf, var);
else
HTTPPrint_DEF(VarData, NULL);
}
int dLen = strlen(VarData);
memcpy(buf, VarData, dLen);
return dLen;
} }

24
src/SNTP.c
View File

@ -20,12 +20,22 @@
*/ */
#include "esp_sntp.h" #include "esp_sntp.h"
#include "esp_timer.h"
#include "NetTransport.h" #include "NetTransport.h"
#define YEAR_BASE (1900) //tm structure base year #define YEAR_BASE (1900) //tm structure base year
static uint32_t UpTime = 0;
static void initialize_sntp(void); static void initialize_sntp(void);
void SecondTickSystem(void *arg);
esp_timer_handle_t system_seconds_timer;
const esp_timer_create_args_t system_seconds_timer_args = {
.callback = &SecondTickSystem,
.name = "secondsTimer"
};
static void obtain_time(void *pvParameter) static void obtain_time(void *pvParameter)
{ {
initialize_sntp(); initialize_sntp();
@ -74,4 +84,18 @@ void GetRFC3339Time(char *t)
timeinfo.tm_sec); timeinfo.tm_sec);
} }
void StartSystemTimer(void)
{
ESP_ERROR_CHECK(esp_timer_create(&system_seconds_timer_args, &system_seconds_timer));
ESP_ERROR_CHECK(esp_timer_start_periodic(system_seconds_timer, 1000000));
}
void SecondTickSystem(void *param)
{
++UpTime;
}
uint32_t GetUpTime(void)
{
return UpTime;
}

3
src/SystemConfiguration.c
View File

@ -48,6 +48,7 @@
static SYS_CONFIG SysConfig; static SYS_CONFIG SysConfig;
#define SPI_LOCK_TIMEOUT_MS (1000) #define SPI_LOCK_TIMEOUT_MS (1000)
SemaphoreHandle_t xSemaphoreSPIHandle = NULL; SemaphoreHandle_t xSemaphoreSPIHandle = NULL;
@ -60,6 +61,7 @@ static void InitSysI2C(void);
esp_err_t WebGuiAppInit(void) esp_err_t WebGuiAppInit(void)
{ {
InitSysIO(); InitSysIO();
StartSystemTimer();
#if CONFIG_WEBGUIAPP_SPI_ENABLE #if CONFIG_WEBGUIAPP_SPI_ENABLE
InitSysSPI(); InitSysSPI();
#endif #endif
@ -418,7 +420,6 @@ esp_err_t ResetInitSysConfig(void)
return WriteNVSSysConfig(&SysConfig); return WriteNVSSysConfig(&SysConfig);
} }
void DelayedRestartTask(void *pvParameter) void DelayedRestartTask(void *pvParameter)
{ {
vTaskDelay(pdMS_TO_TICKS(3000)); vTaskDelay(pdMS_TO_TICKS(3000));