Skip to content

Commit

Permalink
Fixed shared build info code.
Browse files Browse the repository at this point in the history
- The build info options of “two switches on an axis” and “homing init
lock” shared the same letter ‘L’. The former is now ’T’.
  • Loading branch information
chamnit committed Feb 27, 2017
1 parent e54444e commit fd2a4eb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/csv/build_option_codes_en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions doc/log/commit_log_v1.1.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/markdown/interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion grbl/grbl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <avr/io.h>
Expand Down
2 changes: 1 addition & 1 deletion grbl/report.c
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit fd2a4eb

Please sign in to comment.