From 7515db41a503d18af6a013f05c25b03873376238 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Wed, 19 May 2021 01:05:34 +0200 Subject: [PATCH] remove smart pointer from wifi --- src/TaskWifi.cpp | 6 ++---- src/TaskWifi.h | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/TaskWifi.cpp b/src/TaskWifi.cpp index 8fa528e..3c9365f 100644 --- a/src/TaskWifi.cpp +++ b/src/TaskWifi.cpp @@ -14,18 +14,16 @@ WifiTask::~WifiTask() { bool WifiTask::setup(System &system) { // WiFi.onEvent(WiFiEvent); WiFi.setHostname(system.getUserConfig()->callsign.c_str()); - _wiFiMulti = std::shared_ptr(new WiFiMulti()); - ; for (Configuration::Wifi::AP ap : system.getUserConfig()->wifi.APs) { logPrintD("Looking for AP: "); logPrintlnD(ap.SSID); - _wiFiMulti->addAP(ap.SSID.c_str(), ap.password.c_str()); + _wiFiMulti.addAP(ap.SSID.c_str(), ap.password.c_str()); } return true; } bool WifiTask::loop(System &system) { - const uint8_t wifi_status = _wiFiMulti->run(); + const uint8_t wifi_status = _wiFiMulti.run(); if (wifi_status != WL_CONNECTED) { system.connectedViaWifiEth(false); logPrintlnE("WiFi not connected!"); diff --git a/src/TaskWifi.h b/src/TaskWifi.h index 8d6d92d..8196629 100644 --- a/src/TaskWifi.h +++ b/src/TaskWifi.h @@ -13,8 +13,8 @@ public: virtual bool loop(System &system) override; private: - std::shared_ptr _wiFiMulti; - uint8_t _oldWifiStatus; + WiFiMulti _wiFiMulti; + uint8_t _oldWifiStatus; }; #endif