Skip to content

Commit a26708b

Browse files
committed
make it possible to use external wifi manager by defining MY_EXTERNAL_WIFIMANAGER_USED
1 parent 093afa0 commit a26708b

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

core/MyGatewayTransportEthernet.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extern MyMessage _msgTmp;
4848
#endif
4949

5050
#if defined(MY_GATEWAY_ESP8266) || defined(MY_GATEWAY_ESP32)
51-
#if !defined(MY_WIFI_SSID)
51+
#if !defined(MY_WIFI_SSID) && !defined(MY_EXTERNAL_WIFIMANAGER_USED)
5252
#error ESP8266/ESP32 gateway: MY_WIFI_SSID not defined!
5353
#endif
5454
#endif
@@ -171,12 +171,14 @@ bool gatewayTransportInit(void)
171171
#ifdef MY_IP_ADDRESS
172172
WiFi.config(_ethernetGatewayIP, _gatewayIp, _subnetIp);
173173
#endif
174+
#if !defined(MY_EXTERNAL_WIFIMANAGER_USED)
174175
(void)WiFi.begin(MY_WIFI_SSID, MY_WIFI_PASSWORD, 0, MY_WIFI_BSSID);
175176
while (WiFi.status() != WL_CONNECTED) {
176177
delay(1000);
177178
GATEWAY_DEBUG(PSTR("GWT:TIN:CONNECTING...\n"));
178179
}
179180
GATEWAY_DEBUG(PSTR("GWT:TIN:IP: %s\n"), WiFi.localIP().toString().c_str());
181+
#endif
180182
#elif defined(MY_GATEWAY_LINUX)
181183
// Nothing to do here
182184
#else

core/MyGatewayTransportMQTTClient.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
#endif
8686

8787
#if defined(MY_GATEWAY_ESP8266) || defined(MY_GATEWAY_ESP8266_SECURE) || defined(MY_GATEWAY_ESP32)
88-
#if !defined(MY_WIFI_SSID)
88+
#if !defined(MY_WIFI_SSID) && !defined(MY_EXTERNAL_WIFIMANAGER_USED)
8989
#error ESP8266/ESP32 MQTT gateway: MY_WIFI_SSID not defined!
9090
#endif
9191
#endif
@@ -323,8 +323,10 @@ bool gatewayTransportInit(void)
323323
#if defined(MY_IP_ADDRESS)
324324
WiFi.config(_MQTT_clientIp, _gatewayIp, _subnetIp);
325325
#endif /* End of MY_IP_ADDRESS */
326+
#if !defined(MY_EXTERNAL_WIFIMANAGER_USED)
326327
(void)WiFi.begin(MY_WIFI_SSID, MY_WIFI_PASSWORD, 0, MY_WIFI_BSSID);
327328
#endif
329+
#endif
328330

329331
#if defined(MY_GATEWAY_ESP8266_SECURE)
330332
// Certificate Authorities are stored in the X509 list

0 commit comments

Comments
 (0)