Corrected G10 L20 P0 command (setZero)

README.md

@@ -34,7 +34,7 @@ Build notes:
 * Install the ARM embeded toolchain (see https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads)
 * Include ```make``` and the ```arm-none-eabi-*``` tools in your path.
 * Run ```git submodule init``` and ```git submodule update``` before building.
-* Make produces 2 files:
+* ```make``` produces 2 files:
   * ```build/firmware.bin```: this is compatible with the sdcard bootloader.
   * ```build/grbl.hex```: this is not compatible with the sdcard bootloader. It loads using Flash Magic 
     and is primarilly for developers who don't want to keep swapping sdcards. If you flash this,

grbl/config.h

@@ -38,6 +38,9 @@
 //#define CPU_MAP_MKS_SBASE       // MKS SBASE Board (NXP LPC1768 MCU)
 //#define CPU_MAP_AZTEEG_X5       // Azteeg X5 Board (NXP LPC1769 MCU)
 
+// Force Spincle PWM Pin 2.4 (default is P2.5)
+//#define SPINDLE_PWM_PIN_2_4
+
 // Define machine type for machine specific defaults
 //#define DEFAULTS_GENERIC
 #define DEFAULTS_K40
@@ -136,7 +139,7 @@
 // #define HOMING_FORCE_SET_ORIGIN // Uncomment to enable.
 
 // Uncomment this define to force Grbl to always set the machine origin at bottom left.
-//#define HOMING_FORCE_POSITIVE_SPACE // Uncomment to enable.
+#define HOMING_FORCE_POSITIVE_SPACE // Uncomment to enable.
 
 // Number of blocks Grbl executes upon startup. These blocks are stored in EEPROM, where the size
 // and addresses are defined in settings.h. With the current settings, up to 2 startup blocks may
@@ -176,7 +179,7 @@
 // Enables a second coolant control pin via the mist coolant g-code command M7 on the Arduino Uno
 // analog pin 4. Only use this option if you require a second coolant control pin.
 // NOTE: The M8 flood coolant control pin on analog pin 3 will still be functional regardless.
-// #define ENABLE_M7 // Disabled by default. Uncomment to enable.
+//#define ENABLE_M7 // Disabled by default. Uncomment to enable.
 
 // This option causes the feed hold input to act as a safety door switch. A safety door, when triggered,
 // immediately forces a feed hold and then safely de-energizes the machine. Resuming is blocked until
@@ -196,7 +199,7 @@
 // defined at (http://corexy.com/theory.html). Motors are assumed to positioned and wired exactly as
 // described, if not, motions may move in strange directions. Grbl requires the CoreXY A and B motors
 // have the same steps per mm internally.
-// #define COREXY // Default disabled. Uncomment to enable.
+//#define COREXY // 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.
@@ -569,7 +572,7 @@
 
 // LPC176x flash blocks have a rating of 10,000 write cycles. To prevent excess wear, we don't
 // write G10, G28.1, and G30.1. Uncomment to enable these writes.
-// #define STORE_COORD_DATA // Default disabled. Uncomment to enable.
+#define STORE_COORD_DATA // Default disabled. Uncomment to enable.
 
 // In Grbl v0.9 and prior, there is an old outstanding bug where the `WPos:` work position reported
 // may not correlate to what is executing, because `WPos:` is based on the g-code parser state, which

grbl/cpu_map.h

@@ -190,17 +190,18 @@
   #define LIMIT_PORT        LPC_GPIO1->FIOPIN
   #define X_LIMIT_BIT       24  // X-MIN=24, X-MAX=25
   #define Y_LIMIT_BIT       26  // Y-MIN=26, Y-MAX=27
-  #define Z_LIMIT_BIT	    29  // Z-MIN=28, Z-MAX=29
-  #define A_LIMIT_BIT       28  // reuse p1.28, as z-min is not often used
+  #define Z_LIMIT_BIT	    28  // Z-MIN=28, Z-MAX=29
+  #define A_LIMIT_BIT       29  // reuse p1.29
   #define LIMIT_MASK       ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
 
   // Define flood and mist coolant enable output pins.
-  #define COOLANT_FLOOD_DDR   NotUsed
-  #define COOLANT_FLOOD_PORT  NotUsed
-  #define COOLANT_FLOOD_BIT   3  // Uno Analog Pin 3
-  #define COOLANT_MIST_DDR   NotUsed
-  #define COOLANT_MIST_PORT  NotUsed
-  #define COOLANT_MIST_BIT   4  // Uno Analog Pin 3
+  #define COOLANT_FLOOD_DDR   LPC_GPIO2->FIODIR
+  #define COOLANT_FLOOD_PORT  LPC_GPIO2->FIOPIN
+  #define COOLANT_FLOOD_BIT   4  // SMALL MOSFET Q8 (P2.4)
+  #define COOLANT_MIST_DDR    LPC_GPIO2->FIODIR
+  #define COOLANT_MIST_PORT   LPC_GPIO2->FIOPIN
+  #define COOLANT_MIST_BIT   6  // SMALL MOSFET Q9 (P2.6)
+  #define ENABLE_M7           // enables COOLANT MIST
 
   // Define user-control controls (cycle start, reset, feed hold) input pins.
   // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
@@ -229,7 +230,11 @@
   // PWM Channel      PWM1_CH1  PWM1_CH2  PWM1_CH3  PWM1_CH4  PWM1_CH5  PWM1_CH6
   // Primary pin      P1.18     P1.20     P1.21     P1.23     P1.24     P1.26
   // Secondary pin    P2.0      P2.1      P2.2      P2.3      P2.4      P2.5
-  #define SPINDLE_PWM_CHANNEL           PWM1_CH6
+  #ifdef SPINDLE_PWM_PIN_2_4
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH5    // MOSFET3 (P2.4)
+  #else
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH6    // BED MOSFET (P2.5)
+  #endif
   #define SPINDLE_PWM_USE_PRIMARY_PIN   false
   #define SPINDLE_PWM_USE_SECONDARY_PIN true
 
@@ -299,12 +304,13 @@
   #define LIMIT_MASK       ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
 
   // Define flood and mist coolant enable output pins.
-  #define COOLANT_FLOOD_DDR   NotUsed
-  #define COOLANT_FLOOD_PORT  NotUsed
-  #define COOLANT_FLOOD_BIT   3  // Uno Analog Pin 3
-  #define COOLANT_MIST_DDR   NotUsed
-  #define COOLANT_MIST_PORT  NotUsed
-  #define COOLANT_MIST_BIT   4  // Uno Analog Pin 3
+  #define COOLANT_FLOOD_DDR   LPC_GPIO2->FIODIR
+  #define COOLANT_FLOOD_PORT  LPC_GPIO2->FIOPIN
+  #define COOLANT_FLOOD_BIT   6  // MOSFET 2.6
+  #define COOLANT_MIST_DDR    LPC_GPIO2->FIODIR
+  #define COOLANT_MIST_PORT   LPC_GPIO2->FIOPIN
+  #define COOLANT_MIST_BIT    7  // MOSFET 2.7
+  #define ENABLE_M7           // enables COOLANT MIST
 
   // Define user-control controls (cycle start, reset, feed hold) input pins.
   // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
@@ -333,7 +339,11 @@
   // PWM Channel      PWM1_CH1  PWM1_CH2  PWM1_CH3  PWM1_CH4  PWM1_CH5  PWM1_CH6
   // Primary pin      P1.18     P1.20     P1.21     P1.23     P1.24     P1.26
   // Secondary pin    P2.0      P2.1      P2.2      P2.3      P2.4      P2.5
-  #define SPINDLE_PWM_CHANNEL           PWM1_CH6
+  #ifdef SPINDLE_PWM_PIN_2_4
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH5    // MOSFET3 (P2.4)
+  #else
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH6    // BED MOSFET (P2.5)
+  #endif
   #define SPINDLE_PWM_USE_PRIMARY_PIN   false
   #define SPINDLE_PWM_USE_SECONDARY_PIN true
 
@@ -399,10 +409,11 @@
   // Define flood and mist coolant enable output pins.
   #define COOLANT_FLOOD_DDR   NotUsed
   #define COOLANT_FLOOD_PORT  NotUsed
-  #define COOLANT_FLOOD_BIT   3  // Uno Analog Pin 3
-  #define COOLANT_MIST_DDR   NotUsed
-  #define COOLANT_MIST_PORT  NotUsed
-  #define COOLANT_MIST_BIT   4  // Uno Analog Pin 3
+  #define COOLANT_FLOOD_BIT   6  // MOSFET 3 (P2.6)
+  #define COOLANT_MIST_DDR    LPC_GPIO2->FIODIR
+  #define COOLANT_MIST_PORT   LPC_GPIO2->FIOPIN
+  #define COOLANT_MIST_BIT    7  // MOSFET 2 (P2.7)
+  #define ENABLE_M7           // enables COOLANT MIST
 
   // Define user-control controls (cycle start, reset, feed hold) input pins.
   // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
@@ -431,7 +442,11 @@
   // PWM Channel      PWM1_CH1  PWM1_CH2  PWM1_CH3  PWM1_CH4  PWM1_CH5  PWM1_CH6
   // Primary pin      P1.18     P1.20     P1.21     P1.23     P1.24     P1.26
   // Secondary pin    P2.0      P2.1      P2.2      P2.3      P2.4      P2.5
-  #define SPINDLE_PWM_CHANNEL           PWM1_CH6
+  #ifdef SPINDLE_PWM_PIN_2_4
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH5    // MOSFET3 (P2.4)
+  #else
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH6    // BED MOSFET (P2.5)
+  #endif
   #define SPINDLE_PWM_USE_PRIMARY_PIN   false
   #define SPINDLE_PWM_USE_SECONDARY_PIN true
 
@@ -490,17 +505,18 @@
   #define LIMIT_PORT        LPC_GPIO1->FIOPIN
   #define X_LIMIT_BIT       24  // X-MIN=24, X-MAX=25
   #define Y_LIMIT_BIT       26  // Y-MIN=26, Y-MAX=27
-  #define Z_LIMIT_BIT	    29  // Z-MIN=28, Z-MAX=29
-  #define A_LIMIT_BIT       28  // reuse p1.28, as z-min is not often used
+  #define Z_LIMIT_BIT	    28  // Z-MIN=28, Z-MAX=29
+  #define A_LIMIT_BIT       29  // reuse p1.29
   #define LIMIT_MASK       ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
 
   // Define flood and mist coolant enable output pins.
-  #define COOLANT_FLOOD_DDR   NotUsed
-  #define COOLANT_FLOOD_PORT  NotUsed
-  #define COOLANT_FLOOD_BIT   3  // Uno Analog Pin 3
-  #define COOLANT_MIST_DDR   NotUsed
-  #define COOLANT_MIST_PORT  NotUsed
-  #define COOLANT_MIST_BIT   4  // Uno Analog Pin 3
+  #define COOLANT_FLOOD_DDR   LPC_GPIO2->FIODIR
+  #define COOLANT_FLOOD_PORT  LPC_GPIO2->FIOPIN
+  #define COOLANT_FLOOD_BIT   6  // MOSFET 2.6
+  #define COOLANT_MIST_DDR    LPC_GPIO2->FIODIR
+  #define COOLANT_MIST_PORT   LPC_GPIO2->FIOPIN
+  #define COOLANT_MIST_BIT    7  // MOSFET 2.7
+  #define ENABLE_M7           // enables COOLANT MIST
 
   // Define user-control controls (cycle start, reset, feed hold) input pins.
   // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
@@ -529,7 +545,11 @@
   // PWM Channel      PWM1_CH1  PWM1_CH2  PWM1_CH3  PWM1_CH4  PWM1_CH5  PWM1_CH6
   // Primary pin      P1.18     P1.20     P1.21     P1.23     P1.24     P1.26
   // Secondary pin    P2.0      P2.1      P2.2      P2.3      P2.4      P2.5
-  #define SPINDLE_PWM_CHANNEL           PWM1_CH6
+  #ifdef SPINDLE_PWM_PIN_2_4
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH5    // MOSFET3 (P2.4)
+  #else
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH6    // BED MOSFET (P2.5)
+  #endif
   #define SPINDLE_PWM_USE_PRIMARY_PIN   false
   #define SPINDLE_PWM_USE_SECONDARY_PIN true
 
@@ -599,13 +619,14 @@
   #define LIMIT_MASK       ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
 
   // Define flood and mist coolant enable output pins.
-  #define COOLANT_FLOOD_DDR   NotUsed
-  #define COOLANT_FLOOD_PORT  NotUsed
-  #define COOLANT_FLOOD_BIT   3  // Uno Analog Pin 3
-  #define COOLANT_MIST_DDR   NotUsed
-  #define COOLANT_MIST_PORT  NotUsed
-  #define COOLANT_MIST_BIT   4  // Uno Analog Pin 3
-
+  #define COOLANT_FLOOD_DDR   LPC_GPIO2->FIODIR
+  #define COOLANT_FLOOD_PORT  LPC_GPIO2->FIOPIN
+  #define COOLANT_FLOOD_BIT   4  // FAN MOSFET (P2.4)
+  #define COOLANT_MIST_DDR    LPC_GPIO2->FIODIR
+  #define COOLANT_MIST_PORT   LPC_GPIO2->FIOPIN
+  #define COOLANT_MIST_BIT    7  // BED MOSFET (P2.7)
+  #define ENABLE_M7           // enables COOLANT MIST
+  
   // Define user-control controls (cycle start, reset, feed hold) input pins.
   // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
   #define CONTROL_DDR       NotUsed
@@ -630,10 +651,14 @@
 
   // The LPC17xx has 6 PWM channels. Each channel has 2 pins. It can drive both pins simultaneously to the same value.
   //
-  // PWM Channel      PWM1_CH1  PWM1_CH2  PWM1_CH3  PWM1_CH4  PWM1_CH5  PWM1_CH6  PWM1_CH7  PWM1_CH8
-  // Primary pin      P1.18     P1.20     P1.21     P1.23     P1.24     P1.26     ?         ?
-  // Secondary pin    P2.0      P2.1      P2.2      P2.3      P2.4      P2.5      P2.6      P2.7
-  #define SPINDLE_PWM_CHANNEL           PWM1_CH8
+  // PWM Channel      PWM1_CH1  PWM1_CH2  PWM1_CH3  PWM1_CH4  PWM1_CH5  PWM1_CH6
+  // Primary pin      P1.18     P1.20     P1.21     P1.23     P1.24     P1.26   
+  // Secondary pin    P2.0      P2.1      P2.2      P2.3      P2.4      P2.5     
+  #ifdef SPINDLE_PWM_PIN_2_4
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH5    // MOSFET3 (P2.4)
+  #else
+    #define SPINDLE_PWM_CHANNEL         PWM1_CH6    // BED MOSFET (P2.5)
+  #endif
   #define SPINDLE_PWM_USE_PRIMARY_PIN   false
   #define SPINDLE_PWM_USE_SECONDARY_PIN true
 

grbl/gcode.c

@@ -313,9 +313,9 @@ uint8_t gc_execute_line(char *line)
           case 'R': word_bit = WORD_R; gc_block.values.r = value; break;
           case 'S': word_bit = WORD_S; gc_block.values.s = value; break;
           case 'T': word_bit = WORD_T; 
-					  if (value > MAX_TOOL_NUMBER) { FAIL(STATUS_GCODE_MAX_VALUE_EXCEEDED); }
+            if (value > MAX_TOOL_NUMBER) { FAIL(STATUS_GCODE_MAX_VALUE_EXCEEDED); }
             gc_block.values.t = int_value;
-						break;
+			break;
           case 'X': word_bit = WORD_X; gc_block.values.xyza[X_AXIS] = value; axis_words |= (1<<X_AXIS); break;
           case 'Y': word_bit = WORD_Y; gc_block.values.xyza[Y_AXIS] = value; axis_words |= (1<<Y_AXIS); break;
           case 'Z': word_bit = WORD_Z; gc_block.values.xyza[Z_AXIS] = value; axis_words |= (1<<Z_AXIS); break;

grbl/gcode.h

@@ -199,7 +199,7 @@ typedef struct {
 
 typedef struct {
   float f;         // Feed
-  float ijk[3];    // I,J,K Axis arc offsets
+  float ijk[N_AXIS];    // I,J,K Axis arc offsets
   uint8_t l;       // G10 or canned cycles parameters
   int32_t n;       // Line number
   float p;         // G10 or dwell parameters

grbl/grbl.h

@@ -23,7 +23,7 @@
 
 // Grbl versioning system
 #define GRBL_VERSION "1.1f"
-#define GRBL_VERSION_BUILD "20170511"
+#define GRBL_VERSION_BUILD "20171008"
 
 // Define standard libraries used by Grbl.
 #include <avr/io.h>