mirror of
https://github.com/lumapu/ahoy.git
synced 2025-05-28 16:26:12 +02:00
fix #472 refactored ahoyWifi class completely
-> now Ahoy opens an AP during boot. This will be closed once a station WiFi connection is established improved NTP after boot, will be synced immediately after successful WiFi connection
This commit is contained in:
parent
614af26cd9
commit
7c6ab6792b
9 changed files with 129 additions and 204 deletions
16
src/app.cpp
16
src/app.cpp
|
@ -42,8 +42,7 @@ void app::setup(uint32_t timeout) {
|
|||
mMqtt.setup(&mConfig->mqtt, mConfig->sys.deviceName, mVersion, mSys, &mUtcTimestamp, &mSunrise, &mSunset);
|
||||
#endif
|
||||
|
||||
mWifi = new ahoywifi(mConfig);
|
||||
mWifi->setup(timeout, mSettings.getValid());
|
||||
mWifi.setup(mConfig, &mUtcTimestamp);
|
||||
|
||||
mPayload.setup(mSys);
|
||||
mPayload.enableSerialDebug(mConfig->serial.debug);
|
||||
|
@ -72,6 +71,10 @@ void app::loop(void) {
|
|||
|
||||
ah::Scheduler::loop();
|
||||
|
||||
#if !defined(AP_ONLY)
|
||||
mWifi.loop();
|
||||
#endif
|
||||
|
||||
mWeb->loop();
|
||||
|
||||
if (mFlagSendDiscoveryConfig) {
|
||||
|
@ -198,19 +201,14 @@ void app::handleIntr(void) {
|
|||
mSys->Radio.handleIntr();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool app::getWifiApActive(void) {
|
||||
return mWifi->getApActive();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::scanAvailNetworks(void) {
|
||||
mWifi->scanAvailNetworks();
|
||||
mWifi.scanAvailNetworks();
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void app::getAvailNetworks(JsonObject obj) {
|
||||
mWifi->getAvailNetworks(obj);
|
||||
mWifi.getAvailNetworks(obj);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue