From 849122559b647493f4deda59405f130589fcd1b6 Mon Sep 17 00:00:00 2001 From: Sonny Jeon Date: Thu, 2 Mar 2017 09:40:23 -0700 Subject: [PATCH] Fixed $G report issue with M7 and M8 both enabled. [fix] When M7 and M8 are both enabled, $G report would show `M78`, rather than `M7 M8`. This only effects systems that enable M7 mist coolant in config.h. Not the default build. --- doc/log/commit_log_v1.1.txt | 9 +++++++++ grbl/grbl.h | 2 +- grbl/report.c | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/doc/log/commit_log_v1.1.txt b/doc/log/commit_log_v1.1.txt index fc5e76a..29eb3d2 100644 --- a/doc/log/commit_log_v1.1.txt +++ b/doc/log/commit_log_v1.1.txt @@ -1,3 +1,12 @@ +---------------- +Date: 2017-02-27 +Author: Sonny Jeon +Subject: Fixed shared build info code. + +- The build info options of “two switches on an axis” and “homing init +lock” shared the same letter ‘L’. The former is now ’T’. + + ---------------- Date: 2017-02-23 Author: Sonny Jeon diff --git a/grbl/grbl.h b/grbl/grbl.h index 37e17c6..265aada 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 "20170227" +#define GRBL_VERSION_BUILD "20170302" // Define standard libraries used by Grbl. #include diff --git a/grbl/report.c b/grbl/report.c index 9ca07b8..c1ba78a 100644 --- a/grbl/report.c +++ b/grbl/report.c @@ -316,13 +316,13 @@ void report_gcode_modes() case SPINDLE_DISABLE : serial_write('5'); break; } - report_util_gcode_modes_M(); #ifdef ENABLE_M7 if (gc_state.modal.coolant) { // Note: Multiple coolant states may be active at the same time. - if (gc_state.modal.coolant & PL_COND_FLAG_COOLANT_MIST) { serial_write('7'); } - if (gc_state.modal.coolant & PL_COND_FLAG_COOLANT_FLOOD) { serial_write('8'); } - } else { serial_write('9'); } + if (gc_state.modal.coolant & PL_COND_FLAG_COOLANT_MIST) { report_util_gcode_modes_M(); serial_write('7'); } + if (gc_state.modal.coolant & PL_COND_FLAG_COOLANT_FLOOD) { report_util_gcode_modes_M(); serial_write('8'); } + } else { report_util_gcode_modes_M(); serial_write('9'); } #else + report_util_gcode_modes_M(); if (gc_state.modal.coolant) { serial_write('8'); } else { serial_write('9'); } #endif