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.)
grbl · ondabeach · Aug 28, 2015 · Aug 28, 2015 · Aug 29, 2015 · Sep 5, 2015
commit b29b960c289feb455c290f3919142d76e04ae0f7
diff --git a/doc/log/commit_log_v1.0d.txt b/doc/log/commit_log_v1.0d.txt
@@ -0,0 +1,27 @@
+----------------
+Date: 2016-03-19
+Author: Sonny Jeon
+Subject: Removed 328p-related code. Enabled options by default.
+
+- Removed all of the 328p-related code, which seemed to clean up things
+quite a bit without all those ifdefs everywhere.
+
+- Since the 328p was very memory and flash limited, lots of
+compile-time options were disabled by default. These have been now been
+enabled by default. As they are considered generally helpful and does
+not significantly impact how Grbl runs.
+
+- For example, status reports can now report back real time feed rate
+and line number being executed. Variable spindle is standard with a
+separate spindle enable pin. Grbl will now check if a user setting has
+exceeded the maximum step frequency and report an error, if so. And
+finally, M7 flood coolant is enabled.
+
+- In addition, all buffers have been significantly increased to take
+advantage of the additional memory available. The planner buffer can
+plan up to 36 motions. The serial buffers have been doubled in size
+(256/128 bytes RX/TX). And the longest line Grbl can accept is 256
+bytes, per the g-code standard (Grbl 328p is limited to 80).
+
+- Removed the cpu_map folder, since this version is strictly Mega2560.
+
diff --git a/grbl/config.h b/grbl/config.h
@@ -108,6 +108,12 @@
 // homing cycle while on the limit switch and not have to move the machine off of it.
 // #define LIMITS_TWO_SWITCHES_ON_AXES
 
+// Allows GRBL to track and report gcode line numbers and real-time feed rate. Both of these may
+// be toggled to be visible when their status report mask setting when enabled.
+// NOTE: The option to disable these will be removed soon, as these will be added permanently.
+#define REPORT_REALTIME_LINE_NUMBERS // Enabled by default. Comment to disable.
+#define REPORT_REALTIME_RATE // Enabled by default. Comment to disable.
+
 // Upon a successful probe cycle, this option provides immediately feedback of the probe coordinates
 // through an automatically generated message. If disabled, users can still access the last probe
 // coordinates through Grbl '$#' print parameters.
@@ -315,6 +321,12 @@
 // NOTE: Buffer size values must be greater than zero and less than 256.
 // #define RX_BUFFER_SIZE 256 // Uncomment to override defaults in serial.h
 // #define TX_BUFFER_SIZE 128
+
+// The maximum line length of a data string stored in EEPROM. Used by startup lines and build
+// info. This size differs from the LINE_BUFFER_SIZE as the EEPROM is usually limited in size.
+// NOTE: Be very careful when changing this value. Check EEPROM address locations to make sure
+// these string storage locations won't corrupt one another.
+// #define EEPROM_LINE_SIZE 80 // Uncomment to override defaults in settings.h
 
 // Toggles XON/XOFF software flow control for serial communications. Not officially supported
 // due to problems involving the Atmega8U2 USB-to-serial chips on current Arduinos. The firmware

diff --git a/grbl/grbl.h b/grbl/grbl.h
@@ -22,8 +22,8 @@
 #define grbl_h
 
 // Grbl versioning system
-#define GRBL_VERSION "1.0c"
-#define GRBL_VERSION_BUILD "20160319"
+#define GRBL_VERSION "1.0d"
+#define GRBL_VERSION_BUILD "20160320"
 
 // Define standard libraries used by Grbl.
 #include <avr/io.h>

diff --git a/grbl/report.c b/grbl/report.c
@@ -73,6 +73,8 @@ void report_status_message(uint8_t status_code)
         printPgmString(PSTR("Step rate > 30kHz")); break;
         case STATUS_CHECK_DOOR:
         printPgmString(PSTR("Check Door")); break;
+        case STATUS_LINE_LENGTH_EXCEEDED:
+        printPgmString(PSTR("Line length exceeded")); break;
         // Common g-code parser errors.
         case STATUS_GCODE_MODAL_GROUP_VIOLATION:
         printPgmString(PSTR("Modal group violation")); break;
@@ -479,18 +481,22 @@ void report_realtime_status()
     print_uint8_base10(serial_get_rx_buffer_count());
   }
 
-  // Report current line number
-  printPgmString(PSTR(",Ln:")); 
-  int32_t ln=0;
-  plan_block_t * pb = plan_get_current_block();
-  if(pb != NULL) {
-    ln = pb->line_number;
-  } 
-  printInteger(ln);
-
-  // Report realtime rate 
-  printPgmString(PSTR(",F:")); 
-  printFloat_RateValue(st_get_realtime_rate());    
+  #ifdef REPORT_REALTIME_LINE_NUMBERS  
+    // Report current line number
+    printPgmString(PSTR(",Ln:")); 
+    int32_t ln=0;
+    plan_block_t * pb = plan_get_current_block();
+    if(pb != NULL) {
+      ln = pb->line_number;
+    } 
+    printInteger(ln);
+  #endif
+
+  #ifdef REPORT_REALTIME_RATE
+    // Report realtime rate 
+    printPgmString(PSTR(",F:")); 
+    printFloat_RateValue(st_get_realtime_rate());    
+  #endif
 
   #ifdef REPORT_ALL_PIN_STATES
     if (bit_istrue(settings.status_report_mask,

diff --git a/grbl/report.h b/grbl/report.h
@@ -35,6 +35,7 @@
 #define STATUS_OVERFLOW 11
 #define STATUS_MAX_STEP_RATE_EXCEEDED 12
 #define STATUS_CHECK_DOOR 13
+#define STATUS_LINE_LENGTH_EXCEEDED 14
 
 #define STATUS_GCODE_UNSUPPORTED_COMMAND 20
 #define STATUS_GCODE_MODAL_GROUP_VIOLATION 21

diff --git a/grbl/settings.c b/grbl/settings.c
@@ -27,15 +27,15 @@ settings_t settings;
 // Method to store startup lines into EEPROM
 void settings_store_startup_line(uint8_t n, char *line)
 {
-  uint32_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
-  memcpy_to_eeprom_with_checksum(addr,(char*)line, LINE_BUFFER_SIZE);
+  uint32_t addr = n*(EEPROM_LINE_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
+  memcpy_to_eeprom_with_checksum(addr,(char*)line, EEPROM_LINE_SIZE);
 }
 
 
 // Method to store build info into EEPROM
 void settings_store_build_info(char *line)
 {
-  memcpy_to_eeprom_with_checksum(EEPROM_ADDR_BUILD_INFO,(char*)line, LINE_BUFFER_SIZE);
+  memcpy_to_eeprom_with_checksum(EEPROM_ADDR_BUILD_INFO,(char*)line, EEPROM_LINE_SIZE);
 }
 
 
@@ -58,61 +58,61 @@ void write_global_settings()
 // Method to restore EEPROM-saved Grbl global settings back to defaults. 
 void settings_restore(uint8_t restore_flag) {  
   if (restore_flag & SETTINGS_RESTORE_DEFAULTS) {
-	settings.pulse_microseconds = DEFAULT_STEP_PULSE_MICROSECONDS;
-	settings.stepper_idle_lock_time = DEFAULT_STEPPER_IDLE_LOCK_TIME;
-	settings.step_invert_mask = DEFAULT_STEPPING_INVERT_MASK;
-	settings.dir_invert_mask = DEFAULT_DIRECTION_INVERT_MASK;
-	settings.status_report_mask = DEFAULT_STATUS_REPORT_MASK;
-	settings.junction_deviation = DEFAULT_JUNCTION_DEVIATION;
-	settings.arc_tolerance = DEFAULT_ARC_TOLERANCE;
-
-	settings.rpm_max = DEFAULT_SPINDLE_RPM_MAX;
-	settings.rpm_min = DEFAULT_SPINDLE_RPM_MIN;
-
-	settings.homing_dir_mask = DEFAULT_HOMING_DIR_MASK;
-	settings.homing_feed_rate = DEFAULT_HOMING_FEED_RATE;
-	settings.homing_seek_rate = DEFAULT_HOMING_SEEK_RATE;
-	settings.homing_debounce_delay = DEFAULT_HOMING_DEBOUNCE_DELAY;
-	settings.homing_pulloff = DEFAULT_HOMING_PULLOFF;
-
-	settings.flags = 0;
-	if (DEFAULT_REPORT_INCHES) { settings.flags |= BITFLAG_REPORT_INCHES; }
-	if (DEFAULT_INVERT_ST_ENABLE) { settings.flags |= BITFLAG_INVERT_ST_ENABLE; }
-	if (DEFAULT_INVERT_LIMIT_PINS) { settings.flags |= BITFLAG_INVERT_LIMIT_PINS; }
-	if (DEFAULT_SOFT_LIMIT_ENABLE) { settings.flags |= BITFLAG_SOFT_LIMIT_ENABLE; }
-	if (DEFAULT_HARD_LIMIT_ENABLE) { settings.flags |= BITFLAG_HARD_LIMIT_ENABLE; }
-	if (DEFAULT_HOMING_ENABLE) { settings.flags |= BITFLAG_HOMING_ENABLE; }
+    settings.pulse_microseconds = DEFAULT_STEP_PULSE_MICROSECONDS;
+    settings.stepper_idle_lock_time = DEFAULT_STEPPER_IDLE_LOCK_TIME;
+    settings.step_invert_mask = DEFAULT_STEPPING_INVERT_MASK;
+    settings.dir_invert_mask = DEFAULT_DIRECTION_INVERT_MASK;
+    settings.status_report_mask = DEFAULT_STATUS_REPORT_MASK;
+    settings.junction_deviation = DEFAULT_JUNCTION_DEVIATION;
+    settings.arc_tolerance = DEFAULT_ARC_TOLERANCE;
 
-	settings.steps_per_mm[X_AXIS] = DEFAULT_X_STEPS_PER_MM;
-	settings.steps_per_mm[Y_AXIS] = DEFAULT_Y_STEPS_PER_MM;
-	settings.steps_per_mm[Z_AXIS] = DEFAULT_Z_STEPS_PER_MM;
-	settings.max_rate[X_AXIS] = DEFAULT_X_MAX_RATE;
-	settings.max_rate[Y_AXIS] = DEFAULT_Y_MAX_RATE;
-	settings.max_rate[Z_AXIS] = DEFAULT_Z_MAX_RATE;
-	settings.acceleration[X_AXIS] = DEFAULT_X_ACCELERATION;
-	settings.acceleration[Y_AXIS] = DEFAULT_Y_ACCELERATION;
-	settings.acceleration[Z_AXIS] = DEFAULT_Z_ACCELERATION;
-	settings.max_travel[X_AXIS] = (-DEFAULT_X_MAX_TRAVEL);
-	settings.max_travel[Y_AXIS] = (-DEFAULT_Y_MAX_TRAVEL);
-	settings.max_travel[Z_AXIS] = (-DEFAULT_Z_MAX_TRAVEL);    
-
-	write_global_settings();
+    settings.rpm_max = DEFAULT_SPINDLE_RPM_MAX;
+    settings.rpm_min = DEFAULT_SPINDLE_RPM_MIN;
+
+    settings.homing_dir_mask = DEFAULT_HOMING_DIR_MASK;
+    settings.homing_feed_rate = DEFAULT_HOMING_FEED_RATE;
+    settings.homing_seek_rate = DEFAULT_HOMING_SEEK_RATE;
+    settings.homing_debounce_delay = DEFAULT_HOMING_DEBOUNCE_DELAY;
+    settings.homing_pulloff = DEFAULT_HOMING_PULLOFF;
+
+    settings.flags = 0;
+    if (DEFAULT_REPORT_INCHES) { settings.flags |= BITFLAG_REPORT_INCHES; }
+    if (DEFAULT_INVERT_ST_ENABLE) { settings.flags |= BITFLAG_INVERT_ST_ENABLE; }
+    if (DEFAULT_INVERT_LIMIT_PINS) { settings.flags |= BITFLAG_INVERT_LIMIT_PINS; }
+    if (DEFAULT_SOFT_LIMIT_ENABLE) { settings.flags |= BITFLAG_SOFT_LIMIT_ENABLE; }
+    if (DEFAULT_HARD_LIMIT_ENABLE) { settings.flags |= BITFLAG_HARD_LIMIT_ENABLE; }
+    if (DEFAULT_HOMING_ENABLE) { settings.flags |= BITFLAG_HOMING_ENABLE; }
+
+    settings.steps_per_mm[X_AXIS] = DEFAULT_X_STEPS_PER_MM;
+    settings.steps_per_mm[Y_AXIS] = DEFAULT_Y_STEPS_PER_MM;
+    settings.steps_per_mm[Z_AXIS] = DEFAULT_Z_STEPS_PER_MM;
+    settings.max_rate[X_AXIS] = DEFAULT_X_MAX_RATE;
+    settings.max_rate[Y_AXIS] = DEFAULT_Y_MAX_RATE;
+    settings.max_rate[Z_AXIS] = DEFAULT_Z_MAX_RATE;
+    settings.acceleration[X_AXIS] = DEFAULT_X_ACCELERATION;
+    settings.acceleration[Y_AXIS] = DEFAULT_Y_ACCELERATION;
+    settings.acceleration[Z_AXIS] = DEFAULT_Z_ACCELERATION;
+    settings.max_travel[X_AXIS] = (-DEFAULT_X_MAX_TRAVEL);
+    settings.max_travel[Y_AXIS] = (-DEFAULT_Y_MAX_TRAVEL);
+    settings.max_travel[Z_AXIS] = (-DEFAULT_Z_MAX_TRAVEL);    
+
+    write_global_settings();
   }
 
   if (restore_flag & SETTINGS_RESTORE_PARAMETERS) {
-	uint8_t idx;
-	float coord_data[N_AXIS];
-	memset(&coord_data, 0, sizeof(coord_data));
-	for (idx=0; idx <= SETTING_INDEX_NCOORD; idx++) { settings_write_coord_data(idx, coord_data); }
+    uint8_t idx;
+    float coord_data[N_AXIS];
+    memset(&coord_data, 0, sizeof(coord_data));
+    for (idx=0; idx <= SETTING_INDEX_NCOORD; idx++) { settings_write_coord_data(idx, coord_data); }
   }
 
   if (restore_flag & SETTINGS_RESTORE_STARTUP_LINES) {
-	#if N_STARTUP_LINE > 0
-	eeprom_put_char(EEPROM_ADDR_STARTUP_BLOCK, 0);
-	#endif
-	#if N_STARTUP_LINE > 1
-	eeprom_put_char(EEPROM_ADDR_STARTUP_BLOCK+(LINE_BUFFER_SIZE+1), 0);
-	#endif
+    #if N_STARTUP_LINE > 0
+      eeprom_put_char(EEPROM_ADDR_STARTUP_BLOCK, 0);
+    #endif
+    #if N_STARTUP_LINE > 1
+      eeprom_put_char(EEPROM_ADDR_STARTUP_BLOCK+(EEPROM_LINE_SIZE+1), 0);
+    #endif
   }
 
   if (restore_flag & SETTINGS_RESTORE_BUILD_INFO) { eeprom_put_char(EEPROM_ADDR_BUILD_INFO , 0); }
@@ -122,8 +122,8 @@ void settings_restore(uint8_t restore_flag) {
 // Reads startup line from EEPROM. Updated pointed line string data.
 uint8_t settings_read_startup_line(uint8_t n, char *line)
 {
-  uint32_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
-  if (!(memcpy_from_eeprom_with_checksum((char*)line, addr, LINE_BUFFER_SIZE))) {
+  uint32_t addr = n*(EEPROM_LINE_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
+  if (!(memcpy_from_eeprom_with_checksum((char*)line, addr, EEPROM_LINE_SIZE))) {
     // Reset line with default value
     line[0] = 0; // Empty line
     settings_store_startup_line(n, line);
@@ -136,7 +136,7 @@ uint8_t settings_read_startup_line(uint8_t n, char *line)
 // Reads startup line from EEPROM. Updated pointed line string data.
 uint8_t settings_read_build_info(char *line)
 {
-  if (!(memcpy_from_eeprom_with_checksum((char*)line, EEPROM_ADDR_BUILD_INFO, LINE_BUFFER_SIZE))) {
+  if (!(memcpy_from_eeprom_with_checksum((char*)line, EEPROM_ADDR_BUILD_INFO, EEPROM_LINE_SIZE))) {
     // Reset line with default value
     line[0] = 0; // Empty line
     settings_store_build_info(line);

diff --git a/grbl/settings.h b/grbl/settings.h
@@ -24,6 +24,9 @@
 
 #include "grbl.h"
 
+#ifndef EEPROM_LINE_SIZE
+  #define EEPROM_LINE_SIZE 80
+#endif
 
 // Version of the EEPROM data. Will be used to migrate existing data from older versions of Grbl
 // when firmware is upgraded. Always stored in byte 0 of eeprom

diff --git a/grbl/system.c b/grbl/system.c
@@ -192,6 +192,7 @@ uint8_t system_execute_line(char *line)
             do {
               line[char_counter-helper_var] = line[char_counter];
             } while (line[char_counter++] != 0);
+            if (char_counter > (EEPROM_LINE_SIZE-helper_var)) { return(STATUS_LINE_LENGTH_EXCEEDED); }
             settings_store_build_info(line);
           }
           break; 
@@ -233,9 +234,10 @@ uint8_t system_execute_line(char *line)
             do {
               line[char_counter-helper_var] = line[char_counter];
             } while (line[char_counter++] != 0);
+            if (char_counter > EEPROM_LINE_SIZE) { return(STATUS_LINE_LENGTH_EXCEEDED); }
             // Execute gcode block to ensure block is valid.
             helper_var = gc_execute_line(line); // Set helper_var to returned status code.
-            if (helper_var) { return(helper_var); }
+            if (helper_var) { return(helper_var); } // Return error.
             else { 
               helper_var = trunc(parameter); // Set helper_var to int value of parameter
               settings_store_startup_line(helper_var,line);