From fd2a4ebaee16fc996ba82ff7a33c543be4bdbe8b Mon Sep 17 00:00:00 2001 From: Sonny Jeon Date: Mon, 27 Feb 2017 15:24:51 -0700 Subject: [PATCH] Fixed shared build info code. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The build info options of “two switches on an axis” and “homing init lock” shared the same letter ‘L’. The former is now ’T’. --- doc/csv/build_option_codes_en_US.csv | 2 +- doc/log/commit_log_v1.1.txt | 12 ++++++++++++ doc/markdown/interface.md | 2 +- grbl/grbl.h | 2 +- grbl/report.c | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/doc/csv/build_option_codes_en_US.csv b/doc/csv/build_option_codes_en_US.csv index 5653440..f7abb8f 100644 --- a/doc/csv/build_option_codes_en_US.csv +++ b/doc/csv/build_option_codes_en_US.csv @@ -6,7 +6,7 @@ "P","Parking motion","Enabled" "Z","Homing force origin","Enabled" "H","Homing single axis commands","Enabled" -"L","Two limit switches on axis","Enabled" +"T","Two limit switches on axis","Enabled" "A","Allow feed rate overrides in probe cycles","Enabled" "D","Use spindle direction as enable pin","Enabled" "0","Spindle enable off when speed is zero","Enabled" diff --git a/doc/log/commit_log_v1.1.txt b/doc/log/commit_log_v1.1.txt index ff24533..fc5e76a 100644 --- a/doc/log/commit_log_v1.1.txt +++ b/doc/log/commit_log_v1.1.txt @@ -1,3 +1,15 @@ +---------------- +Date: 2017-02-23 +Author: Sonny Jeon +Subject: Restrict coincident target updates to M3 constant laser only. + +- Restrict M3 forced updates when there is a motion block with a +coincident target. Force syncing of the spindle state can lead to some +pauses during a job that has coincident targets. That’s not +particularly desirable. This ensures M4 dynamic mode is not effected by +this force-sync. + + ---------------- Date: 2017-02-23 Author: Sonny Jeon diff --git a/doc/markdown/interface.md b/doc/markdown/interface.md index ccb063f..950a739 100644 --- a/doc/markdown/interface.md +++ b/doc/markdown/interface.md @@ -426,7 +426,7 @@ Feedback messages provide non-critical information on what Grbl is doing, what i | **`P`** | Parking motion enabled | | **`Z`** | Homing force origin enabled | | **`H`** | Homing single axis enabled | -| **`L`** | Two limit switches on axis enabled | +| **`T`** | Two limit switches on axis enabled | | **`D`** | Spindle direction pin used as enable pin | | **`0`** | Spindle enable off when speed is zero enabled | | **`S`** | Software limit pin debouncing enabled | diff --git a/grbl/grbl.h b/grbl/grbl.h index f7f0602..37e17c6 100644 --- a/grbl/grbl.h +++ b/grbl/grbl.h @@ -23,7 +23,7 @@ // Grbl versioning system #define GRBL_VERSION "1.1f" -#define GRBL_VERSION_BUILD "20170223" +#define GRBL_VERSION_BUILD "20170227" // Define standard libraries used by Grbl. #include diff --git a/grbl/report.c b/grbl/report.c index 5a541fb..9ca07b8 100644 --- a/grbl/report.c +++ b/grbl/report.c @@ -395,7 +395,7 @@ void report_build_info(char *line) serial_write('H'); #endif #ifdef LIMITS_TWO_SWITCHES_ON_AXES - serial_write('L'); + serial_write('T'); #endif #ifdef ALLOW_FEED_OVERRIDE_DURING_PROBE_CYCLES serial_write('A');