Merge pull request #159 from Harvie/master

Added ESP32 pin mapping for ESPDUINO-32 Wemos D1 R32

drivers/ESP32/driver.h

@@ -254,6 +254,8 @@ typedef struct {
   #include "bdring_v3.5_map.h"
 #elif defined(BOARD_BDRING_I2S6A)
   #include "bdring_i2s_6_axis_map.h"
+#elif defined(BOARD_ESPDUINO32)
+  #include "espduino-32_wemos_d1_r32_uno_map.h"
 #else // default board - NOTE: NOT FINAL VERSION!
   #include "generic_map.h"
 #endif

drivers/ESP32/espduino-32_wemos_d1_r32_uno_map.h

@@ -0,0 +1,122 @@
+/*
+  espduino-32_wemos_d1_r32_uno_map.h - An embedded CNC Controller with rs274/ngc (g-code) support
+
+  Driver code for ESP32
+
+  Part of GrblHAL
+
+  Copyright (c) 2020 Terje Io
+
+  Grbl is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Grbl is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+  This map is for relatively common ESP32 boards replicating the form factor of Arduino UNO.
+  This map allows use of such uno-compatible board with very popular
+  "Protoneer Arduino CNC shield" and is based on its pinout.
+  This makes perfect match for retrofiting older Arduino+GRBL based machines
+  with 32b microcontroler capable of running grblHAL and providing few extra IO pins (eg. for modbus).
+
+  These boards are sold under several names, for instance:
+   + ESPDUINO-32  (USB type B)
+   + Wemos D1 R32 (Micro USB)
+*/
+
+#define BOARD_NAME "ESPDUINO-32 Wemos D1 R32"
+
+// timer definitions
+#define STEP_TIMER_GROUP TIMER_GROUP_0
+#define STEP_TIMER_INDEX TIMER_0
+
+#if SDCARD_ENABLE
+
+// Pin mapping when using SPI mode.
+// With this mapping, SD card can be used both in SPI and 1-line SD mode.
+// Note that a pull-up on CS line is required in SD mode.
+/*
+#define PIN_NUM_MISO 19
+#define PIN_NUM_MOSI 23
+#define PIN_NUM_CLK  18
+#define PIN_NUM_CS   5
+*/
+
+#endif // SDCARD_ENABLE
+
+// Define step pulse output pins.
+#define X_STEP_PIN      GPIO_NUM_26
+#define Y_STEP_PIN      GPIO_NUM_25
+#define Z_STEP_PIN      GPIO_NUM_17
+#define STEP_MASK       (1ULL << X_STEP_PIN|1ULL << Y_STEP_PIN|1ULL << Z_STEP_PIN) // All step bits
+
+// Define step direction output pins. NOTE: All direction pins must be on the same port.
+#define X_DIRECTION_PIN     GPIO_NUM_16
+#define Y_DIRECTION_PIN     GPIO_NUM_27
+#define Z_DIRECTION_PIN     GPIO_NUM_14
+#define DIRECTION_MASK      (1ULL << X_DIRECTION_PIN|1ULL << Y_DIRECTION_PIN|1ULL << Z_DIRECTION_PIN) // All direction bits
+
+// Define stepper driver enable/disable output pin(s).
+#define STEPPERS_DISABLE_PIN    GPIO_NUM_12
+#define STEPPERS_DISABLE_MASK   (1ULL << STEPPERS_DISABLE_PIN)
+
+// Define homing/hard limit switch input pins and limit interrupt vectors.
+#define X_LIMIT_PIN     GPIO_NUM_13
+#define Y_LIMIT_PIN     GPIO_NUM_05
+#define Z_LIMIT_PIN     GPIO_NUM_23
+#define LIMIT_MASK      (1ULL << X_LIMIT_PIN|1ULL << Y_LIMIT_PIN|1ULL << Z_LIMIT_PIN) // All limit bits
+
+// Define spindle enable and spindle direction output pins.
+
+#ifndef VFD_SPINDLE
+#define SPINDLE_ENABLE_PIN      GPIO_NUM_18
+#define SPINDLE_MASK            (1ULL << SPINDLE_ENABLE_PIN)
+#define SPINDLEPWMPIN           GPIO_NUM_19
+#else
+#define SPINDLE_MASK            0
+#endif
+
+// Define flood and mist coolant enable output pins.
+
+#define COOLANT_FLOOD_PIN   GPIO_NUM_34
+#ifndef VFD_SPINDLE
+//#define COOLANT_MIST_PIN    GPIO_NUM_36
+#define COOLANT_MASK        (1UL << COOLANT_FLOOD_PIN|1ULL << COOLANT_MIST_PIN)
+#else
+#define COOLANT_MASK        (1UL << COOLANT_FLOOD_PIN)
+#endif
+
+// Define user-control CONTROLs (cycle start, reset, feed hold) input pins.
+#define RESET_PIN           GPIO_NUM_02
+#define FEED_HOLD_PIN       GPIO_NUM_04
+#define CYCLE_START_PIN     GPIO_NUM_36
+//#define SAFETY_DOOR_PIN     GPIO_NUM_39
+#define CONTROL_MASK        (1UL << RESET_PIN|1UL << FEED_HOLD_PIN|1UL << CYCLE_START_PIN|1UL << SAFETY_DOOR_PIN)
+
+// Define probe switch input pin.
+#if PROBE_ENABLE
+#define PROBE_PIN       GPIO_NUM_39
+#else
+#define PROBE_PIN       0xFF
+#endif
+
+#if MODBUS_ENABLE
+#define UART2_RX_PIN            GPIO_NUM_33
+#define UART2_TX_PIN            GPIO_NUM_32
+#define MODBUS_DIRECTION_PIN    GPIO_NUM_15
+#define MODBUS_BAUD             19200
+#endif
+
+
+#if KEYPAD_ENABLE
+#error No free pins for keypad!
+#endif

drivers/ESP32/my_machine.h

@@ -23,6 +23,8 @@
 
 // NOTE: Only one board may be enabled!
 // If none is enabled pin mappings from generic_map.h will be used
+//#define BOARD_CNC_BOOSTERPACK
+//#define BOARD_ESPDUINO32
 //#define BOARD_BDRING_V3P5
 //#define BOARD_BDRING_V4
 //#define BOARD_BDRING_I2S6A // NOT production ready!