Added an error code for laser mode when VARIABLE_SPINDLE is disabled.

- When trying to enable laser mode with $32=1 and VARIABLE_SPINDLE is disabled, the error code shown was improperly stating it was a homing failure. Added an new error code specifically for the laser mode being disabled without VARIABLE_SPINDLE.
gnea · Mar 25, 2017 · 775acac · 775acac
1 parent 43561ab
commit 775acac
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/doc/csv/error_codes_en_US.csv b/doc/csv/error_codes_en_US.csv
@@ -15,6 +15,7 @@ Error Code in v1.1+ ,Error Message in v1.0-, Error Description
 14,Line length exceeded,Build info or startup line exceeded EEPROM line length limit. Line not stored.
 15,Travel exceeded,Jog target exceeds machine travel. Jog command has been ignored.
 16,Invalid jog command,Jog command has no '=' or contains prohibited g-code.
+17,Setting disabled,Laser mode requires PWM output.
 20,Unsupported command,Unsupported or invalid g-code command found in block.
 21,Modal group violation,More than one g-code command from same modal group found in block.
 22,Undefined feed rate,Feed rate has not yet been set or is undefined.

diff --git a/doc/log/commit_log_v1.1.txt b/doc/log/commit_log_v1.1.txt
@@ -1,3 +1,31 @@
+----------------
+Date: 2017-03-19
+Author: Sonny Jeon
+Subject: Housekeeping.
+
+- Moved Grbl logo files to a separate repo.
+
+- Added PocketNC FR4 defaults. Needs some additional work though to be
+compatible.
+
+- Updated README image links.
+
+
+----------------
+Date: 2017-03-19
+Author: Sonny Jeon
+Subject: Update README.md
+
+----------------
+Date: 2017-03-02
+Author: Sonny Jeon
+Subject: 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.
+
+
 ----------------
 Date: 2017-02-27
 Author: Sonny Jeon

diff --git a/doc/markdown/interface.md b/doc/markdown/interface.md
@@ -154,6 +154,7 @@ Every G-code block sent to Grbl and Grbl `$` system command that is terminated w
 | **`14`** | (Grbl-Mega Only) Build info or startup line exceeded EEPROM line length limit. |
 | **`15`** | Jog target exceeds machine travel. Command ignored. |
 | **`16`** | Jog command with no '=' or contains prohibited g-code. |
+| **`17`** | Laser mode disabled. Requires PWM output. |
 | **`20`** | Unsupported or invalid g-code command found in block. |
 | **`21`** | More than one g-code command from same modal group found in block.|
 | **`22`** | Feed rate has not yet been set or is undefined. |

diff --git a/grbl/grbl.h b/grbl/grbl.h
@@ -23,7 +23,7 @@
 
 // Grbl versioning system
 #define GRBL_VERSION "1.1f"
-#define GRBL_VERSION_BUILD "20170302"
+#define GRBL_VERSION_BUILD "20170324"
 
 // Define standard libraries used by Grbl.
 #include <avr/io.h>

diff --git a/grbl/report.h b/grbl/report.h
@@ -38,6 +38,7 @@
 #define STATUS_LINE_LENGTH_EXCEEDED 14
 #define STATUS_TRAVEL_EXCEEDED 15
 #define STATUS_INVALID_JOG_COMMAND 16
+#define STATUS_SETTING_DISABLED_LASER 17
 
 #define STATUS_GCODE_UNSUPPORTED_COMMAND 20
 #define STATUS_GCODE_MODAL_GROUP_VIOLATION 21

diff --git a/grbl/settings.c b/grbl/settings.c
@@ -294,7 +294,7 @@ uint8_t settings_store_global_setting(uint8_t parameter, float value) {
           if (int_value) { settings.flags |= BITFLAG_LASER_MODE; }
           else { settings.flags &= ~BITFLAG_LASER_MODE; }
         #else
-          return(STATUS_SETTING_DISABLED);
+          return(STATUS_SETTING_DISABLED_LASER);
         #endif
         break;
       default: