From e92c315b432bb4fe2f1afc133a8171b6bada7f49 Mon Sep 17 00:00:00 2001 From: odaki Date: Tue, 23 Jul 2019 21:55:25 +0900 Subject: [PATCH 1/9] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9834575d..28cb1e9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .pioenvs/ +.pio/ From 6c467adad0951ef7857e4ce2c5c5b6c0838ba044 Mon Sep 17 00:00:00 2001 From: odaki Date: Tue, 17 Sep 2019 22:11:58 +0900 Subject: [PATCH 2/9] Update .gitignore ignore workspace_dir https://docs.platformio.org/en/latest/faq.html#what-is-pio-directory --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0bea06f8..b1bf7134 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .pioenvs/ +.pio/ Thumbs.db .DS_Store *.orig From 873d555a2565df3c1945b2738f31792c59d7648a Mon Sep 17 00:00:00 2001 From: odaki Date: Mon, 7 Oct 2019 00:50:41 +0900 Subject: [PATCH 3/9] Revert "Update .gitignore" This reverts commit 6c467adad0951ef7857e4ce2c5c5b6c0838ba044. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index b1bf7134..0bea06f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .pioenvs/ -.pio/ Thumbs.db .DS_Store *.orig From 94b9420b370f6498d5db91af51a5a18ab337ac37 Mon Sep 17 00:00:00 2001 From: odaki Date: Wed, 16 Oct 2019 22:19:34 +0900 Subject: [PATCH 4/9] suppress unused variable warning at spindle_control --- Grbl_Esp32/spindle_control.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Grbl_Esp32/spindle_control.cpp b/Grbl_Esp32/spindle_control.cpp index 3714b8c2..a85ba092 100644 --- a/Grbl_Esp32/spindle_control.cpp +++ b/Grbl_Esp32/spindle_control.cpp @@ -20,7 +20,9 @@ #include "grbl.h" +#ifdef SPINDLE_PWM_PIN static float pwm_gradient; // Precalulated value to speed up rpm to PWM conversions. +#endif void spindle_init() { From fb10ab83b79ec70fd4191d127e25888ad2dacbc3 Mon Sep 17 00:00:00 2001 From: odaki Date: Wed, 16 Oct 2019 22:30:11 +0900 Subject: [PATCH 5/9] suppress "declared 'static' but never defined" in stepper.h --- Grbl_Esp32/stepper.cpp | 3 +++ Grbl_Esp32/stepper.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Grbl_Esp32/stepper.cpp b/Grbl_Esp32/stepper.cpp index ef89c7e0..54bc013e 100644 --- a/Grbl_Esp32/stepper.cpp +++ b/Grbl_Esp32/stepper.cpp @@ -208,6 +208,9 @@ 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 // 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. diff --git a/Grbl_Esp32/stepper.h b/Grbl_Esp32/stepper.h index b1625acf..d2dd6bbd 100644 --- a/Grbl_Esp32/stepper.h +++ b/Grbl_Esp32/stepper.h @@ -84,7 +84,6 @@ void IRAM_ATTR onStepperOffTimer(); #ifdef USE_RMT_STEPS void initRMT(); - inline IRAM_ATTR static void stepperRMT_Outputs(); #endif void stepper_init(); From a29f518e887082c53850f0aaf361eeb7d4fba680 Mon Sep 17 00:00:00 2001 From: odaki Date: Wed, 16 Oct 2019 22:33:28 +0900 Subject: [PATCH 6/9] suppress warning about unused variable at stepper.cpp --- Grbl_Esp32/stepper.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Grbl_Esp32/stepper.cpp b/Grbl_Esp32/stepper.cpp index 54bc013e..fe68ae1c 100644 --- a/Grbl_Esp32/stepper.cpp +++ b/Grbl_Esp32/stepper.cpp @@ -216,8 +216,9 @@ static st_prep_t prep; // 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 ======================================================================================= { - uint64_t step_pulse_off_time; - + #ifndef USE_RMT_STEPS + uint64_t step_pulse_off_time; + #endif //const int timer_idx = (int)para; // get the timer index TIMERG0.int_clr_timers.t0 = 1; From 526cd4ba931e93dd1d6d02eb5b2c6be7ef33eccb Mon Sep 17 00:00:00 2001 From: odaki Date: Wed, 16 Oct 2019 23:00:23 +0900 Subject: [PATCH 7/9] suppress warning about HOMING_CYCLE defines --- Grbl_Esp32/cpu_map.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Grbl_Esp32/cpu_map.h b/Grbl_Esp32/cpu_map.h index 3a89274e..6577b6b3 100644 --- a/Grbl_Esp32/cpu_map.h +++ b/Grbl_Esp32/cpu_map.h @@ -469,7 +469,13 @@ #endif // redefine some stuff from config.h + #ifdef HOMING_CYCLE_0 + #undef HOMING_CYCLE_0 + #endif #define HOMING_CYCLE_0 (1< Date: Wed, 16 Oct 2019 23:03:50 +0900 Subject: [PATCH 8/9] suppress warning about unused variable in polar_coaster.cpp --- Grbl_Esp32/polar_coaster.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Grbl_Esp32/polar_coaster.cpp b/Grbl_Esp32/polar_coaster.cpp index c0a6426d..2b1c0ab9 100644 --- a/Grbl_Esp32/polar_coaster.cpp +++ b/Grbl_Esp32/polar_coaster.cpp @@ -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 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. float seg_target[N_AXIS]; // The target of the current segment From 954e562596095f55d4d8878e6cd32eb857a30ad2 Mon Sep 17 00:00:00 2001 From: odaki Date: Wed, 16 Oct 2019 23:22:05 +0900 Subject: [PATCH 9/9] update build version --- Grbl_Esp32/grbl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h index c3503a10..b6940c54 100644 --- a/Grbl_Esp32/grbl.h +++ b/Grbl_Esp32/grbl.h @@ -20,7 +20,7 @@ // Grbl versioning system #define GRBL_VERSION "1.1f" -#define GRBL_VERSION_BUILD "20191015" +#define GRBL_VERSION_BUILD "20191016" //#include #include