From 34ba143d5ba28d83a3a43b3008f2f984ca974536 Mon Sep 17 00:00:00 2001 From: Patrick Balsiger Date: Thu, 8 Nov 2018 17:37:20 +0100 Subject: [PATCH] remove init in wifi net, load config in connect method --- src/WiFiNet.cpp | 5 +---- src/WiFiNet.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/WiFiNet.cpp b/src/WiFiNet.cpp index 9f64390..e5e8005 100644 --- a/src/WiFiNet.cpp +++ b/src/WiFiNet.cpp @@ -17,11 +17,8 @@ WiFiNet::WiFiNet( config.connectTimeout = connectTimeout; } -Network* WiFiNet::init() { - config.fromFile("/config.json"); - return this; -} int WiFiNet::connect(){ + config.fromFile("/config.json"); WiFi.hostname(config.hostname); Serial.println("Hostname: " + config.hostname); if(!connectStation()) { diff --git a/src/WiFiNet.h b/src/WiFiNet.h index ffe23e7..5d3177c 100644 --- a/src/WiFiNet.h +++ b/src/WiFiNet.h @@ -61,7 +61,6 @@ class WiFiNet : public Network { public: WiFiConfig config; WiFiNet(int stationMode, const char* stationSSID, const char* stationPassword, const char* apSSID, const char* apPassword, const char* hostname, int connectTimeout); - Network* init(); int connect(); int connectStation(); int createAccessPoint();