Skip to content

Commit 773fdc0

Browse files
authored
Merge pull request #179 from JAndrassy/wific3_staticip_fix
WiFiC3 - don't start DHCP in begin, if static IP is configured
2 parents 3a1b8a3 + 0a07e2f commit 773fdc0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: libraries/WiFi/src/WiFi.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int CWifi::begin(const char* ssid) {
2525
/* -------------------------------------------------------------------------- */
2626
ni = CLwipIf::getInstance().get(NI_WIFI_STATION);
2727
CLwipIf::getInstance().connectToAp(ssid, nullptr);
28-
if(ni != nullptr) {
28+
if(ni != nullptr && !_useStaticIp) {
2929
ni->DhcpStart();
3030
}
3131

@@ -39,7 +39,7 @@ int CWifi::begin(const char* ssid, const char *passphrase) {
3939

4040
ni = CLwipIf::getInstance().get(NI_WIFI_STATION);
4141
CLwipIf::getInstance().connectToAp(ssid, passphrase);
42-
if(ni != nullptr) {
42+
if(ni != nullptr && !_useStaticIp) {
4343
ni->DhcpStart();
4444
}
4545

@@ -96,6 +96,7 @@ extern uint8_t *IpAddress2uint8(IPAddress a);
9696
/* -------------------------------------------------------------------------- */
9797
void CWifi::_config(IPAddress local_ip, IPAddress gateway, IPAddress subnet) {
9898
/* -------------------------------------------------------------------------- */
99+
_useStaticIp = local_ip != INADDR_NONE;
99100
if(ni != nullptr) {
100101
ni->DhcpStop();
101102
ni->DhcpNotUsed();

Diff for: libraries/WiFi/src/WiFiC3.h

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class CWifi {
99
private:
1010
void _config(IPAddress local_ip, IPAddress gateway, IPAddress subnet);
1111
unsigned long _timeout;
12+
bool _useStaticIp = false;
1213
CNetIf *ni;
1314

1415
public:

0 commit comments

Comments
 (0)