mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-20 05:11:38 +02:00
Code Issues Releases Wiki Activity

Merge pull request #242 from bdring/Devt

Browse Source 
Devt
This commit is contained in:
bdring
2019-10-04 20:04:52 -05:00
committed by GitHub
parent 3f50a2d421 92470ead27
commit c74b545c67
2 changed files with 88 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Grbl_Esp32/cpu_map.h
View File

@@ -1028,8 +1028,14 @@
// This is the CPU Map for the Buildlog.net MPCNC controller // This is the CPU Map for the Buildlog.net MPCNC controller
// used in lowrider mode. Low rider has (2) Y and Z and one X motor // used in lowrider mode. Low rider has (2) Y and Z and one X motor
// These will not match the silkscreen or schematic descriptions // These will not match the silkscreen or schematic descriptions
#define CPU_MAP_NAME "CPU_MAP_LOWRIDER" //#define V1P1
#define V1P2 // works for V1.2.1 as well
#ifdef V1P1
#define CPU_MAP_NAME "CPU_MAP_LOWRIDER_V1P1"
#else // V1P2
#define CPU_MAP_NAME "CPU_MAP_LOWRIDER_V1P2"
#endif
#define USE_GANGED_AXES // allow two motors on an axis #define USE_GANGED_AXES // allow two motors on an axis
@@ -1046,16 +1052,18 @@
#define Z_DIRECTION_PIN GPIO_NUM_26 // use X labeled connector #define Z_DIRECTION_PIN GPIO_NUM_26 // use X labeled connector
#define Z_AXIS_SQUARING #define Z_AXIS_SQUARING
// OK to comment out to use pin for other features // OK to comment out to use pin for other features
#define STEPPERS_DISABLE_PIN GPIO_NUM_13 #define STEPPERS_DISABLE_PIN GPIO_NUM_13
// Note: if you use PWM rather than relay, you could map GPIO_NUM_2 to mist or flood
// Note: if you use PWM rather than relay, you could map GPIO_NUM_17 to mist or flood //#define USE_SPINDLE_RELAY
#define USE_SPINDLE_RELAY
#ifdef USE_SPINDLE_RELAY #ifdef USE_SPINDLE_RELAY
#ifdef V1P1
#define SPINDLE_PWM_PIN GPIO_NUM_17 #define SPINDLE_PWM_PIN GPIO_NUM_17
#else // V1p2
#define SPINDLE_PWM_PIN GPIO_NUM_2
#endif
#else #else
#define SPINDLE_PWM_PIN GPIO_NUM_16 #define SPINDLE_PWM_PIN GPIO_NUM_16
#define SPINDLE_ENABLE_PIN GPIO_NUM_32 #define SPINDLE_ENABLE_PIN GPIO_NUM_32
@@ -1084,10 +1092,20 @@
#define X_LIMIT_PIN GPIO_NUM_15 #define X_LIMIT_PIN GPIO_NUM_15
#define Y_LIMIT_PIN GPIO_NUM_4 #define Y_LIMIT_PIN GPIO_NUM_4
#ifdef V1P1 //v1p1
#define Z_LIMIT_PIN GPIO_NUM_2 #define Z_LIMIT_PIN GPIO_NUM_2
#else
#define Z_LIMIT_PIN GPIO_NUM_17
#endif
#define LIMIT_MASK B111 #define LIMIT_MASK B111
#define PROBE_PIN GPIO_NUM_35 #ifdef V1P2
#ifndef ENABLE_SOFTWARE_DEBOUNCE // V1P2 does not have R/C filters
#define ENABLE_SOFTWARE_DEBOUNCE
#endif
#endif
// The default value in config.h is wrong for this controller // The default value in config.h is wrong for this controller
#ifdef INVERT_CONTROL_PIN_MASK #ifdef INVERT_CONTROL_PIN_MASK

2
Grbl_Esp32/grbl.h
View File

@@ -20,7 +20,7 @@
// Grbl versioning system // Grbl versioning system
#define GRBL_VERSION "1.1f" #define GRBL_VERSION "1.1f"
#define GRBL_VERSION_BUILD "20191001" #define GRBL_VERSION_BUILD "20191004"
//#include <sdkconfig.h> //#include <sdkconfig.h>
#include <Arduino.h> #include <Arduino.h>