added variables and handlers
This commit is contained in:
parent
0bb4e3fed1
commit
d244bb3487
|
|
@ -29,9 +29,52 @@
|
|||
#include "esp_ota_ops.h"
|
||||
#include "romfs.h"
|
||||
#include "esp_idf_version.h"
|
||||
#include "NetTransport.h"
|
||||
|
||||
extern SYS_CONFIG SysConfig;
|
||||
|
||||
static void PrintInterfaceState(char *argres, int rw, esp_netif_t *netif)
|
||||
{
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, (netif != NULL && esp_netif_is_netif_up(netif))?"\"CONNECTED\"":"\"DISCONNECTED\"");
|
||||
}
|
||||
|
||||
static void funct_wifi_stat(char *argres, int rw)
|
||||
{
|
||||
if (GetSysConf()->wifiSettings.WiFiMode == WIFI_MODE_AP)
|
||||
PrintInterfaceState(argres, rw, GetAPNetifAdapter());
|
||||
else
|
||||
PrintInterfaceState(argres, rw, GetSTANetifAdapter());
|
||||
}
|
||||
|
||||
#if CONFIG_WEBGUIAPP_ETHERNET_ENABLE
|
||||
static void funct_eth_stat(char *argres, int rw)
|
||||
{
|
||||
PrintInterfaceState(argres, rw, GetETHNetifAdapter());
|
||||
}
|
||||
#endif
|
||||
|
||||
#if CONFIG_WEBGUIAPP_GPRS_ENABLE
|
||||
static void funct_gsm_stat(char *argres, int rw)
|
||||
{
|
||||
PrintInterfaceState(argres, rw, GetPPPNetifAdapter());
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
static void funct_mqtt_1_stat(char *argres, int rw)
|
||||
{
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, (GetMQTT1Connected())?"\"CONNECTED\"":"\"DISCONNECTED\"");
|
||||
}
|
||||
static void funct_mqtt_2_stat(char *argres, int rw)
|
||||
{
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, (GetMQTT2Connected())?"\"CONNECTED\"":"\"DISCONNECTED\"");
|
||||
}
|
||||
static void funct_def_interface(char *argres, int rw)
|
||||
{
|
||||
GetDefaultNetIFName(argres);
|
||||
}
|
||||
|
||||
|
||||
static void funct_time(char *argres, int rw)
|
||||
{
|
||||
time_t now;
|
||||
|
|
@ -39,6 +82,28 @@ static void funct_time(char *argres, int rw)
|
|||
snprintf(argres, MAX_DYNVAR_LENGTH, "%d", (int) now);
|
||||
}
|
||||
|
||||
static void funct_uptime(char *argres, int rw)
|
||||
{
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, "%d", (int) GetUpTime());
|
||||
}
|
||||
static void funct_wifi_level(char *argres, int rw)
|
||||
{
|
||||
wifi_ap_record_t wifi;
|
||||
if (esp_wifi_sta_get_ap_info(&wifi) == ESP_OK)
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, "\"%ddBm\"", wifi.rssi);
|
||||
else
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, "\"-\"");
|
||||
}
|
||||
|
||||
static void funct_fram(char *argres, int rw)
|
||||
{
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, "%d", (int) esp_get_free_heap_size());
|
||||
}
|
||||
static void funct_fram_min(char *argres, int rw)
|
||||
{
|
||||
snprintf(argres, MAX_DYNVAR_LENGTH, "%d", (int) esp_get_minimum_free_heap_size());
|
||||
}
|
||||
|
||||
static void funct_idf_ver(char *argres, int rw)
|
||||
{
|
||||
esp_app_desc_t cur_app_info;
|
||||
|
|
@ -88,8 +153,12 @@ const rest_var_t ConfigVariables[] =
|
|||
{
|
||||
/*FUNCTIONS*/
|
||||
{ 0, "time", &funct_time, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "wifi_scan", &funct_wifiscan, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "wifi_scan_res", &funct_wifiscanres, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "uptime", &funct_uptime, VAR_FUNCT, R, 0, 0 },
|
||||
|
||||
{ 0, "free_ram", &funct_fram, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "free_ram_min", &funct_fram_min, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "def_interface", &funct_def_interface, VAR_FUNCT, R, 0, 0 },
|
||||
|
||||
{ 0, "fw_rev", &funct_fw_ver, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "idf_rev", &funct_idf_ver, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "build_date", &funct_build_date, VAR_FUNCT, R, 0, 0 },
|
||||
|
|
@ -100,15 +169,12 @@ const rest_var_t ConfigVariables[] =
|
|||
{ 0, "build_date", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 },
|
||||
{ 0, "model_name", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 },
|
||||
|
||||
|
||||
/*VARIABLES*/
|
||||
{ 0, "net_bios_name", &SysConfig.NetBIOSName, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "sys_name", &SysConfig.SysName, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "sys_pass", &SysConfig.SysPass, VAR_STRING, RW, 3, 31 },
|
||||
|
||||
{ 0, "ota_url", &SysConfig.OTAURL, VAR_STRING, RW, 3, 128 },
|
||||
{ 0, "ota_auto_int", &SysConfig.OTAAutoInt, VAR_INT, RW, 0, 65535 },
|
||||
|
||||
{ 0, "ser_num", &SysConfig.SN, VAR_STRING, RW, 10, 10 },
|
||||
{ 0, "dev_id", &SysConfig.ID, VAR_STRING, RW, 8, 8 },
|
||||
{ 0, "color_scheme", &SysConfig.ColorSheme, VAR_INT, RW, 1, 2 },
|
||||
|
|
@ -126,6 +192,7 @@ const rest_var_t ConfigVariables[] =
|
|||
{ 0, "sntp_enab", &SysConfig.sntpClient.Flags1.bIsGlobalEnabled, VAR_BOOL, RW, 0, 1 },
|
||||
|
||||
#if CONFIG_WEBGUIAPP_MQTT_ENABLE
|
||||
{ 0, "mqtt_1_enab", &SysConfig.mqttStation[0].Flags1.bIsGlobalEnabled, VAR_BOOL, RW, 0, 1 },
|
||||
{ 0, "mqtt_1_serv", &SysConfig.mqttStation[0].ServerAddr, VAR_STRING, RW, 3, 63 },
|
||||
{ 0, "mqtt_1_port", &SysConfig.mqttStation[0].ServerPort, VAR_INT, RW, 1, 65534 },
|
||||
{ 0, "mqtt_1_syst", &SysConfig.mqttStation[0].SystemName, VAR_STRING, RW, 3, 31 },
|
||||
|
|
@ -133,8 +200,10 @@ const rest_var_t ConfigVariables[] =
|
|||
{ 0, "mqtt_1_clid", &SysConfig.mqttStation[0].ClientID, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "mqtt_1_uname", &SysConfig.mqttStation[0].UserName, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "mqtt_1_pass", &SysConfig.mqttStation[0].UserPass, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "mqtt_1_stat", &funct_mqtt_1_stat, VAR_FUNCT, R, 0, 0 },
|
||||
|
||||
#if CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM == 2
|
||||
{ 0, "mqtt_2_enab", &SysConfig.mqttStation[1].Flags1.bIsGlobalEnabled, VAR_BOOL, RW, 0, 1 },
|
||||
{ 0, "mqtt_2_serv", &SysConfig.mqttStation[1].ServerAddr, VAR_STRING, RW, 3, 63 },
|
||||
{ 0, "mqtt_2_port", &SysConfig.mqttStation[1].ServerPort, VAR_INT, RW, 1, 65534 },
|
||||
{ 0, "mqtt_2_syst", &SysConfig.mqttStation[1].SystemName, VAR_STRING, RW, 3, 31 },
|
||||
|
|
@ -142,6 +211,7 @@ const rest_var_t ConfigVariables[] =
|
|||
{ 0, "mqtt_2_clid", &SysConfig.mqttStation[1].ClientID, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "mqtt_2_uname", &SysConfig.mqttStation[1].UserName, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "mqtt_2_pass", &SysConfig.mqttStation[1].UserPass, VAR_STRING, RW, 3, 31 },
|
||||
{ 0, "mqtt_2_stat", &funct_mqtt_2_stat, VAR_FUNCT, R, 0, 0 },
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -153,7 +223,7 @@ const rest_var_t ConfigVariables[] =
|
|||
{ 0, "eth_dns1", &SysConfig.wifiSettings.DNSAddr1, VAR_IPADDR,RW, 0, 0 },
|
||||
{ 0, "eth_dns2", &SysConfig.wifiSettings.DNSAddr2, VAR_IPADDR,RW, 0, 0 },
|
||||
{ 0, "eth_dns3", &SysConfig.wifiSettings.DNSAddr3, VAR_IPADDR,RW, 0, 0 },
|
||||
|
||||
{ 0, "eth_stat", &funct_eth_stat, VAR_FUNCT, R, 0, 0 },
|
||||
|
||||
|
||||
|
||||
|
|
@ -176,10 +246,14 @@ const rest_var_t ConfigVariables[] =
|
|||
{ 0, "wifi_enab", &SysConfig.wifiSettings.Flags1.bIsWiFiEnabled, VAR_BOOL, RW, 0, 1 },
|
||||
{ 0, "wifi_isdhcp", &SysConfig.wifiSettings.Flags1.bIsDHCPEnabled, VAR_BOOL, RW, 0, 1 },
|
||||
{ 0, "wifi_power", &SysConfig.wifiSettings.MaxPower, VAR_INT, RW, 0, 80 },
|
||||
{ 0, "wifi_stat", &funct_wifi_stat, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "wifi_scan", &funct_wifiscan, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "wifi_scan_res", &funct_wifiscanres, VAR_FUNCT, R, 0, 0 },
|
||||
{ 0, "wifi_level", &funct_wifi_level, VAR_FUNCT, R, 0, 0 },
|
||||
#endif
|
||||
|
||||
#if CONFIG_WEBGUIAPP_GPRS_ENABLE
|
||||
|
||||
{ 0, "gsm_stat", &funct_gsm_stat, VAR_FUNCT, R, 0, 0 },
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user