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

added setting for delayed AP disable

Browse Source
This commit is contained in:
Bogdan Pilyugin 2023-12-28 22:07:31 +02:00
parent 114321c91b
commit 096cb60633
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/SysConfiguration.h
View File

@ -167,7 +167,8 @@ typedef struct
bool bIsDHCPEnabled; bool bIsDHCPEnabled;
bool bIsWiFiEnabled; bool bIsWiFiEnabled;
} Flags1; // Flag structure } Flags1; // Flag structure
uint8_t MaxPower; int MaxPower;
int AP_disab_time;
} wifiSettings; } wifiSettings;
#endif #endif

2
src/RestApiHandler.c
View File

@ -464,12 +464,14 @@ const rest_var_t SystemVariables[] =
{ 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_disab_time", &SysConfig.wifiSettings.AP_disab_time, VAR_INT, RW, 0, 60 },
{ 0, "wifi_sta_mac", &funct_wifi_sta_mac, VAR_FUNCT, R, 0, 0 }, { 0, "wifi_sta_mac", &funct_wifi_sta_mac, VAR_FUNCT, R, 0, 0 },
{ 0, "wifi_ap_mac", &funct_wifi_ap_mac, VAR_FUNCT, R, 0, 0 }, { 0, "wifi_ap_mac", &funct_wifi_ap_mac, VAR_FUNCT, R, 0, 0 },
{ 0, "wifi_stat", &funct_wifi_stat, VAR_FUNCT, R, 0, 0 }, { 0, "wifi_stat", &funct_wifi_stat, VAR_FUNCT, R, 0, 0 },
{ 0, "wifi_scan", &funct_wifiscan, 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_scan_res", &funct_wifiscanres, VAR_FUNCT, R, 0, 0 },
{ 0, "wifi_level", &funct_wifi_level, 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

1
src/SysConfiguration.c
View File

@ -310,6 +310,7 @@ static void ResetSysConfig(SYS_CONFIG *Conf)
esp_netif_str_to_ip4(CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT, esp_netif_str_to_ip4(CONFIG_WEBGUIAPP_DNS3_ADDRESS_DEFAULT,
(esp_ip4_addr_t*) &Conf->wifiSettings.DNSAddr3); (esp_ip4_addr_t*) &Conf->wifiSettings.DNSAddr3);
Conf->wifiSettings.MaxPower = 80; Conf->wifiSettings.MaxPower = 80;
Conf->wifiSettings.AP_disab_time = 10;
#endif #endif
#if CONFIG_WEBGUIAPP_ETHERNET_ENABLE #if CONFIG_WEBGUIAPP_ETHERNET_ENABLE

5
src/WiFiTransport.c
View File

@ -50,7 +50,7 @@ static bool isWiFiRunning = false;
static bool isWiFiConnected = false; static bool isWiFiConnected = false;
static bool isWiFiGotIp = false; static bool isWiFiGotIp = false;
static bool isWiFiFail = false; static bool isWiFiFail = false;
static int TempAPCounter = WIFI_AP_ONBOOT_TIME; static int TempAPCounter = 0;
#define DEFAULT_SCAN_LIST_SIZE 20 #define DEFAULT_SCAN_LIST_SIZE 20
static wifi_ap_record_t ap_info[DEFAULT_SCAN_LIST_SIZE]; static wifi_ap_record_t ap_info[DEFAULT_SCAN_LIST_SIZE];
@ -508,6 +508,7 @@ static void WiFiControlTask(void *arg)
} }
isWiFiRunning = true; isWiFiRunning = true;
//WiFi in work service //WiFi in work service
TempAPCounter = GetSysConf()->wifiSettings.AP_disab_time * 60;
while (isWiFiRunning) while (isWiFiRunning)
{ {
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
@ -538,7 +539,7 @@ static void WiFiControlTask(void *arg)
if (--TempAPCounter <= 0) if (--TempAPCounter <= 0)
{ {
if (GetAPClientsNumber() > 0) if (GetAPClientsNumber() > 0)
TempAPCounter = WIFI_AP_ONBOOT_TIME; TempAPCounter = GetSysConf()->wifiSettings.AP_disab_time * 60;
else else
{ {
WiFiStopAP(); WiFiStopAP();