ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Optional line number reporting bug fix.

Browse Source 
- Fixed a bug where it would not compile when USE_LINE_NUMBERS was
enabled.
This commit is contained in:
Sonny Jeon 2015-08-29 16:28:29 -06:00
parent 9152d1429c
commit 9575199183
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/log/commit_log_v0.9i.txt
View File

@ -1,3 +1,9 @@
----------------
Date: 2015-08-27
Author: Sonny Jeon
Subject: Update README
---------------- ----------------
Date: 2015-08-27 Date: 2015-08-27
Author: Sonny Jeon Author: Sonny Jeon

1
grbl/config.h
View File

@ -238,7 +238,6 @@
// The hardware PWM output on pin D11 is required for variable spindle output voltages. // The hardware PWM output on pin D11 is required for variable spindle output voltages.
#define VARIABLE_SPINDLE // Default enabled. Comment to disable. #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. // 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 // 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 // it may be useful in certain scenarios. This minimum PWM settings coincides with the spindle rpm minimum

2
grbl/grbl.h
View File

@ -23,7 +23,7 @@
// Grbl versioning system // Grbl versioning system
#define GRBL_VERSION "1.0b" #define GRBL_VERSION "1.0b"
#define GRBL_VERSION_BUILD "20150824" #define GRBL_VERSION_BUILD "20150829"
// Define standard libraries used by Grbl. // Define standard libraries used by Grbl.
#include <avr/io.h> #include <avr/io.h>

6
grbl/motion_control.c
View File

@ -67,7 +67,7 @@
} while (1); } while (1);
// Plan and queue motion into planner buffer // 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 #ifdef USE_LINE_NUMBERS
plan_buffer_line(target, feed_rate, invert_feed_rate, false, line_number); plan_buffer_line(target, feed_rate, invert_feed_rate, false, line_number);
#else #else
@ -333,7 +333,11 @@ void mc_parking_motion(float *parking_target, float feed_rate)
{ {
if (sys.abort) { return; } // Block during abort. if (sys.abort) { return; } // Block during abort.
#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); uint8_t plan_status = plan_buffer_line(parking_target, feed_rate, false, true);
#endif
if (plan_status) { if (plan_status) {
bit_true(sys.step_control, STEP_CONTROL_EXECUTE_PARK); 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. bit_false(sys.step_control, STEP_CONTROL_END_MOTION); // Allow parking motion to execute, if feed hold is active.

1
grbl/motion_control.h
View File

@ -24,6 +24,7 @@
#define HOMING_CYCLE_LINE_NUMBER -1 #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 // 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 // unless invert_feed_rate is true. Then the feed_rate means that the motion should be completed in