Sleep feature. General re-org and bug fixes.

- New sleep safety feature. If powered components (spindle/coolant) are enabled and if there is no motion, incoming data, or commands, Grbl will start a short sleep countdown. Upon elapse, Grbl will depower and enter a sleep state. If parking is enabled, sleep will also park the machine. Only a reset will exit sleep and the job will be unrecoverable. This is purely a safety feature to address serial disconnection problems. - Re-organized the cpu-map and default files and put them back into single files. Makes it easier for OEMs to just drop in their configuration files for a custom build. - Introduced a single-file configuration method for OEMs. See config.h for details. Basically just add the cpu_map and default files to the bottom of config.h. - Moved the control pin invert mask to config.h - Refactored some cpu_map defines to be more descriptive of what they belong to. - Added invert coolant pins options to config.h - Added a new realtime status report. Only a proposal at this time, and the old classic report is enabled by default. Comment out the USE_CLASSIC_REALTIME_REPORT define in config.h to use the new report. Please note that the new report is not finalized and is subject to change.
grbl · ondabeach · Aug 28, 2015 · Aug 28, 2015 · Aug 29, 2015 · Sep 5, 2015
commit 86935340bd72f5c7273b9efb721b897b7c08ee5a
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ CLOCK      = 16000000L
 PROGRAMMER ?= -c avrisp2 -P usb
 SOURCE    = main.c motion_control.c gcode.c spindle_control.c coolant_control.c serial.c \
              protocol.c stepper.c eeprom.c settings.c planner.c nuts_bolts.c limits.c \
-             print.c probe.c report.c system.c
+             print.c probe.c report.c system.c sleep.c
 BUILDDIR = build
 SOURCEDIR = grbl
 # FUSES      = -U hfuse:w:0xd9:m -U lfuse:w:0x24:m

diff --git a/doc/log/commit_log_v1.0d.txt b/doc/log/commit_log_v1.0d.txt
@@ -1,3 +1,25 @@
+----------------
+Date: 2016-03-20
+Author: chamnit
+Subject: EEPROM string checks and re-added some compile options.
+
+- Incremented version to v1.0d, but more changes to come before release.
+
+- EEPROM strings were linked to the LINE_BUFFER_SIZE, which were
+increased from 80 to 256. This caused a problem with EEPROM storage and
+would corrupt any existing data there. Now fixed to preserve the data
+there by limiting the size read or written to EEPROM to 80 characters.
+
+- When EEPROM string length is exceeded, Grbl will respond with a “Line
+length exceeded” error.
+
+- Re-added a couple of compile-time options: realtime line numbers and
+rate reporting. This is to ensure backward support for GUIs for the
+time being. These removal options will go away eventually before they
+become hard-coded in. (They will be toggle-able with the status report
+mask in settings though.)
+
+
 ----------------
 Date: 2016-03-19
 Author: Sonny Jeon
@@ -25,3 +47,20 @@ 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.
+
diff --git a/grbl/config.h b/grbl/config.h
@@ -2,7 +2,7 @@
   config.h - compile time configuration
   Part of Grbl
 
-  Copyright (c) 2012-2015 Sungeun K. Jeon
+  Copyright (c) 2012-2016 Sungeun K. Jeon
   Copyright (c) 2009-2011 Simen Svale Skogsrud
 
   Grbl is free software: you can redistribute it and/or modify
@@ -30,8 +30,12 @@
 #include "grbl.h" // For Arduino IDE compatibility.
 
 
-// Default settings. Used when resetting EEPROM. Change to desired name in defaults.h
+// Define CPU pin map and default settings.
+// NOTE: OEMs can avoid the need to maintain/update the defaults.h and cpu_map.h files and use only
+// one configuration file by placing their specific defaults and pin map at the bottom of this file.
+// If doing so, simply comment out these two defines and see instructions below.
 #define DEFAULTS_GENERIC
+#define CPU_MAP_2560_INITIAL
 
 // Serial baud rate
 #define BAUD_RATE 115200
@@ -133,19 +137,20 @@
 // have the same steps per mm internally.
 // #define COREXY // Default disabled. Uncomment to enable.
 
-// Inverts pin logic of the control command pins. This essentially means when this option is enabled
-// you can use normally-closed switches, rather than the default normally-open switches.
-// NOTE: If you require individual control pins inverted, keep this macro disabled and simply alter
-//   the CONTROL_INVERT_MASK definition in cpu_map.h files.
-// #define INVERT_ALL_CONTROL_PINS // Default disabled. Uncomment to enable.
+// Inverts pin logic of the control command pins based on a mask. This essentially means you can use
+// normally-closed switches on the specified pins, rather than the default normally-open switches.
+// NOTE: The top option will mask and invert all control pins. The bottom option is an example of
+// inverting only two control pins, the safety door and reset. See cpu_map.h for other macro definitions.
+// #define INVERT_CONTROL_PIN_MASK CONTROL_MASK // Default disabled. Uncomment to disable.
+// #define INVERT_CONTROL_PIN_MASK ((1<<CONTROL_SAFETY_DOOR_BIT)|(CONTROL_RESET_BIT)) // Default disabled.
 
 // Inverts select limit pin states based on the following mask. This effects all limit pin functions, 
 // such as hard limits and homing. However, this is different from overall invert limits setting. 
 // This build option will invert only the limit pins defined here, and then the invert limits setting
 // will be applied to all of them. This is useful when a user has a mixed set of limit pins with both
 // normally-open(NO) and normally-closed(NC) switches installed on their machine.
 // NOTE: PLEASE DO NOT USE THIS, unless you have a situation that needs it.
-// #define INVERT_LIMIT_PIN_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)) // Default disabled. Uncomment to enable.
+// #define INVERT_LIMIT_PIN_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)) // Default disabled.
 
 // Inverts the spindle enable pin from low-disabled/high-enabled to low-enabled/high-disabled. Useful
 // for some pre-built electronic boards.
@@ -154,6 +159,11 @@
 // uncomment the config option USE_SPINDLE_DIR_AS_ENABLE_PIN below.
 // #define INVERT_SPINDLE_ENABLE_PIN // Default disabled. Uncomment to enable.
 
+// Inverts the selected coolant pin from low-disabled/high-enabled to low-enabled/high-disabled. Useful
+// for some pre-built electronic boards.
+// #define INVERT_COOLANT_MIST_PIN // Default disabled. Uncomment to enable.
+// #define INVERT_COOLANT_FLOOD_PIN // Default disabled. Uncomment to enable.
+
 // Enable all pin states feedback in status reports. Configurable with Grbl settings to print only
 // the desired data, which is presented as simple binary reading of each pin as (0 (low) or 1(high)).
 // The fields are printed in a particular order and settings groups are separated by '|' characters. 
@@ -172,6 +182,10 @@
 // ---------------------------------------------------------------------------------------
 // ADVANCED CONFIGURATION OPTIONS:
 
+// Realtime reports will be altered soon, and the current proposed report may be used by commenting 
+// out the following define.
+#define USE_CLASSIC_REALTIME_REPORT // Will be disabled in upcoming releases.
+
 // Enables minimal reporting feedback mode for GUIs, where human-readable strings are not as important.
 // This saves nearly 2KB of flash space and may allow enough space to install other/future features.
 // GUIs will need to install a look-up table for the error-codes that Grbl sends back in their place.
@@ -390,6 +404,15 @@
 #define PARKING_PULLOUT_INCREMENT 5.0 // Spindle pull-out and plunge distance in mm. Incremental distance.
                                       // Must be positive value or equal to zero.
 
+// Enables and configures Grbl's sleep mode feature. If the spindle or coolant are powered and Grbl 
+// is not actively moving or receiving any commands, a sleep timer will start. Once elasped without 
+// receiving any new data or commands, Grbl will execute the sleep mode by shutting down the spindle
+// and coolant and entering a safe sleep state. If parking is enabled, Grbl will park the machine as
+// well. While in sleep mode, only a hard/soft reset will exit it and the job will be unrecoverable.
+// NOTE: Sleep mode is a safety feature, primarily to address communication disconnect problems.
+// #define SLEEP_ENABLE  // Default disabled. Uncomment to enable.
+#define SLEEP_DURATION 5.0 // Seconds before sleep auto-park and power down procedures are executed.
+
 
 // ---------------------------------------------------------------------------------------
 // COMPILE-TIME ERROR CHECKING OF DEFINE VALUES:
@@ -404,7 +427,17 @@
   #endif
 #endif
 
-// ---------------------------------------------------------------------------------------
+/* ---------------------------------------------------------------------------------------
+   OEM Single File Configuration Option
+
+   Instructions: Paste the cpu_map and default setting definitions below without an enclosing
+   #ifdef. Comment out the CPU_MAP_xxx and DEFAULT_xxx defines at the top of this file, and
+   the compiler will ignore the contents of defaults.h and cpu_map.h and use the definitions
+   below.
+*/
+
+// Paste CPU_MAP definitions here.
 
+// Paste default settings definitions here.
 
 #endif
diff --git a/grbl/coolant_control.c b/grbl/coolant_control.c
@@ -2,7 +2,7 @@
   coolant_control.c - coolant control methods
   Part of Grbl
 
-  Copyright (c) 2012-2015 Sungeun K. Jeon
+  Copyright (c) 2012-2016 Sungeun K. Jeon
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,16 +23,40 @@
 
 void coolant_init()
 {
-  COOLANT_FLOOD_DDR |= (1 << COOLANT_FLOOD_BIT);
-  COOLANT_MIST_DDR |= (1 << COOLANT_MIST_BIT);
+  COOLANT_FLOOD_DDR |= (1 << COOLANT_FLOOD_BIT); // Configure as output pin.
+  COOLANT_MIST_DDR |= (1 << COOLANT_MIST_BIT); // Configure as output pin.
   coolant_stop();
 }
 
 
+uint8_t coolant_is_enabled()
+{
+  #ifdef INVERT_COOLANT_FLOOD_PIN
+    if (!(COOLANT_FLOOD_PORT & (1<<COOLANT_FLOOD_BIT))) { return(true); }
+  #else
+    if (COOLANT_FLOOD_PORT & (1<<COOLANT_FLOOD_BIT)) { return(true); }
+  #endif
+  #ifdef INVERT_COOLANT_MIST_PIN
+    if (!(COOLANT_MIST_PORT & (1<<COOLANT_MIST_BIT))) { return(true); }
+  #else
+    if (COOLANT_MIST_PORT & (1<<COOLANT_MIST_BIT)) { return(true); }
+  #endif
+  return(false); 
+}
+
+
 void coolant_stop()
 {
-  COOLANT_FLOOD_PORT &= ~(1 << COOLANT_FLOOD_BIT);
-  COOLANT_MIST_PORT &= ~(1 << COOLANT_MIST_BIT);
+  #ifdef INVERT_COOLANT_FLOOD_PIN
+    COOLANT_FLOOD_PORT |= (1 << COOLANT_FLOOD_BIT);
+  #else
+    COOLANT_FLOOD_PORT &= ~(1 << COOLANT_FLOOD_BIT);
+  #endif
+  #ifdef INVERT_COOLANT_MIST_PIN
+    COOLANT_MIST_PORT |= (1 << COOLANT_MIST_BIT);
+  #else
+    COOLANT_MIST_PORT &= ~(1 << COOLANT_MIST_BIT);
+  #endif
 }
 
 
@@ -41,9 +65,17 @@ void coolant_set_state(uint8_t mode)
   if (sys.abort) { return; } // Block during abort.
 
   if (mode == COOLANT_FLOOD_ENABLE) {
-    COOLANT_FLOOD_PORT |= (1 << COOLANT_FLOOD_BIT);
+    #ifdef INVERT_COOLANT_FLOOD_PIN
+      COOLANT_FLOOD_PORT &= ~(1 << COOLANT_FLOOD_BIT);
+    #else
+      COOLANT_FLOOD_PORT |= (1 << COOLANT_FLOOD_BIT);
+    #endif
   } else if (mode == COOLANT_MIST_ENABLE) {
-    COOLANT_MIST_PORT |= (1 << COOLANT_MIST_BIT);
+    #ifdef INVERT_COOLANT_MIST_PIN
+      COOLANT_MIST_PORT &= ~(1 << COOLANT_MIST_BIT);
+    #else
+      COOLANT_MIST_PORT |= (1 << COOLANT_MIST_BIT);
+    #endif
   } else {
     coolant_stop();
   }

diff --git a/grbl/coolant_control.h b/grbl/coolant_control.h
@@ -26,5 +26,6 @@ void coolant_init();
 void coolant_stop();
 void coolant_set_state(uint8_t mode);
 void coolant_run(uint8_t mode);
+uint8_t coolant_is_enabled();
 
 #endif