Merge pull request #144 from bdring/master

Merge master into Devt

.travis.yml

@@ -18,7 +18,6 @@ before_script:
   - cd esp32/tools
   - python get.py
   - cd ..
-  - echo 'build.flash_freq=40m' >> platform.txt
   - mv $TRAVIS_BUILD_DIR/libraries/ESP32SSDP $HOME/arduino_ide/libraries/
   - mv $TRAVIS_BUILD_DIR/libraries/arduinoWebSockets $HOME/arduino_ide/libraries/
   
@@ -26,7 +25,7 @@ script:
   - cd $TRAVIS_BUILD_DIR
   - source command.sh
   - export PATH="$HOME/arduino_ide:$PATH"
-  - arduino --board esp32:esp32:esp32 --save-prefs
+  - arduino --board esp32:esp32:esp32:PartitionScheme=min_spiffs,FlashFreq=40 --pref compiler.warning_level=all --save-prefs
   - sed -n '48,72p;73q' $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
   - sed -i "s/\/\/#define ENABLE_BLUETOOTH/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
   - sed -i "s/#define ENABLE_BLUETOOTH/\/\/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
@@ -37,6 +36,11 @@ script:
   - sed -i "s/#define ENABLE_WIFI/\/\/#define ENABLE_WIFI/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
   - sed -n '48,72p;73q' $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
   - build_sketch  $TRAVIS_BUILD_DIR/Grbl_Esp32/Grbl_Esp32.ino
+  - sed -i "s/\/\/#define ENABLE_BLUETOOTH/#define ENABLE_BLUETOOTH/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
+  - sed -i "s/\/\/#define ENABLE_WIFI/#define ENABLE_WIFI/g" $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
+  - sed -n '48,72p;73q' $TRAVIS_BUILD_DIR/Grbl_Esp32/config.h
+  - build_sketch  $TRAVIS_BUILD_DIR/Grbl_Esp32/Grbl_Esp32.ino
+
   
 notifications:
   email:

Grbl_Esp32/gcode.cpp

@@ -108,7 +108,7 @@ uint8_t gc_execute_line(char *line, uint8_t client)
 	   perform initial error-checks for command word modal group violations, for any repeated
 	   words, and for negative values set for the value words F, N, P, T, and S. */
 
-	uint8_t word_bit; // Bit-value for assigning tracking variables
+	uint8_t word_bit = 0; // Bit-value for assigning tracking variables
 	uint8_t char_counter;
 	char letter;
 	float value;
@@ -1402,4 +1402,4 @@ uint8_t gc_execute_line(char *line, uint8_t client)
    group 9 = {M48, M49} enable/disable feed and speed override switches
    group 10 = {G98, G99} return mode canned cycles
    group 13 = {G61.1, G64} path control mode (G61 is supported)
-*/
+*/

Grbl_Esp32/grbl.h

@@ -43,7 +43,7 @@
 
 #include "planner.h"
 #include "coolant_control.h"
-#include "eeprom.h"
+#include "grbl_eeprom.h"
 #include "gcode.h"
 #include "grbl_limits.h"
 #include "motion_control.h"

Grbl_Esp32/grbl_eeprom.h

@@ -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"
 

README.md

@@ -20,13 +20,6 @@ This is a port of [Grbl](https://github.com/gnea/grbl) for the ESP32. The ESP32
 - **Fast Boot** - Boots almost instantly and does not need to be formally shutdown (unlike Raspberry Pi or Beagle Bone)
 - **RTOS (Real Time operating System)** - Custom features can be added without affecting the performance of the motion control system.
 
-### Issues / Changes
-
-1. **Direction pin delay** - Not implemented yet. Some drivers require a couple of microseconds after the direction pin is set before you start the step pulse. The original plan was to [use the RMT feature](http://www.buildlog.net/blog/?s=rmt), but that has issues when trying to use it in an Interrupt.  **This is typically a option in Grbl that is not used.**
-2. **Limit Switch debouncing** is not supported yet. It does not seem to be a problem on my test rigs. The dev board uses R/C filters on all inputs.
-3. **Step Pulse Invert:** This has not been fully tested. I suggest...leaving $2=0
-
-
 
 ### Using It
 
@@ -36,16 +29,6 @@ I use the ESP32 Dev Module version of the ESP32. I suggest starting with that if
 
 For basic instructions on using Grbl use the [gnea/grbl wiki](https://github.com/gnea/grbl/wiki). That is the Arduino version of Grbl, so keep that in mind regarding hardware setup. If you have questions ask via the GitHub issue system for this project.
 
-Be sure you have external pullup resistors on any GPIO34-39 that you use. These default to door, start, hold and reset functions.
-
-Using Bluetooth:
-
-- [See the Wiki page](https://github.com/bdring/Grbl_Esp32/wiki/Using-Bluetooth)
-
-Using SD Card
-
-- [See this wiki page](https://github.com/bdring/Grbl_Esp32/wiki/Using-the-SD-Card)
-
 ### Roadmap
 
 The roadmap is now [on the wiki](https://github.com/bdring/Grbl_Esp32/wiki/Development-Roadmap).

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 = min_spiffs.csv