Alarm and safety door bug fix.

- Typo in protocol.c caused a safety door to lock out the system during
an alarm. The correct character should keep that from happening and
bring back the original door/alarm behavior.

doc/log/commit_log_v1.0d.txt

@@ -1,3 +1,9 @@
+----------------
+Date: 2016-04-04
+Author: Sonny Jeon
+Subject: Update readme and sleep documentation.
+
+
 ----------------
 Date: 2016-04-03
 Author: chamnit
@@ -82,20 +88,3 @@ bytes, per the g-code standard (Grbl 328p is limited to 80).
 
 - Removed the cpu_map folder, since this version is strictly Mega2560.
 
-
-----------------
-Date: 2016-03-19
-Author: chamnit
-Subject: Update README
-
-
-----------------
-Date: 2016-03-19
-Author: Sonny Jeon
-Subject: No variable spindle and spindle speed fix.
-
-- Soft limit errors were stuck in a feed hold without notifying the
-user why it was in a hold. When resumed, the soft limit error would
-kick in. Issue should be fixed to behave as intended to automatically
-hold and issue a soft limit alarm once the machine has come to a stop.
-

grbl/grbl.h

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

grbl/protocol.c

@@ -281,7 +281,7 @@ void protocol_exec_rt_system()
       // TODO: CHECK MODE? How to handle this? Likely nothing, since it only works when IDLE and then resets Grbl.
 
       // State check for allowable states for hold methods.
-      if (!(sys.state & (STATE_ALARM & STATE_CHECK_MODE))) {
+      if (!(sys.state & (STATE_ALARM | STATE_CHECK_MODE))) {
 
         // If in CYCLE state, all hold states immediately initiate a motion HOLD.
         if (sys.state == STATE_CYCLE) {