mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-29 09:10:03 +02:00
Code Issues Releases Wiki Activity

Merge pull request #381 from bdring/Devt

Browse Source 
Devt
This commit is contained in:
bdring
2020-04-19 10:31:24 -05:00
committed by GitHub
parent 7afae273a2 6feb5714d8
commit 5666c1dc6b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Grbl_Esp32/Machines/pen_laser.h
View File

@@ -51,7 +51,7 @@
// If SPINDLE_PWM_PIN is commented out, this frees up the pin, but Grbl will still // If SPINDLE_PWM_PIN is commented out, this frees up the pin, but Grbl will still
// use a virtual spindle. Do not comment out the other parameters for the spindle. // use a virtual spindle. Do not comment out the other parameters for the spindle.
#define SPINDLE_PWM_PIN GPIO_NUM_17 // Laser PWM //#define SPINDLE_PWM_PIN GPIO_NUM_17 // Laser PWM
#define USING_SERVO // uncomment to use this feature #define USING_SERVO // uncomment to use this feature
//#define USING_SOLENOID // uncomment to use this feature //#define USING_SOLENOID // uncomment to use this feature
@@ -59,8 +59,8 @@
#ifdef USING_SERVO #ifdef USING_SERVO
#define USE_SERVO_AXES #define USE_SERVO_AXES
#define SERVO_Z_PIN GPIO_NUM_27 #define SERVO_Z_PIN GPIO_NUM_27
#define SERVO_Z_RANGE_MIN 0 #define SERVO_Z_RANGE_MIN 0.0
#define SERVO_Z_RANGE_MAX 10 #define SERVO_Z_RANGE_MAX 10.0
#endif #endif
#ifdef USING_SOLENOID #ifdef USING_SOLENOID
@@ -99,8 +99,8 @@
#define DEFAULT_LASER_MODE 0 // false #define DEFAULT_LASER_MODE 0 // false
#define DEFAULT_X_STEPS_PER_MM 80 #define DEFAULT_X_STEPS_PER_MM 80.0
#define DEFAULT_Y_STEPS_PER_MM 80 #define DEFAULT_Y_STEPS_PER_MM 80.0
#define DEFAULT_Z_STEPS_PER_MM 100.0 // This is percent in servo mode...used for calibration #define DEFAULT_Z_STEPS_PER_MM 100.0 // This is percent in servo mode...used for calibration
#define DEFAULT_X_MAX_RATE 5000.0 // mm/min #define DEFAULT_X_MAX_RATE 5000.0 // mm/min

2
Grbl_Esp32/servo_axis.h
View File

@@ -79,7 +79,7 @@
#define SERVO_CAL_MIN 20.0 // Percent: the minimum allowable calibration value #define SERVO_CAL_MIN 20.0 // Percent: the minimum allowable calibration value
#define SERVO_CAL_MAX 180.0 // Percent: the maximum allowable calibration value #define SERVO_CAL_MAX 180.0 // Percent: the maximum allowable calibration value
#define SERVO_TIMER_INT_FREQ 20 // Hz This is the task frequency #define SERVO_TIMER_INT_FREQ 20.0 // Hz This is the task frequency
#define SERVO_HOMING_OFF 0 // servo is off during homing #define SERVO_HOMING_OFF 0 // servo is off during homing
#define SERVO_HOMING_TARGET 1 // servo is send to a location during homing #define SERVO_HOMING_TARGET 1 // servo is send to a location during homing