mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 12:36:52 +03:00
Update HTML & Firmware (#1671)
This commit is contained in:
@@ -553,6 +553,19 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
|
|||||||
reset_servername(splitted[1]);
|
reset_servername(splitted[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((toUpper(splitted[0]) == "RSSITHREASHOLD") && (splitted.size() > 1))
|
||||||
|
{
|
||||||
|
if (ChangeRSSIThreashold("/sdcard/wlan.ini", atoi(splitted[1].c_str())))
|
||||||
|
{
|
||||||
|
// reboot necessary so that the new wlan.ini is also used !!!
|
||||||
|
fclose(pfile);
|
||||||
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Rebooting to activate new RSSITHREASHOLD ...");
|
||||||
|
esp_restart();
|
||||||
|
hard_restart();
|
||||||
|
doReboot();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ((toUpper(splitted[0]) == "HOSTNAME") && (splitted.size() > 1))
|
if ((toUpper(splitted[0]) == "HOSTNAME") && (splitted.size() > 1))
|
||||||
{
|
{
|
||||||
if (ChangeHostName("/sdcard/wlan.ini", splitted[1]))
|
if (ChangeHostName("/sdcard/wlan.ini", splitted[1]))
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*)
|
|||||||
|
|
||||||
idf_component_register(SRCS ${app_sources}
|
idf_component_register(SRCS ${app_sources}
|
||||||
INCLUDE_DIRS "."
|
INCLUDE_DIRS "."
|
||||||
REQUIRES nvs_flash jomjol_helper jomjol_mqtt)
|
REQUIRES nvs_flash jomjol_helper jomjol_mqtt wpa_supplicant)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,28 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
//////////////////////
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include "freertos/FreeRTOS.h"
|
||||||
|
#include "freertos/task.h"
|
||||||
|
#include "freertos/event_groups.h"
|
||||||
|
#include "esp_wifi.h"
|
||||||
|
#include "esp_wnm.h"
|
||||||
|
#include "esp_rrm.h"
|
||||||
|
#include "esp_mbo.h"
|
||||||
|
#include "esp_event.h"
|
||||||
|
#include "esp_log.h"
|
||||||
|
#include "esp_mac.h"
|
||||||
|
#include "nvs_flash.h"
|
||||||
|
#include "esp_netif.h"
|
||||||
|
|
||||||
|
|
||||||
|
/////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "../../include/defines.h"
|
#include "../../include/defines.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -46,6 +68,243 @@ std::string hostname = "";
|
|||||||
std::string std_hostname = "watermeter";
|
std::string std_hostname = "watermeter";
|
||||||
std::string ipadress = "";
|
std::string ipadress = "";
|
||||||
std::string ssid = "";
|
std::string ssid = "";
|
||||||
|
int RSSIThreashold;
|
||||||
|
|
||||||
|
/////////////////////////////////
|
||||||
|
/////////////////////////////////
|
||||||
|
|
||||||
|
#ifdef WLAN_USE_MESH_ROAMING
|
||||||
|
|
||||||
|
int RSSI_Threshold = WLAN_WIFI_RSSI_THRESHOLD;
|
||||||
|
|
||||||
|
/* rrm ctx */
|
||||||
|
int rrm_ctx = 0;
|
||||||
|
|
||||||
|
/* FreeRTOS event group to signal when we are connected & ready to make a request */
|
||||||
|
static EventGroupHandle_t wifi_event_group;
|
||||||
|
|
||||||
|
/* esp netif object representing the WIFI station */
|
||||||
|
static esp_netif_t *sta_netif = NULL;
|
||||||
|
|
||||||
|
//static const char *TAG = "roaming_example";
|
||||||
|
|
||||||
|
static inline uint32_t WPA_GET_LE32(const uint8_t *a)
|
||||||
|
{
|
||||||
|
return ((uint32_t) a[3] << 24) | (a[2] << 16) | (a[1] << 8) | a[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef WLAN_EID_MEASURE_REPORT
|
||||||
|
#define WLAN_EID_MEASURE_REPORT 39
|
||||||
|
#endif
|
||||||
|
#ifndef MEASURE_TYPE_LCI
|
||||||
|
#define MEASURE_TYPE_LCI 9
|
||||||
|
#endif
|
||||||
|
#ifndef MEASURE_TYPE_LOCATION_CIVIC
|
||||||
|
#define MEASURE_TYPE_LOCATION_CIVIC 11
|
||||||
|
#endif
|
||||||
|
#ifndef WLAN_EID_NEIGHBOR_REPORT
|
||||||
|
#define WLAN_EID_NEIGHBOR_REPORT 52
|
||||||
|
#endif
|
||||||
|
#ifndef ETH_ALEN
|
||||||
|
#define ETH_ALEN 6
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define MAX_NEIGHBOR_LEN 512
|
||||||
|
static char * get_btm_neighbor_list(uint8_t *report, size_t report_len)
|
||||||
|
{
|
||||||
|
size_t len = 0;
|
||||||
|
const uint8_t *data;
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Neighbor Report element (IEEE P802.11-REVmc/D5.0)
|
||||||
|
* BSSID[6]
|
||||||
|
* BSSID Information[4]
|
||||||
|
* Operating Class[1]
|
||||||
|
* Channel Number[1]
|
||||||
|
* PHY Type[1]
|
||||||
|
* Optional Subelements[variable]
|
||||||
|
*/
|
||||||
|
#define NR_IE_MIN_LEN (ETH_ALEN + 4 + 1 + 1 + 1)
|
||||||
|
|
||||||
|
if (!report || report_len == 0) {
|
||||||
|
ESP_LOGI(TAG, "RRM neighbor report is not valid");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *buf = (char*) calloc(1, MAX_NEIGHBOR_LEN);
|
||||||
|
data = report;
|
||||||
|
|
||||||
|
while (report_len >= 2 + NR_IE_MIN_LEN) {
|
||||||
|
const uint8_t *nr;
|
||||||
|
char lci[256 * 2 + 1];
|
||||||
|
char civic[256 * 2 + 1];
|
||||||
|
uint8_t nr_len = data[1];
|
||||||
|
const uint8_t *pos = data, *end;
|
||||||
|
|
||||||
|
if (pos[0] != WLAN_EID_NEIGHBOR_REPORT ||
|
||||||
|
nr_len < NR_IE_MIN_LEN) {
|
||||||
|
ESP_LOGI(TAG, "CTRL: Invalid Neighbor Report element: id=%u len=%u",
|
||||||
|
data[0], nr_len);
|
||||||
|
ret = -1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (2U + nr_len > report_len) {
|
||||||
|
ESP_LOGI(TAG, "CTRL: Invalid Neighbor Report element: id=%u len=%zu nr_len=%u",
|
||||||
|
data[0], report_len, nr_len);
|
||||||
|
ret = -1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
pos += 2;
|
||||||
|
end = pos + nr_len;
|
||||||
|
|
||||||
|
nr = pos;
|
||||||
|
pos += NR_IE_MIN_LEN;
|
||||||
|
|
||||||
|
lci[0] = '\0';
|
||||||
|
civic[0] = '\0';
|
||||||
|
while (end - pos > 2) {
|
||||||
|
uint8_t s_id, s_len;
|
||||||
|
|
||||||
|
s_id = *pos++;
|
||||||
|
s_len = *pos++;
|
||||||
|
if (s_len > end - pos) {
|
||||||
|
ret = -1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
if (s_id == WLAN_EID_MEASURE_REPORT && s_len > 3) {
|
||||||
|
/* Measurement Token[1] */
|
||||||
|
/* Measurement Report Mode[1] */
|
||||||
|
/* Measurement Type[1] */
|
||||||
|
/* Measurement Report[variable] */
|
||||||
|
switch (pos[2]) {
|
||||||
|
case MEASURE_TYPE_LCI:
|
||||||
|
if (lci[0])
|
||||||
|
break;
|
||||||
|
memcpy(lci, pos, s_len);
|
||||||
|
break;
|
||||||
|
case MEASURE_TYPE_LOCATION_CIVIC:
|
||||||
|
if (civic[0])
|
||||||
|
break;
|
||||||
|
memcpy(civic, pos, s_len);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pos += s_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
ESP_LOGI(TAG, "RMM neigbor report bssid=" MACSTR
|
||||||
|
" info=0x%x op_class=%u chan=%u phy_type=%u%s%s%s%s",
|
||||||
|
MAC2STR(nr), WPA_GET_LE32(nr + ETH_ALEN),
|
||||||
|
nr[ETH_ALEN + 4], nr[ETH_ALEN + 5],
|
||||||
|
nr[ETH_ALEN + 6],
|
||||||
|
lci[0] ? " lci=" : "", lci,
|
||||||
|
civic[0] ? " civic=" : "", civic);
|
||||||
|
|
||||||
|
/* neighbor start */
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, " neighbor=");
|
||||||
|
/* bssid */
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, MACSTR, MAC2STR(nr));
|
||||||
|
/* , */
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, ",");
|
||||||
|
/* bssid info */
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, "0x%04x", WPA_GET_LE32(nr + ETH_ALEN));
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, ",");
|
||||||
|
/* operating class */
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, "%u", nr[ETH_ALEN + 4]);
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, ",");
|
||||||
|
/* channel number */
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, "%u", nr[ETH_ALEN + 5]);
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, ",");
|
||||||
|
/* phy type */
|
||||||
|
len += snprintf(buf + len, MAX_NEIGHBOR_LEN - len, "%u", nr[ETH_ALEN + 6]);
|
||||||
|
/* optional elements, skip */
|
||||||
|
|
||||||
|
data = end;
|
||||||
|
report_len -= 2 + nr_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
if (ret < 0) {
|
||||||
|
free(buf);
|
||||||
|
buf = NULL;
|
||||||
|
}
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void neighbor_report_recv_cb(void *ctx, const uint8_t *report, size_t report_len)
|
||||||
|
{
|
||||||
|
int *val = (int*) ctx;
|
||||||
|
uint8_t *pos = (uint8_t *)report;
|
||||||
|
int cand_list = 0;
|
||||||
|
|
||||||
|
if (!report) {
|
||||||
|
ESP_LOGE(TAG, "report is null");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (*val != rrm_ctx) {
|
||||||
|
ESP_LOGE(TAG, "rrm_ctx value didn't match, not initiated by us");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* dump report info */
|
||||||
|
ESP_LOGI(TAG, "rrm: neighbor report len=%d", report_len);
|
||||||
|
ESP_LOG_BUFFER_HEXDUMP(TAG, pos, report_len, ESP_LOG_INFO);
|
||||||
|
|
||||||
|
/* create neighbor list */
|
||||||
|
char *neighbor_list = get_btm_neighbor_list(pos + 1, report_len - 1);
|
||||||
|
|
||||||
|
/* In case neighbor list is not present issue a scan and get the list from that */
|
||||||
|
if (!neighbor_list) {
|
||||||
|
/* issue scan */
|
||||||
|
wifi_scan_config_t params;
|
||||||
|
memset(¶ms, 0, sizeof(wifi_scan_config_t));
|
||||||
|
if (esp_wifi_scan_start(¶ms, true) < 0) {
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
/* cleanup from net802.11 */
|
||||||
|
uint16_t number = 1;
|
||||||
|
wifi_ap_record_t ap_records;
|
||||||
|
esp_wifi_scan_get_ap_records(&number, &ap_records);
|
||||||
|
cand_list = 1;
|
||||||
|
}
|
||||||
|
/* send AP btm query, this will cause STA to roam as well */
|
||||||
|
esp_wnm_send_bss_transition_mgmt_query(REASON_FRAME_LOSS, neighbor_list, cand_list);
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
if (neighbor_list)
|
||||||
|
free(neighbor_list);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void esp_bss_rssi_low_handler(void* arg, esp_event_base_t event_base,
|
||||||
|
int32_t event_id, void* event_data)
|
||||||
|
{
|
||||||
|
wifi_event_bss_rssi_low_t *event = (wifi_event_bss_rssi_low_t*) event_data;
|
||||||
|
|
||||||
|
ESP_LOGI(TAG, "%s:bss rssi is=%d", __func__, event->rssi);
|
||||||
|
/* Lets check channel conditions */
|
||||||
|
rrm_ctx++;
|
||||||
|
if (esp_rrm_send_neighbor_rep_request(neighbor_report_recv_cb, &rrm_ctx) < 0) {
|
||||||
|
/* failed to send neighbor report request */
|
||||||
|
ESP_LOGI(TAG, "failed to send neighbor report request");
|
||||||
|
if (esp_wnm_send_bss_transition_mgmt_query(REASON_FRAME_LOSS, NULL, 0) < 0) {
|
||||||
|
ESP_LOGI(TAG, "failed to send btm query");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//////////////////////////////////
|
||||||
|
//////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
std::string* getIPAddress()
|
std::string* getIPAddress()
|
||||||
{
|
{
|
||||||
@@ -146,9 +405,9 @@ void strinttoip4(const char *ip, int &a, int &b, int &c, int &d) {
|
|||||||
s >> a >> ch >> b >> ch >> c >> ch >> d;
|
s >> a >> ch >> b >> ch >> c >> ch >> d;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname, const char *_ipadr, const char *_gw, const char *_netmask, const char *_dns, int _rssithreashold)
|
||||||
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname, const char *_ipadr, const char *_gw, const char *_netmask, const char *_dns)
|
|
||||||
{
|
{
|
||||||
|
RSSI_Threshold = _rssithreashold;
|
||||||
s_wifi_event_group = xEventGroupCreate();
|
s_wifi_event_group = xEventGroupCreate();
|
||||||
|
|
||||||
ESP_ERROR_CHECK(esp_netif_init());
|
ESP_ERROR_CHECK(esp_netif_init());
|
||||||
@@ -158,20 +417,6 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
|
|||||||
|
|
||||||
if ((_ipadr != NULL) && (_gw != NULL) && (_netmask != NULL))
|
if ((_ipadr != NULL) && (_gw != NULL) && (_netmask != NULL))
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
|
|
||||||
tcpip_adapter_ip_info_t ip_info;
|
|
||||||
int a, b, c, d;
|
|
||||||
strinttoip4(_ipadr, a, b, c, d);
|
|
||||||
IP4_ADDR(&ip_info.ip, a, b, c, d);
|
|
||||||
strinttoip4(_gw, a, b, c, d);
|
|
||||||
IP4_ADDR(&ip_info.gw, a, b, c, d);
|
|
||||||
strinttoip4(_netmask, a, b, c, d);
|
|
||||||
IP4_ADDR(&ip_info.netmask, a, b, c, d);
|
|
||||||
|
|
||||||
tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info);
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
ESP_LOGI(TAG, "set IP %s, GW %s, Netmask %s manual", _ipadr, _gw, _netmask);
|
ESP_LOGI(TAG, "set IP %s, GW %s, Netmask %s manual", _ipadr, _gw, _netmask);
|
||||||
esp_netif_dhcpc_stop(my_sta);
|
esp_netif_dhcpc_stop(my_sta);
|
||||||
@@ -204,11 +449,9 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
|
|||||||
ESP_ERROR_CHECK(esp_netif_set_dns_info(my_sta, ESP_NETIF_DNS_MAIN, &dns_info));
|
ESP_ERROR_CHECK(esp_netif_set_dns_info(my_sta, ESP_NETIF_DNS_MAIN, &dns_info));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
esp_event_handler_instance_t instance_any_id;
|
esp_event_handler_instance_t instance_any_id;
|
||||||
esp_event_handler_instance_t instance_got_ip;
|
esp_event_handler_instance_t instance_got_ip;
|
||||||
|
esp_event_handler_instance_t instance_bss_rssi_low;
|
||||||
ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
|
ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
|
||||||
ESP_EVENT_ANY_ID,
|
ESP_EVENT_ANY_ID,
|
||||||
&event_handler,
|
&event_handler,
|
||||||
@@ -219,6 +462,15 @@ void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostna
|
|||||||
&event_handler,
|
&event_handler,
|
||||||
NULL,
|
NULL,
|
||||||
&instance_got_ip));
|
&instance_got_ip));
|
||||||
|
|
||||||
|
#ifdef WLAN_USE_MESH_ROAMING
|
||||||
|
ESP_ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT,
|
||||||
|
WIFI_EVENT_STA_BSS_RSSI_LOW,
|
||||||
|
&esp_bss_rssi_low_handler,
|
||||||
|
NULL,
|
||||||
|
&instance_bss_rssi_low));
|
||||||
|
#endif
|
||||||
|
|
||||||
wifi_config_t wifi_config = { };
|
wifi_config_t wifi_config = { };
|
||||||
|
|
||||||
strcpy((char*)wifi_config.sta.ssid, (const char*)_ssid);
|
strcpy((char*)wifi_config.sta.ssid, (const char*)_ssid);
|
||||||
@@ -286,12 +538,12 @@ int get_WIFI_RSSI()
|
|||||||
|
|
||||||
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname)
|
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname)
|
||||||
{
|
{
|
||||||
wifi_init_sta(_ssid, _password, _hostname, NULL, NULL, NULL, NULL);
|
wifi_init_sta(_ssid, _password, _hostname, NULL, NULL, NULL, NULL, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wifi_init_sta(const char *_ssid, const char *_password)
|
void wifi_init_sta(const char *_ssid, const char *_password)
|
||||||
{
|
{
|
||||||
wifi_init_sta(_ssid, _password, NULL, NULL, NULL, NULL, NULL);
|
wifi_init_sta(_ssid, _password, NULL, NULL, NULL, NULL, NULL, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool getWIFIisConnected() {
|
bool getWIFIisConnected() {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname, const char *_ipadr, const char *_gw, const char *_netmask, const char *_dns);
|
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname, const char *_ipadr, const char *_gw, const char *_netmask, const char *_dns, int _rssithreashold);
|
||||||
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname);
|
void wifi_init_sta(const char *_ssid, const char *_password, const char *_hostname);
|
||||||
void wifi_init_sta(const char *_ssid, const char *_password);
|
void wifi_init_sta(const char *_ssid, const char *_password);
|
||||||
|
|
||||||
@@ -16,5 +16,6 @@ bool getWIFIisConnected();
|
|||||||
|
|
||||||
extern std::string hostname;
|
extern std::string hostname;
|
||||||
extern std::string std_hostname;
|
extern std::string std_hostname;
|
||||||
|
extern int RSSIThreashold;
|
||||||
|
|
||||||
#endif //CONNECT_WLAN_H
|
#endif //CONNECT_WLAN_H
|
||||||
@@ -41,7 +41,7 @@ std::vector<string> ZerlegeZeileWLAN(std::string input, std::string _delimiter =
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_hostname, char *&_ipadr, char *&_gw, char *&_netmask, char *&_dns)
|
void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_hostname, char *&_ipadr, char *&_gw, char *&_netmask, char *&_dns, int &_rssithreashold)
|
||||||
{
|
{
|
||||||
std::string ssid = "";
|
std::string ssid = "";
|
||||||
std::string passphrase = "";
|
std::string passphrase = "";
|
||||||
@@ -49,6 +49,7 @@ void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_ho
|
|||||||
std::string gw = "";
|
std::string gw = "";
|
||||||
std::string netmask = "";
|
std::string netmask = "";
|
||||||
std::string dns = "";
|
std::string dns = "";
|
||||||
|
int rssithreshold = 0;
|
||||||
|
|
||||||
std::string line = "";
|
std::string line = "";
|
||||||
std::vector<string> splitted;
|
std::vector<string> splitted;
|
||||||
@@ -87,6 +88,15 @@ void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_ho
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((splitted.size() > 1) && (toUpper(splitted[0]) == "RSSITHREASHOLD")){
|
||||||
|
string _s = trim(splitted[1]);
|
||||||
|
if ((_s[0] == '"') && (_s[_s.length()-1] == '"')){
|
||||||
|
_s = _s.substr(1, ssid.length()-2);
|
||||||
|
}
|
||||||
|
rssithreshold = atoi(_s.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if ((splitted.size() > 1) && (toUpper(splitted[0]) == "PASSWORD")){
|
if ((splitted.size() > 1) && (toUpper(splitted[0]) == "PASSWORD")){
|
||||||
passphrase = splitted[1];
|
passphrase = splitted[1];
|
||||||
if ((passphrase[0] == '"') && (passphrase[passphrase.length()-1] == '"')){
|
if ((passphrase[0] == '"') && (passphrase[passphrase.length()-1] == '"')){
|
||||||
@@ -180,6 +190,9 @@ void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_ho
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
_dns = NULL;
|
_dns = NULL;
|
||||||
|
|
||||||
|
_rssithreashold = rssithreshold;
|
||||||
|
RSSIThreashold = rssithreshold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -256,3 +269,75 @@ bool ChangeHostName(std::string fn, std::string _newhostname)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
bool ChangeRSSIThreashold(std::string fn, int _newrssithreashold)
|
||||||
|
{
|
||||||
|
if (RSSIThreashold == _newrssithreashold)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
string line = "";
|
||||||
|
std::vector<string> splitted;
|
||||||
|
|
||||||
|
bool found = false;
|
||||||
|
|
||||||
|
std::vector<string> neuesfile;
|
||||||
|
|
||||||
|
FILE* pFile;
|
||||||
|
fn = FormatFileName(fn);
|
||||||
|
pFile = fopen(fn.c_str(), "r");
|
||||||
|
|
||||||
|
ESP_LOGD(TAG, "file loaded\n");
|
||||||
|
|
||||||
|
if (pFile == NULL)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
char zw[1024];
|
||||||
|
fgets(zw, 1024, pFile);
|
||||||
|
line = std::string(zw);
|
||||||
|
|
||||||
|
while ((line.size() > 0) || !(feof(pFile)))
|
||||||
|
{
|
||||||
|
ESP_LOGD(TAG, "%s", line.c_str());
|
||||||
|
splitted = ZerlegeZeileWLAN(line, "=");
|
||||||
|
splitted[0] = trim(splitted[0], " ");
|
||||||
|
|
||||||
|
if ((splitted.size() > 1) && (toUpper(splitted[0]) == "RSSITHREASHOLD")){
|
||||||
|
line = "RSSIThreashold = " + to_string(_newrssithreashold) + "\n";
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
neuesfile.push_back(line);
|
||||||
|
|
||||||
|
if (fgets(zw, 1024, pFile) == NULL)
|
||||||
|
{
|
||||||
|
line = "";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
line = std::string(zw);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found)
|
||||||
|
{
|
||||||
|
line = "RSSIThreashold = " + to_string(_newrssithreashold) + "\n";
|
||||||
|
neuesfile.push_back(line);
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose(pFile);
|
||||||
|
|
||||||
|
pFile = fopen(fn.c_str(), "w+");
|
||||||
|
|
||||||
|
for (int i = 0; i < neuesfile.size(); ++i)
|
||||||
|
{
|
||||||
|
ESP_LOGD(TAG, "%s", neuesfile[i].c_str());
|
||||||
|
fputs(neuesfile[i].c_str(), pFile);
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose(pFile);
|
||||||
|
|
||||||
|
ESP_LOGD(TAG, "*** RSSIThreashold update done ***");
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,10 @@
|
|||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_hostname, char *&_ipadr, char *&_gw, char *&_netmask, char *&_dns);
|
void LoadWlanFromFile(std::string fn, char *&_ssid, char *&_password, char *&_hostname, char *&_ipadr, char *&_gw, char *&_netmask, char *&_dns, int &_rssithreashold);
|
||||||
|
|
||||||
bool ChangeHostName(std::string fn, std::string _newhostname);
|
bool ChangeHostName(std::string fn, std::string _newhostname);
|
||||||
|
bool ChangeRSSIThreashold(std::string fn, int _newrssithreashold);
|
||||||
|
|
||||||
|
|
||||||
#endif //READ_WLANINI_H
|
#endif //READ_WLANINI_H
|
||||||
@@ -102,6 +102,8 @@
|
|||||||
#define SUPRESS_TFLITE_ERRORS // use, to avoid error messages from TFLITE
|
#define SUPRESS_TFLITE_ERRORS // use, to avoid error messages from TFLITE
|
||||||
|
|
||||||
//connect_wlan
|
//connect_wlan
|
||||||
|
#define WLAN_USE_MESH_ROAMING
|
||||||
|
#define WLAN_WIFI_RSSI_THRESHOLD -50
|
||||||
#define EXAMPLE_ESP_MAXIMUM_RETRY 1000
|
#define EXAMPLE_ESP_MAXIMUM_RETRY 1000
|
||||||
/* The event group allows multiple bits for each event, but we only care about two events:
|
/* The event group allows multiple bits for each event, but we only care about two events:
|
||||||
* - we are connected to the AP with an IP
|
* - we are connected to the AP with an IP
|
||||||
|
|||||||
@@ -174,8 +174,10 @@ extern "C" void app_main(void)
|
|||||||
CheckOTAUpdate();
|
CheckOTAUpdate();
|
||||||
CheckUpdate();
|
CheckUpdate();
|
||||||
|
|
||||||
char *ssid = NULL, *passwd = NULL, *hostname = NULL, *ip = NULL, *gateway = NULL, *netmask = NULL, *dns = NULL;
|
char *ssid = NULL, *passwd = NULL, *hostname = NULL, *ip = NULL, *gateway = NULL, *netmask = NULL, *dns = NULL; int rssithreashold = 0;
|
||||||
LoadWlanFromFile("/sdcard/wlan.ini", ssid, passwd, hostname, ip, gateway, netmask, dns);
|
LoadWlanFromFile("/sdcard/wlan.ini", ssid, passwd, hostname, ip, gateway, netmask, dns, rssithreashold);
|
||||||
|
|
||||||
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "WLAN-Settings - RSSI-Threashold: " + to_string(rssithreashold));
|
||||||
|
|
||||||
if (ssid != NULL && passwd != NULL)
|
if (ssid != NULL && passwd != NULL)
|
||||||
#ifdef __HIDE_PASSWORD
|
#ifdef __HIDE_PASSWORD
|
||||||
@@ -198,7 +200,7 @@ extern "C" void app_main(void)
|
|||||||
ESP_LOGD(TAG, "DNS IP: %s", dns);
|
ESP_LOGD(TAG, "DNS IP: %s", dns);
|
||||||
|
|
||||||
|
|
||||||
wifi_init_sta(ssid, passwd, hostname, ip, gateway, netmask, dns);
|
wifi_init_sta(ssid, passwd, hostname, ip, gateway, netmask, dns, rssithreashold);
|
||||||
|
|
||||||
|
|
||||||
xDelay = 2000 / portTICK_PERIOD_MS;
|
xDelay = 2000 / portTICK_PERIOD_MS;
|
||||||
|
|||||||
1388
code/sdkconfig.esp32cam.old
Normal file
1388
code/sdkconfig.esp32cam.old
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1371,6 +1371,18 @@ textarea {
|
|||||||
Hostname for server - will be transfered to wlan.ini at next startup)
|
Hostname for server - will be transfered to wlan.ini at next startup)
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr class="expert" id="System_RSSIThreashold">
|
||||||
|
<td class="indent1">
|
||||||
|
<input type="checkbox" id="System_RSSIThreashold_enabled" value="1" onclick = 'InvertEnableItem("System", "RSSIThreashold")' unchecked >
|
||||||
|
<label for=System_RSSIThreashold_enabled><class id="System_RSSIThreashold_text" style="color:black;">RSSIThreashold</class></label>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="number" name="name" id="System_RSSIThreashold_value1" min="-100" max="0" step="1">
|
||||||
|
<td class="description">
|
||||||
|
WLAN Mesh Parameter: Threashold for RSSI value to check for start switching access point in a mesh system.
|
||||||
|
Possible values: -100 to 0, 0 = disabled - Value will be transfered to wlan.ini at next startup)
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
@@ -1821,6 +1833,7 @@ function UpdateInput() {
|
|||||||
WriteParameter(param, category, "System", "TimeZone", true);
|
WriteParameter(param, category, "System", "TimeZone", true);
|
||||||
WriteParameter(param, category, "System", "Hostname", true);
|
WriteParameter(param, category, "System", "Hostname", true);
|
||||||
WriteParameter(param, category, "System", "TimeServer", true);
|
WriteParameter(param, category, "System", "TimeServer", true);
|
||||||
|
WriteParameter(param, category, "System", "RSSIThreashold", true);
|
||||||
|
|
||||||
WriteModelFiles();
|
WriteModelFiles();
|
||||||
}
|
}
|
||||||
@@ -1949,6 +1962,7 @@ function ReadParameterAll()
|
|||||||
ReadParameter(param, "System", "TimeZone", true);
|
ReadParameter(param, "System", "TimeZone", true);
|
||||||
ReadParameter(param, "System", "Hostname", true);
|
ReadParameter(param, "System", "Hostname", true);
|
||||||
ReadParameter(param, "System", "TimeServer", true);
|
ReadParameter(param, "System", "TimeServer", true);
|
||||||
|
ReadParameter(param, "System", "RSSIThreashold", true);
|
||||||
|
|
||||||
UpdateInputIndividual();
|
UpdateInputIndividual();
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ function getbasepath(){
|
|||||||
{
|
{
|
||||||
// host = "http://192.168.2.219"; // jomjol interner test
|
// host = "http://192.168.2.219"; // jomjol interner test
|
||||||
// host = "http://192.168.178.46"; // jomjol interner test
|
// host = "http://192.168.178.46"; // jomjol interner test
|
||||||
host = "http://192.168.178.46"; // jomjol interner Real
|
host = "http://192.168.178.44"; // jomjol interner Real
|
||||||
// host = "http://192.168.43.191";
|
// host = "http://192.168.43.191";
|
||||||
// host = "."; // jomjol interner localhost
|
// host = "."; // jomjol interner localhost
|
||||||
|
|
||||||
|
|||||||
@@ -256,6 +256,7 @@ function ParseConfig() {
|
|||||||
ParamAddValue(param, catname, "TimeServer");
|
ParamAddValue(param, catname, "TimeServer");
|
||||||
ParamAddValue(param, catname, "AutoAdjustSummertime");
|
ParamAddValue(param, catname, "AutoAdjustSummertime");
|
||||||
ParamAddValue(param, catname, "Hostname");
|
ParamAddValue(param, catname, "Hostname");
|
||||||
|
ParamAddValue(param, catname, "RSSIThreashold");
|
||||||
ParamAddValue(param, catname, "SetupMode");
|
ParamAddValue(param, catname, "SetupMode");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user