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

added variables and handlers

Browse Source
This commit is contained in:
Bogdan Pilyugin 2023-08-10 16:19:57 +02:00
parent 0bb4e3fed1
commit d244bb3487
1 changed files with 130 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
src/RestApiHandler.c
View File

@ -29,9 +29,52 @@
#include "esp_ota_ops.h" #include "esp_ota_ops.h"
#include "romfs.h" #include "romfs.h"
#include "esp_idf_version.h" #include "esp_idf_version.h"
#include "NetTransport.h"
extern SYS_CONFIG SysConfig; 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) static void funct_time(char *argres, int rw)
{ {
time_t now; time_t now;
@ -39,6 +82,28 @@ static void funct_time(char *argres, int rw)
snprintf(argres, MAX_DYNVAR_LENGTH, "%d", (int) now); 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) static void funct_idf_ver(char *argres, int rw)
{ {
esp_app_desc_t cur_app_info; esp_app_desc_t cur_app_info;
@ -75,7 +140,7 @@ static void funct_wifiscan(char *argres, int rw)
static void funct_wifiscanres(char *argres, int rw) static void funct_wifiscanres(char *argres, int rw)
{ {
int arg = atoi(argres); int arg = atoi(argres);
wifi_ap_record_t * Rec = GetWiFiAPRecord(arg); wifi_ap_record_t *Rec = GetWiFiAPRecord(arg);
if (!Rec) if (!Rec)
return; return;
snprintf(argres, MAX_DYNVAR_LENGTH, "{\"ssid\":\"%s\",\"rssi\":%i,\"ch\":%d}", Rec->ssid, Rec->rssi, snprintf(argres, MAX_DYNVAR_LENGTH, "{\"ssid\":\"%s\",\"rssi\":%i,\"ch\":%d}", Rec->ssid, Rec->rssi,
@ -88,60 +153,65 @@ const rest_var_t ConfigVariables[] =
{ {
/*FUNCTIONS*/ /*FUNCTIONS*/
{ 0, "time", &funct_time, VAR_FUNCT, R, 0, 0 }, { 0, "time", &funct_time, VAR_FUNCT, R, 0, 0 },
{ 0, "wifi_scan", &funct_wifiscan, VAR_FUNCT, R, 0, 0 }, { 0, "uptime", &funct_uptime, VAR_FUNCT, R, 0, 0 },
{ 0, "wifi_scan_res", &funct_wifiscanres, 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, "fw_rev", &funct_fw_ver, VAR_FUNCT, R, 0, 0 },
{ 0, "idf_rev", &funct_idf_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 }, { 0, "build_date", &funct_build_date, VAR_FUNCT, R, 0, 0 },
/*CONSTANTS*/ /*CONSTANTS*/
{ 0, "model_name", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 }, { 0, "model_name", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 },
{ 0, "hw_rev", ((int*)&hw_rev), VAR_INT, R, 1, 1024 }, { 0, "hw_rev", ((int*) &hw_rev), VAR_INT, R, 1, 1024 },
{ 0, "build_date", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 }, { 0, "build_date", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 },
{ 0, "model_name", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 }, { 0, "model_name", CONFIG_DEVICE_MODEL_NAME, VAR_STRING, R, 1, 64 },
/*VARIABLES*/ /*VARIABLES*/
{ 0, "net_bios_name", &SysConfig.NetBIOSName, VAR_STRING, RW, 3, 31 }, { 0, "net_bios_name", &SysConfig.NetBIOSName, VAR_STRING, RW, 3, 31 },
{ 0, "sys_name", &SysConfig.SysName, 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, "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 },
{ 0, "ota_url", &SysConfig.OTAURL, VAR_STRING,RW, 3, 128 }, { 0, "ota_enab", &SysConfig.Flags1.bIsOTAEnabled, VAR_BOOL, RW, 0, 1 },
{ 0, "ota_auto_int", &SysConfig.OTAAutoInt, VAR_INT,RW, 0, 65535 }, { 0, "res_ota_enab", &SysConfig.Flags1.bIsResetOTAEnabled, VAR_BOOL, RW, 0, 1 },
{ 0, "led_enab", &SysConfig.Flags1.bIsLedsEnabled, VAR_BOOL, RW, 0, 1 },
{ 0, "lora_confirm", &SysConfig.Flags1.bIsLoRaConfirm, VAR_BOOL, RW, 0, 1 },
{ 0, "tcp_confirm", &SysConfig.Flags1.bIsTCPConfirm, VAR_BOOL, RW, 0, 1 },
{ 0, "ser_num", &SysConfig.SN, VAR_STRING,RW, 10, 10 }, { 0, "sntp_timezone", &SysConfig.sntpClient.TimeZone, VAR_INT, RW, 0, 23 },
{ 0, "dev_id", &SysConfig.ID, VAR_STRING,RW, 8, 8 }, { 0, "sntp_serv1", &SysConfig.sntpClient.SntpServerAdr, VAR_STRING, RW, 3, 32 },
{ 0, "color_scheme", &SysConfig.ColorSheme, VAR_INT,RW, 1, 2 }, { 0, "sntp_serv2", &SysConfig.sntpClient.SntpServer2Adr, VAR_STRING, RW, 3, 32 },
{ 0, "sntp_serv3", &SysConfig.sntpClient.SntpServer3Adr, VAR_STRING, RW, 3, 32 },
{ 0, "ota_enab", &SysConfig.Flags1.bIsOTAEnabled, VAR_BOOL,RW, 0, 1 }, { 0, "sntp_enab", &SysConfig.sntpClient.Flags1.bIsGlobalEnabled, VAR_BOOL, RW, 0, 1 },
{ 0, "res_ota_enab", &SysConfig.Flags1.bIsResetOTAEnabled, VAR_BOOL,RW, 0, 1 },
{ 0, "led_enab", &SysConfig.Flags1.bIsLedsEnabled, VAR_BOOL,RW, 0, 1 },
{ 0, "lora_confirm", &SysConfig.Flags1.bIsLoRaConfirm, VAR_BOOL,RW, 0, 1 },
{ 0, "tcp_confirm", &SysConfig.Flags1.bIsTCPConfirm, VAR_BOOL,RW, 0, 1 },
{ 0, "sntp_timezone", &SysConfig.sntpClient.TimeZone, VAR_INT,RW, 0, 23 },
{ 0, "sntp_serv1", &SysConfig.sntpClient.SntpServerAdr, VAR_STRING,RW, 3, 32 },
{ 0, "sntp_serv2", &SysConfig.sntpClient.SntpServer2Adr, VAR_STRING,RW, 3, 32 },
{ 0, "sntp_serv3", &SysConfig.sntpClient.SntpServer3Adr, VAR_STRING,RW, 3, 32 },
{ 0, "sntp_enab", &SysConfig.sntpClient.Flags1.bIsGlobalEnabled, VAR_BOOL,RW, 0, 1 },
#if CONFIG_WEBGUIAPP_MQTT_ENABLE #if CONFIG_WEBGUIAPP_MQTT_ENABLE
{ 0, "mqtt_1_serv", &SysConfig.mqttStation[0].ServerAddr, VAR_STRING,RW, 3, 63 }, { 0, "mqtt_1_enab", &SysConfig.mqttStation[0].Flags1.bIsGlobalEnabled, VAR_BOOL, RW, 0, 1 },
{ 0, "mqtt_1_port", &SysConfig.mqttStation[0].ServerPort, VAR_INT,RW, 1, 65534 }, { 0, "mqtt_1_serv", &SysConfig.mqttStation[0].ServerAddr, VAR_STRING, RW, 3, 63 },
{ 0, "mqtt_1_syst", &SysConfig.mqttStation[0].SystemName, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_1_port", &SysConfig.mqttStation[0].ServerPort, VAR_INT, RW, 1, 65534 },
{ 0, "mqtt_1_group", &SysConfig.mqttStation[0].GroupName, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_1_syst", &SysConfig.mqttStation[0].SystemName, VAR_STRING, RW, 3, 31 },
{ 0, "mqtt_1_clid", &SysConfig.mqttStation[0].ClientID, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_1_group", &SysConfig.mqttStation[0].GroupName, VAR_STRING, RW, 3, 31 },
{ 0, "mqtt_1_uname", &SysConfig.mqttStation[0].UserName, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_1_clid", &SysConfig.mqttStation[0].ClientID, VAR_STRING, RW, 3, 31 },
{ 0, "mqtt_1_pass", &SysConfig.mqttStation[0].UserPass, 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 #if CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM == 2
{ 0, "mqtt_2_serv", &SysConfig.mqttStation[1].ServerAddr, VAR_STRING,RW, 3, 63 }, { 0, "mqtt_2_enab", &SysConfig.mqttStation[1].Flags1.bIsGlobalEnabled, VAR_BOOL, RW, 0, 1 },
{ 0, "mqtt_2_port", &SysConfig.mqttStation[1].ServerPort, VAR_INT,RW, 1, 65534 }, { 0, "mqtt_2_serv", &SysConfig.mqttStation[1].ServerAddr, VAR_STRING, RW, 3, 63 },
{ 0, "mqtt_2_syst", &SysConfig.mqttStation[1].SystemName, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_2_port", &SysConfig.mqttStation[1].ServerPort, VAR_INT, RW, 1, 65534 },
{ 0, "mqtt_2_group", &SysConfig.mqttStation[1].GroupName, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_2_syst", &SysConfig.mqttStation[1].SystemName, VAR_STRING, RW, 3, 31 },
{ 0, "mqtt_2_clid", &SysConfig.mqttStation[1].ClientID, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_2_group", &SysConfig.mqttStation[1].GroupName, VAR_STRING, RW, 3, 31 },
{ 0, "mqtt_2_uname", &SysConfig.mqttStation[1].UserName, VAR_STRING,RW, 3, 31 }, { 0, "mqtt_2_clid", &SysConfig.mqttStation[1].ClientID, VAR_STRING, RW, 3, 31 },
{ 0, "mqtt_2_pass", &SysConfig.mqttStation[1].UserPass, 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
#endif #endif
@ -153,33 +223,37 @@ const rest_var_t ConfigVariables[] =
{ 0, "eth_dns1", &SysConfig.wifiSettings.DNSAddr1, VAR_IPADDR,RW, 0, 0 }, { 0, "eth_dns1", &SysConfig.wifiSettings.DNSAddr1, VAR_IPADDR,RW, 0, 0 },
{ 0, "eth_dns2", &SysConfig.wifiSettings.DNSAddr2, 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_dns3", &SysConfig.wifiSettings.DNSAddr3, VAR_IPADDR,RW, 0, 0 },
{ 0, "eth_stat", &funct_eth_stat, VAR_FUNCT, R, 0, 0 },
#endif #endif
#if CONFIG_WEBGUIAPP_WIFI_ENABLE #if CONFIG_WEBGUIAPP_WIFI_ENABLE
{ 0, "wifi_mode", &SysConfig.wifiSettings.WiFiMode, VAR_INT,RW, 1, 3 }, { 0, "wifi_mode", &SysConfig.wifiSettings.WiFiMode, VAR_INT, RW, 1, 3 },
{ 0, "wifi_sta_ip", &SysConfig.wifiSettings.InfIPAddr, VAR_IPADDR,RW, 0, 0 }, { 0, "wifi_sta_ip", &SysConfig.wifiSettings.InfIPAddr, VAR_IPADDR, RW, 0, 0 },
{ 0, "wifi_sta_mask", &SysConfig.wifiSettings.InfMask, VAR_IPADDR,RW, 0, 0 }, { 0, "wifi_sta_mask", &SysConfig.wifiSettings.InfMask, VAR_IPADDR, RW, 0, 0 },
{ 0, "wifi_sta_gw", &SysConfig.wifiSettings.InfGateway, VAR_IPADDR,RW, 0, 0 }, { 0, "wifi_sta_gw", &SysConfig.wifiSettings.InfGateway, VAR_IPADDR, RW, 0, 0 },
{ 0, "wifi_ap_ip", &SysConfig.wifiSettings.ApIPAddr, VAR_IPADDR,RW, 0, 0 }, { 0, "wifi_ap_ip", &SysConfig.wifiSettings.ApIPAddr, VAR_IPADDR, RW, 0, 0 },
{ 0, "wifi_dns1", &SysConfig.wifiSettings.DNSAddr1, VAR_IPADDR,RW, 0, 0 }, { 0, "wifi_dns1", &SysConfig.wifiSettings.DNSAddr1, VAR_IPADDR, RW, 0, 0 },
{ 0, "wifi_dns2", &SysConfig.wifiSettings.DNSAddr2, VAR_IPADDR,RW, 0, 0 }, { 0, "wifi_dns2", &SysConfig.wifiSettings.DNSAddr2, VAR_IPADDR, RW, 0, 0 },
{ 0, "wifi_dns3", &SysConfig.wifiSettings.DNSAddr3, VAR_IPADDR,RW, 0, 0 }, { 0, "wifi_dns3", &SysConfig.wifiSettings.DNSAddr3, VAR_IPADDR, RW, 0, 0 },
{ 0, "wifi_sta_ssid", &SysConfig.wifiSettings.InfSSID, VAR_STRING,RW, 3, 31 }, { 0, "wifi_sta_ssid", &SysConfig.wifiSettings.InfSSID, VAR_STRING, RW, 3, 31 },
{ 0, "wifi_sta_key", &SysConfig.wifiSettings.InfSecurityKey, VAR_STRING,RW, 8, 31 }, { 0, "wifi_sta_key", &SysConfig.wifiSettings.InfSecurityKey, VAR_STRING, RW, 8, 31 },
{ 0, "wifi_ap_ssid", &SysConfig.wifiSettings.ApSSID, VAR_STRING,RW, 3, 31 }, { 0, "wifi_ap_ssid", &SysConfig.wifiSettings.ApSSID, VAR_STRING, RW, 3, 31 },
{ 0, "wifi_ap_key", &SysConfig.wifiSettings.ApSecurityKey, VAR_STRING,RW, 8, 31 }, { 0, "wifi_ap_key", &SysConfig.wifiSettings.ApSecurityKey, VAR_STRING, RW, 8, 31 },
{ 0, "wifi_enab", &SysConfig.wifiSettings.Flags1.bIsWiFiEnabled, VAR_BOOL,RW, 0, 1 }, { 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_isdhcp", &SysConfig.wifiSettings.Flags1.bIsDHCPEnabled, VAR_BOOL, RW, 0, 1 },
{ 0, "wifi_power", &SysConfig.wifiSettings.MaxPower, VAR_INT,RW, 0, 80 }, { 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 #endif
#if CONFIG_WEBGUIAPP_GPRS_ENABLE #if CONFIG_WEBGUIAPP_GPRS_ENABLE
{ 0, "gsm_stat", &funct_gsm_stat, VAR_FUNCT, R, 0, 0 },
#endif #endif
@ -198,7 +272,7 @@ esp_err_t SetConfVar(char *name, char *val, rest_var_types *tp)
} }
if (!V) if (!V)
return ESP_ERR_NOT_FOUND; return ESP_ERR_NOT_FOUND;
if(V->varattr == R) if (V->varattr == R)
return ESP_OK; return ESP_OK;
int constr; int constr;
*tp = V->vartype; *tp = V->vartype;