Browse Source

W5500 config bugfix

pull/1240/head
geronet1 2 years ago
parent
commit
8cccca1724
  1. 11
      src/app.cpp
  2. 4
      src/app.h
  3. 4
      src/config/settings.h

11
src/app.cpp

@ -59,7 +59,7 @@ void app::setup() {
#if defined(AP_ONLY) #if defined(AP_ONLY)
mInnerLoopCb = std::bind(&app::loopStandard, this); mInnerLoopCb = std::bind(&app::loopStandard, this);
#else #else
mInnerLoopCb = std::bind(&app::loopWifi, this); mInnerLoopCb = std::bind(&app::loopNetwork, this);
#endif #endif
#endif /* !defined(ETHERNET) */ #endif /* !defined(ETHERNET) */
@ -200,13 +200,10 @@ void app::loopStandard(void) {
mMqtt.loop(); mMqtt.loop();
} }
#if !defined(ETHERNET) void app::loopNetwork(void) {
//-----------------------------------------------------------------------------
void app::loopWifi(void) {
ah::Scheduler::loop(); ah::Scheduler::loop();
yield(); yield();
} }
#endif /* !defined(ETHERNET) */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void app::onNetwork(bool gotIp) { void app::onNetwork(bool gotIp) {
@ -231,9 +228,9 @@ void app::onNetwork(bool gotIp) {
mInnerLoopCb = [this]() { this->loopStandard(); }; mInnerLoopCb = [this]() { this->loopStandard(); };
} else { } else {
#if defined(ETHERNET) #if defined(ETHERNET)
mInnerLoopCb = nullptr; mInnerLoopCb = [this]() { this->loopNetwork(); };
#else /* defined(ETHERNET) */ #else /* defined(ETHERNET) */
mInnerLoopCb = [this]() { this->loopWifi(); }; mInnerLoopCb = [this]() { this->loopNetwork(); };
everySec(std::bind(&ahoywifi::tickWifiLoop, &mWifi), "wifiL"); everySec(std::bind(&ahoywifi::tickWifiLoop, &mWifi), "wifiL");
#endif /* defined(ETHERNET) */ #endif /* defined(ETHERNET) */
} }

4
src/app.h

@ -65,9 +65,7 @@ class app : public IApp, public ah::Scheduler {
void setup(void); void setup(void);
void loop(void); void loop(void);
void loopStandard(void); void loopStandard(void);
#if !defined(ETHERNET) void loopNetwork(void);
void loopWifi(void);
#endif /* !defined(ETHERNET) */
void onNetwork(bool gotIp); void onNetwork(bool gotIp);
void regularTickers(void); void regularTickers(void);

4
src/config/settings.h

@ -367,9 +367,7 @@ class settings {
mCfg.sys.darkMode = false; mCfg.sys.darkMode = false;
mCfg.sys.schedReboot = false; mCfg.sys.schedReboot = false;
// restore temp settings // restore temp settings
#if defined(ETHERNET) #if !defined(ETHERNET)
memcpy(&mCfg.sys, &tmp, sizeof(cfgSys_t));
#else /* defined(ETHERNET) */
if(keepWifi) if(keepWifi)
memcpy(&mCfg.sys, &tmp, sizeof(cfgSys_t)); memcpy(&mCfg.sys, &tmp, sizeof(cfgSys_t));
else { else {

Loading…
Cancel
Save