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

Merge pull request #255 from bdring/Devt

Browse Source 
Devt
This commit is contained in:
bdring
2019-10-16 14:35:23 -05:00
committed by GitHub
parent dafb35ebeb d22361154b
commit b9feaaebcd
6 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Grbl_Esp32/cpu_map.h
View File

@@ -469,7 +469,13 @@
#endif #endif
// redefine some stuff from config.h // redefine some stuff from config.h
#ifdef HOMING_CYCLE_0
#undef HOMING_CYCLE_0
#endif
#define HOMING_CYCLE_0 (1<<Y_AXIS) #define HOMING_CYCLE_0 (1<<Y_AXIS)
#ifdef HOMING_CYCLE_1
#undef HOMING_CYCLE_1
#endif
#define HOMING_CYCLE_1 (1<<X_AXIS) #define HOMING_CYCLE_1 (1<<X_AXIS)
#ifdef HOMING_CYCLE_2 #ifdef HOMING_CYCLE_2
#undef HOMING_CYCLE_2 #undef HOMING_CYCLE_2
@@ -606,6 +612,9 @@
//#define SERVO_PEN_PIN GPIO_NUM_16 //#define SERVO_PEN_PIN GPIO_NUM_16
// redefine some stuff from config.h // redefine some stuff from config.h
#ifdef HOMING_CYCLE_0
#undef HOMING_CYCLE_0
#endif
#define HOMING_CYCLE_0 (1<<X_AXIS) // this 'bot only homes the X axis #define HOMING_CYCLE_0 (1<<X_AXIS) // this 'bot only homes the X axis
#ifdef HOMING_CYCLE_1 #ifdef HOMING_CYCLE_1
#undef HOMING_CYCLE_1 #undef HOMING_CYCLE_1

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 "20191015" #define GRBL_VERSION_BUILD "20191016"
//#include <sdkconfig.h> //#include <sdkconfig.h>
#include <Arduino.h> #include <Arduino.h>

1
Grbl_Esp32/polar_coaster.cpp
View File

@@ -87,7 +87,6 @@ void inverse_kinematics(float *target, plan_line_data_t *pl_data, float *positio
float p_dx, p_dy, p_dz; // distances in each polar axis float p_dx, p_dy, p_dz; // distances in each polar axis
float dist, polar_dist; // the distances in both systems...used to determine feed rate float dist, polar_dist; // the distances in both systems...used to determine feed rate
float new_feedrate; //
uint32_t segment_count; // number of segments the move will be broken in to. uint32_t segment_count; // number of segments the move will be broken in to.
float seg_target[N_AXIS]; // The target of the current segment float seg_target[N_AXIS]; // The target of the current segment

2
Grbl_Esp32/spindle_control.cpp
View File

@@ -20,7 +20,9 @@
#include "grbl.h" #include "grbl.h"
#ifdef SPINDLE_PWM_PIN
static float pwm_gradient; // Precalulated value to speed up rpm to PWM conversions. static float pwm_gradient; // Precalulated value to speed up rpm to PWM conversions.
#endif
void spindle_init() void spindle_init()
{ {

6
Grbl_Esp32/stepper.cpp
View File

@@ -208,13 +208,17 @@ static st_prep_t prep;
*/ */
#ifdef USE_RMT_STEPS
inline IRAM_ATTR static void stepperRMT_Outputs();
#endif
// TODO: Replace direct updating of the int32 position counters in the ISR somehow. Perhaps use smaller // TODO: Replace direct updating of the int32 position counters in the ISR somehow. Perhaps use smaller
// int8 variables and update position counters only when a segment completes. This can get complicated // int8 variables and update position counters only when a segment completes. This can get complicated
// with probing and homing cycles that require true real-time positions. // with probing and homing cycles that require true real-time positions.
void IRAM_ATTR onStepperDriverTimer(void *para) // ISR It is time to take a step ======================================================================================= void IRAM_ATTR onStepperDriverTimer(void *para) // ISR It is time to take a step =======================================================================================
{ {
#ifndef USE_RMT_STEPS
uint64_t step_pulse_off_time; uint64_t step_pulse_off_time;
#endif
//const int timer_idx = (int)para; // get the timer index //const int timer_idx = (int)para; // get the timer index
TIMERG0.int_clr_timers.t0 = 1; TIMERG0.int_clr_timers.t0 = 1;

1
Grbl_Esp32/stepper.h
View File

@@ -84,7 +84,6 @@ void IRAM_ATTR onStepperOffTimer();
#ifdef USE_RMT_STEPS #ifdef USE_RMT_STEPS
void initRMT(); void initRMT();
inline IRAM_ATTR static void stepperRMT_Outputs();
#endif #endif
void stepper_init(); void stepper_init();