3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-04-29 18:26:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

WiFi with Ethernet functional

Browse source
This commit is contained in:
lumapu 2024-08-08 22:27:23 +02:00
parent b98e702ad8
commit e3fdb04f0c
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/network/AhoyEthernet.h
View file

@ -37,6 +37,8 @@ class AhoyEthernet : public AhoyWifi {
void OnEvent(WiFiEvent_t event) { void OnEvent(WiFiEvent_t event) {
switch(event) { switch(event) {
case SYSTEM_EVENT_STA_CONNECTED: case SYSTEM_EVENT_STA_CONNECTED:
mWifiConnecting = false;
[[fallthrough]];
case ARDUINO_EVENT_ETH_CONNECTED: case ARDUINO_EVENT_ETH_CONNECTED:
if(NetworkState::CONNECTED != mStatus) { if(NetworkState::CONNECTED != mStatus) {
mStatus = NetworkState::CONNECTED; mStatus = NetworkState::CONNECTED;

9
src/network/AhoyWifiAp.h
View file

@ -36,11 +36,7 @@ class AhoyWifiAp {
ah::welcome(mIp.toString(), String(F("Password: ") + String(mCfg->apPwd))); ah::welcome(mIp.toString(), String(F("Password: ") + String(mCfg->apPwd)));
#if defined(ETHERNET)
WiFi.mode(WIFI_AP);
#else
WiFi.mode(WIFI_AP_STA); WiFi.mode(WIFI_AP_STA);
#endif
WiFi.softAPConfig(mIp, mIp, IPAddress(255, 255, 255, 0)); WiFi.softAPConfig(mIp, mIp, IPAddress(255, 255, 255, 0));
WiFi.softAP(WIFI_AP_SSID, mCfg->apPwd); WiFi.softAP(WIFI_AP_SSID, mCfg->apPwd);
@ -60,12 +56,7 @@ class AhoyWifiAp {
mDns.stop(); mDns.stop();
WiFi.softAPdisconnect(); WiFi.softAPdisconnect();
#if defined(ETHERNET)
WiFi.mode(WIFI_OFF);
#else
WiFi.scanDelete();
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
#endif
mEnabled = false; mEnabled = false;
} }