From 9575199183aaaee541b3065c10f1047cc856833d Mon Sep 17 00:00:00 2001 From: Sonny Jeon Date: Sat, 29 Aug 2015 16:28:29 -0600 Subject: [PATCH] Optional line number reporting bug fix. - Fixed a bug where it would not compile when USE_LINE_NUMBERS was enabled. --- doc/log/commit_log_v0.9i.txt | 6 ++++++ grbl/config.h | 1 - grbl/grbl.h | 2 +- grbl/motion_control.c | 8 ++++++-- grbl/motion_control.h | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/log/commit_log_v0.9i.txt b/doc/log/commit_log_v0.9i.txt index d21288f..db96690 100644 --- a/doc/log/commit_log_v0.9i.txt +++ b/doc/log/commit_log_v0.9i.txt @@ -1,3 +1,9 @@ +---------------- +Date: 2015-08-27 +Author: Sonny Jeon +Subject: Update README + + ---------------- Date: 2015-08-27 Author: Sonny Jeon diff --git a/grbl/config.h b/grbl/config.h index d7eebe2..5ca1f24 100644 --- a/grbl/config.h +++ b/grbl/config.h @@ -238,7 +238,6 @@ // The hardware PWM output on pin D11 is required for variable spindle output voltages. #define VARIABLE_SPINDLE // Default enabled. Comment to disable. - // Used by variable spindle output only. This forces the PWM output to a minimum duty cycle when enabled. // The PWM pin will still read 0V when the spindle is disabled. Most users will not need this option, but // it may be useful in certain scenarios. This minimum PWM settings coincides with the spindle rpm minimum diff --git a/grbl/grbl.h b/grbl/grbl.h index ba65171..5d86de2 100644 --- a/grbl/grbl.h +++ b/grbl/grbl.h @@ -23,7 +23,7 @@ // Grbl versioning system #define GRBL_VERSION "1.0b" -#define GRBL_VERSION_BUILD "20150824" +#define GRBL_VERSION_BUILD "20150829" // Define standard libraries used by Grbl. #include diff --git a/grbl/motion_control.c b/grbl/motion_control.c index f530b11..939b5b5 100644 --- a/grbl/motion_control.c +++ b/grbl/motion_control.c @@ -67,7 +67,7 @@ } while (1); // Plan and queue motion into planner buffer -// uint8_t plan_status; // Not used in normal operation. + // uint8_t plan_status; // Not used in normal operation. #ifdef USE_LINE_NUMBERS plan_buffer_line(target, feed_rate, invert_feed_rate, false, line_number); #else @@ -333,7 +333,11 @@ void mc_parking_motion(float *parking_target, float feed_rate) { if (sys.abort) { return; } // Block during abort. - uint8_t plan_status = plan_buffer_line(parking_target, feed_rate, false, true); + #ifdef USE_LINE_NUMBERS + uint8_t plan_status = plan_buffer_line(parking_target, feed_rate, false, true, PARKING_MOTION_LINE_NUMBER); + #else + uint8_t plan_status = plan_buffer_line(parking_target, feed_rate, false, true); + #endif if (plan_status) { bit_true(sys.step_control, STEP_CONTROL_EXECUTE_PARK); bit_false(sys.step_control, STEP_CONTROL_END_MOTION); // Allow parking motion to execute, if feed hold is active. diff --git a/grbl/motion_control.h b/grbl/motion_control.h index 5c9517a..38c741f 100644 --- a/grbl/motion_control.h +++ b/grbl/motion_control.h @@ -24,6 +24,7 @@ #define HOMING_CYCLE_LINE_NUMBER -1 +#define PARKING_MOTION_LINE_NUMBER -2 // Execute linear motion in absolute millimeter coordinates. Feed rate given in millimeters/second // unless invert_feed_rate is true. Then the feed_rate means that the motion should be completed in