From 793734a6f0d2d8c150c10eb49713f44021d81f1c Mon Sep 17 00:00:00 2001 From: Eric Duminil <eric.duminil@gmail.com> Date: Sat, 8 May 2021 12:36:18 +0200 Subject: [PATCH] Moving preinit wifioff to util --- ampel-firmware/ampel-firmware.ino | 12 ------------ ampel-firmware/util.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino index 8d04504..4d3ba2e 100644 --- a/ampel-firmware/ampel-firmware.ino +++ b/ampel-firmware/ampel-firmware.ino @@ -56,17 +56,6 @@ * and define your credentials and parameters in 'config.h'. */ -/***************************************************************** - * PreInit * - *****************************************************************/ -void preinit() { -#if !defined(AMPEL_WIFI) && defined(ESP8266) - // WiFi would be initialized otherwise (on ESP8266), even if unused. - // see https://github.com/esp8266/Arduino/issues/2111#issuecomment-224251391 - ESP8266WiFiClass::preinitWiFiOff(); -#endif -} - /***************************************************************** * Setup * *****************************************************************/ @@ -132,7 +121,6 @@ void checkSerialInput(); /***************************************************************** * Main loop * *****************************************************************/ - void loop() { #if defined(AMPEL_LORAWAN) && defined(ESP32) //LMIC Library seems to be very sensitive to timing issues, so run it first. diff --git a/ampel-firmware/util.cpp b/ampel-firmware/util.cpp index 841b08f..5fcb36c 100644 --- a/ampel-firmware/util.cpp +++ b/ampel-firmware/util.cpp @@ -7,6 +7,13 @@ namespace config { #if defined(ESP8266) const char *current_board = "ESP8266"; +# if !defined(AMPEL_WIFI) +void preinit() { + // WiFi would be initialized otherwise (on ESP8266), even if unused. + // see https://github.com/esp8266/Arduino/issues/2111#issuecomment-224251391 + ESP8266WiFiClass::preinitWiFiOff(); +} +# endif #elif defined(ESP32) const char *current_board = "ESP32"; #else -- GitLab