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

156
Grbl_Esp32/cpu_map.h
View File

@@ -1028,79 +1028,97 @@
// 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 X_STEP_PIN GPIO_NUM_27 // use Z labeled connector
#define X_DIRECTION_PIN GPIO_NUM_33 // use Z labeled connector
#define Y_STEP_PIN GPIO_NUM_14
#define Y_STEP_B_PIN GPIO_NUM_21 // ganged motor
#define Y_DIRECTION_PIN GPIO_NUM_25
#define Y_AXIS_SQUARING
#define USE_GANGED_AXES // allow two motors on an axis #define Z_STEP_PIN GPIO_NUM_12 // use X labeled connector
#define Z_STEP_B_PIN GPIO_NUM_22 // use X labeled connector
#define X_STEP_PIN GPIO_NUM_27 // use Z labeled connector #define Z_DIRECTION_PIN GPIO_NUM_26 // use X labeled connector
#define X_DIRECTION_PIN GPIO_NUM_33 // use Z labeled connector #define Z_AXIS_SQUARING
#define Y_STEP_PIN GPIO_NUM_14 // OK to comment out to use pin for other features
#define Y_STEP_B_PIN GPIO_NUM_21 // ganged motor #define STEPPERS_DISABLE_PIN GPIO_NUM_13
#define Y_DIRECTION_PIN GPIO_NUM_25
#define Y_AXIS_SQUARING // Note: if you use PWM rather than relay, you could map GPIO_NUM_2 to mist or flood
//#define USE_SPINDLE_RELAY
#define Z_STEP_PIN GPIO_NUM_12 // use X labeled connector
#define Z_STEP_B_PIN GPIO_NUM_22 // use X labeled connector #ifdef USE_SPINDLE_RELAY
#define Z_DIRECTION_PIN GPIO_NUM_26 // use X labeled connector #ifdef V1P1
#define Z_AXIS_SQUARING
// OK to comment out to use pin for other features
#define STEPPERS_DISABLE_PIN GPIO_NUM_13
// Note: if you use PWM rather than relay, you could map GPIO_NUM_17 to mist or flood
#define USE_SPINDLE_RELAY
#ifdef USE_SPINDLE_RELAY
#define SPINDLE_PWM_PIN GPIO_NUM_17 #define SPINDLE_PWM_PIN GPIO_NUM_17
#else #else // V1p2
#define SPINDLE_PWM_PIN GPIO_NUM_16 #define SPINDLE_PWM_PIN GPIO_NUM_2
#define SPINDLE_ENABLE_PIN GPIO_NUM_32 #endif
#else
#define SPINDLE_PWM_PIN GPIO_NUM_16
#define SPINDLE_ENABLE_PIN GPIO_NUM_32
#endif
#define SPINDLE_PWM_CHANNEL 0
// PWM Generator is based on 80,000,000 Hz counter
// Therefor the freq determines the resolution
// 80,000,000 / freq = max resolution
// For 5000 that is 80,000,000 / 5000 = 16000
// round down to nearest bit count for SPINDLE_PWM_MAX_VALUE = 13bits (8192)
#define SPINDLE_PWM_BASE_FREQ 5000 // Hz
#define SPINDLE_PWM_BIT_PRECISION 8 // be sure to match this with SPINDLE_PWM_MAX_VALUE
#define SPINDLE_PWM_OFF_VALUE 0
#define SPINDLE_PWM_MAX_VALUE 255 // (2^SPINDLE_PWM_BIT_PRECISION)
#ifndef SPINDLE_PWM_MIN_VALUE
#define SPINDLE_PWM_MIN_VALUE 1 // Must be greater than zero.
#endif
#define SPINDLE_PWM_RANGE (SPINDLE_PWM_MAX_VALUE-SPINDLE_PWM_MIN_VALUE)
// Note: Only uncomment this if USE_SPINDLE_RELAY is commented out.
// Relay can be used for Spindle or Coolant
//#define COOLANT_FLOOD_PIN GPIO_NUM_17
#define X_LIMIT_PIN GPIO_NUM_15
#define Y_LIMIT_PIN GPIO_NUM_4
#ifdef V1P1 //v1p1
#define Z_LIMIT_PIN GPIO_NUM_2
#else
#define Z_LIMIT_PIN GPIO_NUM_17
#endif
#define LIMIT_MASK B111
#ifdef V1P2
#ifndef ENABLE_SOFTWARE_DEBOUNCE // V1P2 does not have R/C filters
#define ENABLE_SOFTWARE_DEBOUNCE
#endif #endif
#endif
#define SPINDLE_PWM_CHANNEL 0
// PWM Generator is based on 80,000,000 Hz counter // The default value in config.h is wrong for this controller
// Therefor the freq determines the resolution #ifdef INVERT_CONTROL_PIN_MASK
// 80,000,000 / freq = max resolution #undef INVERT_CONTROL_PIN_MASK
// For 5000 that is 80,000,000 / 5000 = 16000 #endif
// round down to nearest bit count for SPINDLE_PWM_MAX_VALUE = 13bits (8192)
#define SPINDLE_PWM_BASE_FREQ 5000 // Hz #define INVERT_CONTROL_PIN_MASK B1110
#define SPINDLE_PWM_BIT_PRECISION 8 // be sure to match this with SPINDLE_PWM_MAX_VALUE
#define SPINDLE_PWM_OFF_VALUE 0 // Note: check the #define IGNORE_CONTROL_PINS is the way you want in config.h
#define SPINDLE_PWM_MAX_VALUE 255 // (2^SPINDLE_PWM_BIT_PRECISION) #define CONTROL_RESET_PIN GPIO_NUM_34 // needs external pullup
#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // needs external pullup
#ifndef SPINDLE_PWM_MIN_VALUE #define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // needs external pullup
#define SPINDLE_PWM_MIN_VALUE 1 // Must be greater than zero.
#endif
#define SPINDLE_PWM_RANGE (SPINDLE_PWM_MAX_VALUE-SPINDLE_PWM_MIN_VALUE)
// Note: Only uncomment this if USE_SPINDLE_RELAY is commented out.
// Relay can be used for Spindle or Coolant
//#define COOLANT_FLOOD_PIN GPIO_NUM_17
#define X_LIMIT_PIN GPIO_NUM_15
#define Y_LIMIT_PIN GPIO_NUM_4
#define Z_LIMIT_PIN GPIO_NUM_2
#define LIMIT_MASK B111
#define PROBE_PIN GPIO_NUM_35
// The default value in config.h is wrong for this controller
#ifdef INVERT_CONTROL_PIN_MASK
#undef INVERT_CONTROL_PIN_MASK
#endif
#define INVERT_CONTROL_PIN_MASK B1110
// Note: check the #define IGNORE_CONTROL_PINS is the way you want in config.h
#define CONTROL_RESET_PIN GPIO_NUM_34 // needs external pullup
#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // needs external pullup
#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // needs external pullup
#endif #endif
#ifdef CPU_MAP_TMC2130_PEN #ifdef CPU_MAP_TMC2130_PEN

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>