mirror of
https://github.com/bdring/Grbl_Esp32.git
synced 2025-09-01 10:23:19 +02:00
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.
This commit is contained in:
@@ -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
|
||||
|
@@ -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"
|
||||
|
@@ -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"
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user