From 7fdad5cad9f2be1fa3b4763b4d9a881b813241f8 Mon Sep 17 00:00:00 2001
From: Hieromon Ikasamo <hieromon@gmail.com>
Date: Thu, 29 Aug 2019 16:40:04 +0900
Subject: [PATCH] Fixed wrong position of EEPROM.h

---
 src/AutoConnectCredential.h | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/AutoConnectCredential.h b/src/AutoConnectCredential.h
index a2cf895..306a4dc 100644
--- a/src/AutoConnectCredential.h
+++ b/src/AutoConnectCredential.h
@@ -21,30 +21,24 @@
 #include <Arduino.h>
 #include <memory>
 #if defined(ARDUINO_ARCH_ESP8266)
+#define AC_CREDENTIAL_PREFERENCES 0
 extern "C" {
 #include <user_interface.h>
 }
-#define AC_CREDENTIAL_PREFERENCES 0
 #elif defined(ARDUINO_ARCH_ESP32)
-#include <esp_wifi.h>
-struct station_config {
-  uint8_t  ssid[32];
-  uint8_t  password[64];
-  uint8_t  bssid_set;
-  uint8_t  bssid[6];
-  wifi_fast_scan_threshold_t threshold;
-};
 #ifdef AUTOCONNECT_USE_PREFERENCES
 #define AC_CREDENTIAL_PREFERENCES 1
-#include <map>
-#include <Preferences.h>
 #else
 #define AC_CREDENTIAL_PREFERENCES 0
 #endif
-#if AC_CREDENTIAL_PREFERENCES == 0
-#define NO_GLOBAL_EEPROM
-#include <EEPROM.h>
-#endif
+#include <esp_wifi.h>
+struct station_config {
+uint8_t  ssid[32];
+uint8_t  password[64];
+uint8_t  bssid_set;
+uint8_t  bssid[6];
+wifi_fast_scan_threshold_t threshold;
+};
 #endif
 
 /**
@@ -83,6 +77,8 @@ class AutoConnectCredentialBase {
 
 #if AC_CREDENTIAL_PREFERENCES == 0
 // #pragma message "AutoConnectCredential applies the EEPROM"
+#define NO_GLOBAL_EEPROM
+#include <EEPROM.h>
 
 /** AutoConnectCredential class using EEPROM for ESP8266 */
 class AutoConnectCredential : public AutoConnectCredentialBase {
@@ -109,6 +105,8 @@ class AutoConnectCredential : public AutoConnectCredentialBase {
 
 #else
 // #pragma message "AutoConnectCredential applies the Preferences"
+#include <map>
+#include <Preferences.h>
 
 #define AC_CREDENTIAL_NVSNAME  AC_IDENTIFIER
 #define AC_CREDENTIAL_NVSKEY   AC_CREDENTIAL_NVSNAME