From 996be8b2f59bdaad5e60e9174c46e21537417a16 Mon Sep 17 00:00:00 2001
From: odaki <odaki@mars.dti.ne.jp>
Date: Sat, 4 May 2019 01:18:06 +0900
Subject: [PATCH] 1. I changed the file name for EEPROM utility to avoid the
 name conflict with the standard header. 2. In order to use the correct
 library, I explicitly specified the dependent standard library in the
 platformio.ini file.

---
 Grbl_Esp32/{eeprom.cpp => eeprom_memcpy.cpp} |  2 +-
 Grbl_Esp32/{eeprom.h => eeprom_memcpy.h}     |  6 +++---
 Grbl_Esp32/grbl.h                            |  2 +-
 platformio.ini                               | 14 +++++++++++++-
 4 files changed, 18 insertions(+), 6 deletions(-)
 rename Grbl_Esp32/{eeprom.cpp => eeprom_memcpy.cpp} (95%)
 rename Grbl_Esp32/{eeprom.h => eeprom_memcpy.h} (90%)

diff --git a/Grbl_Esp32/eeprom.cpp b/Grbl_Esp32/eeprom_memcpy.cpp
similarity index 95%
rename from Grbl_Esp32/eeprom.cpp
rename to Grbl_Esp32/eeprom_memcpy.cpp
index f8cfe49f..067b937b 100644
--- a/Grbl_Esp32/eeprom.cpp
+++ b/Grbl_Esp32/eeprom_memcpy.cpp
@@ -1,5 +1,5 @@
 /*
-  eeprom.cpp - Header for system level commands and real-time processes
+  eeprom_memcpy.cpp - Header for system level commands and real-time processes
   Part of Grbl
   Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC
 	
diff --git a/Grbl_Esp32/eeprom.h b/Grbl_Esp32/eeprom_memcpy.h
similarity index 90%
rename from Grbl_Esp32/eeprom.h
rename to Grbl_Esp32/eeprom_memcpy.h
index 80e62179..3772599f 100644
--- a/Grbl_Esp32/eeprom.h
+++ b/Grbl_Esp32/eeprom_memcpy.h
@@ -1,5 +1,5 @@
 /*
-  eeprom.h - Header for system level commands and real-time processes
+  eeprom_memcpy.h - Header for system level commands and real-time processes
   Part of Grbl
   Copyright (c) 2014-2016 Sungeun K. Jeon for Gnea Research LLC
 	
@@ -18,8 +18,8 @@
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef eeprom_h
-#define eeprom_h
+#ifndef eeprom_memcpy_h
+#define eeprom_memcpy_h
 
 #include "grbl.h"
 
diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h
index 470a6744..22ca9eb0 100644
--- a/Grbl_Esp32/grbl.h
+++ b/Grbl_Esp32/grbl.h
@@ -43,7 +43,7 @@
 
 #include "planner.h"
 #include "coolant_control.h"
-#include "eeprom.h"
+#include "eeprom_memcpy.h"
 #include "gcode.h"
 #include "grbl_limits.h"
 #include "motion_control.h"
diff --git a/platformio.ini b/platformio.ini
index 43fcdb2a..04fee60c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -3,9 +3,21 @@ src_dir=Grbl_Esp32
 lib_dir=libraries
 data_dir=Grbl_Esp32/data
 
+[common_env_data]
+lib_deps_builtin =
+	EEPROM
+	BluetoothSerial
+	WiFi
+	FS
+	SD
+	SPI
+	Preferences
+	SPIFFS
+	WebServer
+
 [env:nodemcu-32s]
 platform = espressif32
 board = nodemcu-32s
 framework = arduino
 upload_speed = 512000
-
+board_build.partitions = no_ota.csv