8000 Fixes, optimizations and additions to WiFi by Eloquence4 · Pull Request #86 · nkolban/esp32-snippets · GitHub
[go: up one dir, main page]
Skip to content

Fixes, optimizations and additions to WiFi #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 26, 2017
Merged

Fixes, optimizations and additions to WiFi #86

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e777afe
Fix a memory leak in WiFi
Eloquence4 Sep 26, 2017
8c2ab32
Remove an unneeded if statemenet
Eloquence4 Sep 26, 2017
fbc7022
Frees the memory used by the event handler on destruction
Eloquence4 Sep 26, 2017
4c04ce1
More optimizations, setIPInfo now enables or disables DHCP
Eloquence4 Sep 26, 2017
2174296
File i forgot to stage in the last commit
Eloquence4 Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
File i forgot to stage in the last commit
  • Loading branch information
@Eloquence4
Eloquence4 committed Sep 26, 2017
commit 2174296149008dba40fcaf76fe617f45199fb57b
86 changes: 58 additions & 28 deletions cpp_utils/WiFi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,13 @@ static void setDNSServer(char *ip) {
}
*/


}
*/

/**
* @brief Creates and uses a default event handler
*/
WiFi::WiFi()
: ip("")
, gw("")
, netmask("")
: ip(0)
, gw(0)
, netmask(0)
, wifiEventHandler(nullptr)
{
wifiEventHandler = new WiFiEventHandler();
Expand Down Expand Up @@ -86,10 +82,14 @@ void WiFi::addDNSServer(const std::string& ip) {
} // addDNSServer

void WiFi::addDNSServer(const char* ip) {
ip_addr_t dnsserver;
ESP_LOGD(tag, "Setting DNS[%d] to %s", m_dnsCount, ip);
inet_pton(AF_INET, ip, &dnsserver);
::dns_setserver(m_dnsCount, &dnsserver);
ip_addr_t dns_server;
if(inet_pton(AF_INET, ip, &dns_server))
addDNSServer(ip);
} // addDNSServer

void WiFi::addDNSServer(ip_addr_t ip) {
ESP_LOGD(tag, "Setting DNS[%d] to %d.%d.%d.%d", m_dnsCount, ((uint8_t*)(&ip))[0], ((uint8_t*)(&ip))[1], ((uint8_t*)(&ip))[2], ((uint8_t*)(&ip))[3]);
::dns_setserver(m_dnsCount, &ip);
m_dnsCount++;
m_dnsCount %= 2;
} // addDNSServer
Expand All @@ -115,10 +115,14 @@ void 10000 WiFi::setDNSServer(int numdns, const std::string& ip) {
} // setDNSServer

void WiFi::setDNSServer(int numdns, const char* ip) {
ip_addr_t dnsserver;
ESP_LOGD(tag, "Setting DNS[%d] to %s", numdns, ip);
inet_pton(AF_INET, ip, &dnsserver);
::dns_setserver(numdns, &dnsserver);
ip_addr_t dns_server;
if(inet_pton(AF_INET, ip, &dns_server))
setDNSServer(numdns, dns_server);
} // setDNSServer

void WiFi::setDNSServer(int numdns, ip_addr_t ip) {
ESP_LOGD(tag, "Setting DNS[%d] to %d.%d.%d.%d", m_dnsCount, ((uint8_t*)(&ip))[0], ((uint8_t*)(&ip))[1], ((uint8_t*)(&ip))[2], ((uint8_t*)(&ip))[3]);
::dns_setserver(numdns, &ip);
} // setDNSServer

/**
Expand All @@ -133,20 +137,19 @@ void WiFi::setDNSServer(int numdns, const char* ip) {
void WiFi::connectAP(const std::string& ssid, const std::string& password){
::nvs_flash_init();
::tcpip_adapter_init();
if (ip.length() > 0 && gw.length() > 0 && netmask.length() > 0) {
if (ip != 0 && gw != 0 && netmask != 0) {
::tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA); // Don't run a DHCP client

tcpip_adapter_ip_info_t ipInfo;
ipInfo.ip.addr = ip;
ipInfo.gw.addr = gw;
ipInfo.netmask.addr = netmask;

inet_pton(AF_INET, ip.data(), &ipInfo.ip);
inet_pton(AF_INET, gw.data(), &ipInfo.gw);
inet_pton(AF_INET, netmask.data(), &ipInfo.netmask);
::tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &ipInfo);
}


ESP_ERROR_CHECK( esp_event_loop_init(wifiEventHandler->getEventHandler(), wifiEventHandler));
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
ESP_ERROR_CHECK(::esp_wifi_init(&cfg));
ESP_ERROR_CHECK(::esp_wifi_set_storage(WIFI_STORAGE_RAM));
ESP_ERROR_CHECK(::esp_wifi_set_mode(WIFI_MODE_STA));
wifi_config_t sta_config;
Expand Down Expand Up @@ -366,7 +369,8 @@ void WiFi::startAP(const std::string& ssid, const std::string& password) {


/**
* @brief Set the IP info used when connecting as a station to an external access point.
* @brief Set the IP info and enable DHCP if ip != 0. If called with ip == 0 then DHCP is enabled.
* If called with bad values it will do nothing.
*
* Do not call this method if we are being an access point ourselves.
*
Expand All @@ -382,17 +386,43 @@ void WiFi::startAP(const std::string& ssid, const std::string& password) {
* @return N/A.
*/
void WiFi::setIPInfo(const std::string& ip, const std::string& gw, const std::string& netmask) {
setIPInfo(ip.c_str(), gw.c_str(), netmask.c_str());
} // setIPInfo

void WiFi::setIPInfo(const char* ip, const char* gw, const char* netmask) {
uint32_t new_ip;
uint32_t new_gw;
uint32_t new_netmask;

auto success = (bool)inet_pton(AF_INET, ip, &new_ip);
success = success && inet_pton(AF_INET, gw, &new_gw);
success = success && inet_pton(AF_INET, netmask, &new_netmask);

if(!success) {
return;
}

setIPInfo(new_ip, new_gw, new_netmask);
} // setIPInfo

void WiFi::setIPInfo(uint32_t ip, uint32_t gw, uint32_t netmask) {
this->ip = ip;
this->gw = gw;
this->netmask = netmask;
} // setIPInfo

void WiFi::setIPInfo(std::string&& ip, std::string&& gw, std::string&& netmask) {
this->ip = std::move(ip);
this->gw = std::move(gw);
this->netmask = std::move(netmask);
} // setIPInfo
if(ip != 0 && gw != 0 && netmask != 0) {
tcpip_adapter_ip_info_t ipInfo;
ipInfo.ip.addr = ip;
ipInfo.gw.addr = gw;
ipInfo.netmask.addr = netmask;

::tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_STA);
::tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_STA, &ipInfo);
} else {
ip = 0;
::tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_STA);
}
}

/**
* @brief Return a string representation of the WiFi access point record.
Expand Down
0