Merge chamnit/v0_7 with grbl/master

settings.h

@@ -3,7 +3,8 @@
   Part of Grbl
 
   Copyright (c) 2009-2011 Simen Svale Skogsrud
-
+  Copyright (c) 2011 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
   the Free Software Foundation, either version 3 of the License, or
@@ -25,11 +26,11 @@
 #include <math.h>
 #include <inttypes.h>
 
-#define GRBL_VERSION "0.6b"
+#define GRBL_VERSION "0.7d"
 
 // 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
-#define SETTINGS_VERSION 2
+#define SETTINGS_VERSION 4
 
 // Current global settings (persisted in EEPROM from byte 1 onwards)
 typedef struct {
@@ -41,7 +42,7 @@ typedef struct {
   uint8_t invert_mask;
   double mm_per_arc_segment;
   double acceleration;
-  double max_jerk;
+  double junction_deviation;
 } settings_t;
 extern settings_t settings;
 
@@ -51,20 +52,10 @@ void settings_init();
 // Print current settings
 void settings_dump();
 
+// Handle settings command
+uint8_t settings_execute_line(char *line);
+
 // A helper method to set new settings from command line
 void settings_store_setting(int parameter, double value);
 
-// Default settings (used when resetting eeprom-settings)
-#define MICROSTEPS 8
-#define DEFAULT_X_STEPS_PER_MM (94.488188976378*MICROSTEPS)
-#define DEFAULT_Y_STEPS_PER_MM (94.488188976378*MICROSTEPS)
-#define DEFAULT_Z_STEPS_PER_MM (94.488188976378*MICROSTEPS)
-#define DEFAULT_STEP_PULSE_MICROSECONDS 30
-#define DEFAULT_MM_PER_ARC_SEGMENT 0.1
-#define DEFAULT_RAPID_FEEDRATE 480.0 // in millimeters per minute
-#define DEFAULT_FEEDRATE 480.0
-#define DEFAULT_ACCELERATION (DEFAULT_FEEDRATE/100.0)
-#define DEFAULT_MAX_JERK 50.0
-#define DEFAULT_STEPPING_INVERT_MASK 0
-
 #endif