Made board switchable in config.h

README.md

@@ -1,7 +1,8 @@
 ![GitHub Logo](https://github.com/gnea/gnea-Media/blob/master/Grbl%20Logo/Grbl%20Logo%20250px.png?raw=true)
 
 ***
-_Click the `Release` tab to download pre-compiled `.bin` files or just [click here](https://github.com/cprezzi/grbl-LPC/releases)_
+Old releases are in the `Release` tab. See [cprezzi's branch](https://github.com/cprezzi/grbl-LPC) for more recent releases.
+Note: cprezzi's branch disables current control and has defaults more suitable for other boards.
 ***
 This is GRBL 1.1 ported to the LPC1769. It can run on Smoothieboard.
 
@@ -12,25 +13,25 @@ Usage notes:
 * Only tested with lasers with PWM. Non-PWM spindle control not ported.
 * These are defaults for easy-to-change config values.
   * WPos enabled for LaserWeb compatability ($10=0)
-  * Maximum S value: 1000.0 ($30)
+  * Laser mode: ON ($32)
   * Minimum S value: 0.0 ($31)
-  * Laser mode: 1 ($32)
+  * Maximum S value: 1.0 ($30)
-* New configuration settings
-  * $33 is PWM frequency in Hz
-  * $34 is PWM off value in %
-  * $35 is PWM min value in %
-  * $36 is PWM max value in %
-  * $140 is X current (amps)
-  * $141 is Y current (amps)
-  * $142 is Z current (amps)
-  * Currents default to 0.0 amps to avoid burning out your motors/drivers
-  * Your motors will likely stall if you don't set these!
-
 * Hard limits not yet ported
 * Control inputs not yet ported (e.g. Cycle Start and Safety Door switches)
 
+New configuration settings
+* $33 is PWM frequency in Hz
+* $34 is PWM off value in %
+* $35 is PWM min value in %
+* $36 is PWM max value in %
+* $140, $141, $142 are X, Y, Z current (amps)
+  * Default to 0.0 A to avoid burning out your motors
+  * Your motors will likely stall if you don't set these!
 
 Build notes:
+* You should use virtual machines, if you use multiple toolchains on the same PC.
+* Install make if not already there (for Windows see http://gnuwin32.sourceforge.net/packages/make.htm)
+* 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:

grbl/config.h

@@ -31,12 +31,14 @@
 #include "LPC17xx.h"
 
 
-// Define CPU pin map and default settings.
+// Define board type for 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
+#define CPU_MAP_SMOOTHIEBOARD   // Smoothieboard (NXP LPC1769 MCU)
-// one configuration file by placing their specific defaults and pin map at the bottom of this file.
+//#define CPU_MAP_C3D_REMIX       // Cohesion3D Remix (NXP LPC1769 MCU)
-// If doing so, simply comment out these two defines and see instructions below.
+//#define CPU_MAP_C3D_MINI        // Cohesion3D Mini (NXP LPC1769 MCU)
-#define CPU_MAP_LPC1769 // NXP LPC1769 boards (like Smoothieboard, Cohesion3D, MKS SBase)
+//#define CPU_MAP_MKS_SBASE       // MKS SBASE Board (NXP LPC1768 MCU)
-#define BOARD_C3D       // For boards without i2c stepper current chip (like Cohesion3D).
+//#define CPU_MAP_AZTEEG_X5       // Azteeg X5 Board (NXP LPC1769 MCU)
+
+// Define machine type for machine specific defaults
 //#define DEFAULTS_GENERIC
 #define DEFAULTS_K40
 //#define DEFAULTS_FABKIT
@@ -133,6 +135,9 @@
 // define to force Grbl to always set the machine origin at the homed location despite switch orientation.
 // #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.
+
 // 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
 // be stored and executed in order. These startup blocks would typically be used to set the g-code

grbl/cpu_map.h

@@ -150,7 +150,7 @@
 #endif
 
 
-#ifdef CPU_MAP_LPC1769 // (Boards with NXP-LPC1769 MCU, like Smoothieboard, Cohesion3D, MKS SBase) Only supported by grbl_LPC
+#ifdef CPU_MAP_SMOOTHIEBOARD // (Smoothieboards)
 
   // Define serial port pins and interrupt vectors.
   #define SERIAL_RX     USART_RX_vect
@@ -163,8 +163,6 @@
   #define Y_STEP_BIT      1
   #define Z_STEP_BIT      2
   #define A_STEP_BIT      3
-  //#define B_STEP_BIT      8
-  //#define C_STEP_BIT      9
   #define STEP_MASK       ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
 
   // Define step direction output pins. NOTE: All direction pins must be on the same port.
@@ -174,8 +172,6 @@
   #define Y_DIRECTION_BIT   11
   #define Z_DIRECTION_BIT   20
   #define A_DIRECTION_BIT   22
-  //#define B_DIRECTION_BIT   13
-  //#define C_DIRECTION_BIT   NotUsed
   #define DIRECTION_MASK    ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
 
   // Define stepper driver enable/disable output pin.
@@ -185,8 +181,6 @@
   #define Y_DISABLE_BIT           10
   #define Z_DISABLE_BIT           19
   #define A_DISABLE_BIT           21
-  //#define B_DISABLE_BIT           29
-  //#define C_DISABLE_BIT           NotUsed
   #define STEPPERS_DISABLE_MASK   ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
 
   // Define homing/hard limit switch input pins and limit interrupt vectors.
@@ -195,37 +189,10 @@
   #define LIMIT_PIN         LPC_GPIO1->FIOPIN
   #define LIMIT_PORT        LPC_GPIO1->FIOPIN
   #define X_LIMIT_BIT       24  // X-MIN=24, X-MAX=25
-  #define Y_LIMIT_BIT       27  // Y-MIN=26, Y-MAX=27
+  #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 B_LIMIT_BIT       NotUsed
-  //#define C_LIMIT_BIT 	  NotUsed
   #define LIMIT_MASK       ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
-  // hard limits not ported    #define LIMIT_INT        PCIE0  // Pin change interrupt enable pin
-  // hard limits not ported    #define LIMIT_INT_vect   PCINT0_vect
-  // hard limits not ported    #define LIMIT_PCMSK      PCMSK0 // Pin change interrupt register
-
-  // Define spindle enable and spindle direction output pins.
-  /* not ported
-  #define SPINDLE_ENABLE_DDR    DDRB
-  #define SPINDLE_ENABLE_PORT   PORTB
-  // Z Limit pin and spindle PWM/enable pin swapped to access hardware PWM on Pin 11.
-  #ifdef VARIABLE_SPINDLE
-    #ifdef USE_SPINDLE_DIR_AS_ENABLE_PIN
-      // If enabled, spindle direction pin now used as spindle enable, while PWM remains on D11.
-      #define SPINDLE_ENABLE_BIT    5  // Uno Digital Pin 13 (NOTE: D13 can't be pulled-high input due to LED.)
-    #else
-      #define SPINDLE_ENABLE_BIT    3  // Uno Digital Pin 11
-    #endif
-  #else
-    #define SPINDLE_ENABLE_BIT    4  // Uno Digital Pin 12
-  #endif
-  #ifndef USE_SPINDLE_DIR_AS_ENABLE_PIN
-    #define SPINDLE_DIRECTION_DDR   DDRB
-    #define SPINDLE_DIRECTION_PORT  PORTB
-    #define SPINDLE_DIRECTION_BIT   5  // Uno Digital Pin 13 (NOTE: D13 can't be pulled-high input due to LED.)
-  #endif
-  */
 
   // Define flood and mist coolant enable output pins.
   #define COOLANT_FLOOD_DDR   NotUsed
@@ -267,12 +234,10 @@
   #define SPINDLE_PWM_USE_SECONDARY_PIN true
 
   // Stepper current control
-  #ifndef BOARD_C3D
+  #define CURRENT_I2C Driver_I2C1       // I2C driver for current control. Comment out to disable (for C3d boards!)
-    #define CURRENT_I2C Driver_I2C1       // I2C driver for current control. Comment out to disable (for C3d boards!)
+  #define CURRENT_MCP44XX_ADDR 0b0101100  // Address of MCP44XX
-    #define CURRENT_MCP44XX_ADDR 0b0101100  // Address of MCP44XX
+  #define CURRENT_WIPERS {0, 1, 6, 7};    // Wiper registers (X, Y, Z, A)
-    #define CURRENT_WIPERS {0, 1, 6, 7};    // Wiper registers (X, Y, Z, A)
+  #define CURRENT_FACTOR 113.33           // Convert amps to digipot value
-    #define CURRENT_FACTOR 113.33           // Convert amps to digipot value
-  #endif
 
   // Variable spindle configuration below. Do not change unless you know what you are doing.
   // NOTE: Only used when variable spindle is enabled.
@@ -286,23 +251,409 @@
   #define SPINDLE_TCCRB_REGISTER	TCCR2B
   #define SPINDLE_OCR_REGISTER      OCR2A
   #define SPINDLE_COMB_BIT	        COM2A1
-
-  // Prescaled, 8-bit Fast PWM mode.
-  /* not used
-  #define SPINDLE_TCCRA_INIT_MASK   ((1<<WGM20) | (1<<WGM21))  // Configures fast PWM mode.
-  // #define SPINDLE_TCCRB_INIT_MASK   (1<<CS20)               // Disable prescaler -> 62.5kHz
-  // #define SPINDLE_TCCRB_INIT_MASK   (1<<CS21)               // 1/8 prescaler -> 7.8kHz (Used in v0.9)
-  // #define SPINDLE_TCCRB_INIT_MASK   ((1<<CS21) | (1<<CS20)) // 1/32 prescaler -> 1.96kHz
-  #define SPINDLE_TCCRB_INIT_MASK      (1<<CS22)               // 1/64 prescaler -> 0.98kHz (J-tech laser)
-
-  // NOTE: On the 328p, these must be the same as the SPINDLE_ENABLE settings.
-  #define SPINDLE_PWM_DDR	  DDRB
-  #define SPINDLE_PWM_PORT    PORTB
-  #define SPINDLE_PWM_BIT	  3    // Uno Digital Pin 11
-  */
-
 #endif
 
+
+#ifdef CPU_MAP_C3D_REMIX // (Cohesion3D Remix Boards)
+
+  // Define serial port pins and interrupt vectors.
+  #define SERIAL_RX     USART_RX_vect
+  #define SERIAL_UDRE   USART_UDRE_vect
+
+  // Define step pulse output pins. NOTE: All step bit pins must be on the same port.
+  #define STEP_DDR        LPC_GPIO2->FIODIR
+  #define STEP_PORT       LPC_GPIO2->FIOPIN
+  #define X_STEP_BIT      0
+  #define Y_STEP_BIT      1
+  #define Z_STEP_BIT      2
+  #define A_STEP_BIT      3
+  #define STEP_MASK       ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
+
+  // Define step direction output pins. NOTE: All direction pins must be on the same port.
+  #define DIRECTION_DDR     LPC_GPIO0->FIODIR
+  #define DIRECTION_PORT    LPC_GPIO0->FIOPIN
+  #define X_DIRECTION_BIT   5
+  #define Y_DIRECTION_BIT   11
+  #define Z_DIRECTION_BIT   20
+  #define A_DIRECTION_BIT   22
+  #define DIRECTION_MASK    ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
+
+  // Define stepper driver enable/disable output pin.
+  #define STEPPERS_DISABLE_DDR    LPC_GPIO0->FIODIR
+  #define STEPPERS_DISABLE_PORT   LPC_GPIO0->FIOPIN
+  #define X_DISABLE_BIT           4
+  #define Y_DISABLE_BIT           10
+  #define Z_DISABLE_BIT           19
+  #define A_DISABLE_BIT           21
+  #define STEPPERS_DISABLE_MASK   ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
+
+  // Define homing/hard limit switch input pins and limit interrupt vectors.
+  // NOTE: All limit bit pins must be on the same port, but not on a port with other input pins (CONTROL).
+  #define LIMIT_DDR         LPC_GPIO1->FIODIR
+  #define LIMIT_PIN         LPC_GPIO1->FIOPIN
+  #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	    28  // Z-MIN=28, Z-MAX=29
+  #define A_LIMIT_BIT       29  // reuse p1.29 from Z-MAX
+  #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 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
+  #define CONTROL_PIN       NotUsed
+  #define CONTROL_PORT      NotUsed
+  #define CONTROL_RESET_BIT         0  // Uno Analog Pin 0
+  #define CONTROL_FEED_HOLD_BIT     1  // Uno Analog Pin 1
+  #define CONTROL_CYCLE_START_BIT   2  // Uno Analog Pin 2
+  #define CONTROL_SAFETY_DOOR_BIT   1  // Uno Analog Pin 1 NOTE: Safety door is shared with feed hold. Enabled by config define.
+  #define CONTROL_INT       PCIE1  // Pin change interrupt enable pin
+  #define CONTROL_INT_vect  PCINT1_vect
+  #define CONTROL_PCMSK     NotUsed // Pin change interrupt register
+  #define CONTROL_MASK      ((1<<CONTROL_RESET_BIT)|(1<<CONTROL_FEED_HOLD_BIT)|(1<<CONTROL_CYCLE_START_BIT)|(1<<CONTROL_SAFETY_DOOR_BIT))
+  #define CONTROL_INVERT_MASK   CONTROL_MASK // May be re-defined to only invert certain control pins.
+
+  // Define probe switch input pin.
+  #define PROBE_DDR       NotUsed
+  #define PROBE_PIN       NotUsed
+  #define PROBE_PORT      NotUsed
+  #define PROBE_BIT       5  // Uno Analog Pin 5
+  #define PROBE_MASK      (1<<PROBE_BIT)
+
+  // 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
+  // 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
+  #define SPINDLE_PWM_USE_PRIMARY_PIN   false
+  #define SPINDLE_PWM_USE_SECONDARY_PIN true
+
+  // Variable spindle configuration below. Do not change unless you know what you are doing.
+  // NOTE: Only used when variable spindle is enabled.
+  #define SPINDLE_PWM_MAX_VALUE     255 // Don't change. 328p fast PWM mode fixes top value as 255.
+  #ifndef SPINDLE_PWM_MIN_VALUE
+    #define SPINDLE_PWM_MIN_VALUE   1   // Must be greater than zero.
+  #endif
+  //#define SPINDLE_PWM_OFF_VALUE     0 // Defined in config.h
+  #define SPINDLE_PWM_RANGE         (SPINDLE_PWM_MAX_VALUE-SPINDLE_PWM_MIN_VALUE)
+  #define SPINDLE_TCCRA_REGISTER	TCCR2A
+  #define SPINDLE_TCCRB_REGISTER	TCCR2B
+  #define SPINDLE_OCR_REGISTER      OCR2A
+  #define SPINDLE_COMB_BIT	        COM2A1
+#endif
+
+
+#ifdef CPU_MAP_C3D_MINI // (Cohesion3D Mini Boards)
+
+  // Define serial port pins and interrupt vectors.
+  #define SERIAL_RX     USART_RX_vect
+  #define SERIAL_UDRE   USART_UDRE_vect
+
+  // Define step pulse output pins. NOTE: All step bit pins must be on the same port.
+  #define STEP_DDR        LPC_GPIO2->FIODIR
+  #define STEP_PORT       LPC_GPIO2->FIOPIN
+  #define X_STEP_BIT      0
+  #define Y_STEP_BIT      1
+  #define Z_STEP_BIT      2
+  #define A_STEP_BIT      3
+  #define STEP_MASK       ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
+
+  // Define step direction output pins. NOTE: All direction pins must be on the same port.
+  #define DIRECTION_DDR     LPC_GPIO0->FIODIR
+  #define DIRECTION_PORT    LPC_GPIO0->FIOPIN
+  #define X_DIRECTION_BIT   5
+  #define Y_DIRECTION_BIT   11
+  #define Z_DIRECTION_BIT   20
+  #define A_DIRECTION_BIT   22
+  #define DIRECTION_MASK    ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
+
+  // Define stepper driver enable/disable output pin.
+  #define STEPPERS_DISABLE_DDR    LPC_GPIO0->FIODIR
+  #define STEPPERS_DISABLE_PORT   LPC_GPIO0->FIOPIN
+  #define X_DISABLE_BIT           4
+  #define Y_DISABLE_BIT           10
+  #define Z_DISABLE_BIT           19
+  #define A_DISABLE_BIT           21
+  #define STEPPERS_DISABLE_MASK   ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
+
+  // Define homing/hard limit switch input pins and limit interrupt vectors.
+  // NOTE: All limit bit pins must be on the same port, but not on a port with other input pins (CONTROL).
+  #define LIMIT_DDR         LPC_GPIO1->FIODIR
+  #define LIMIT_PIN         LPC_GPIO1->FIOPIN
+  #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	    28  // Z-MIN=28, Z-MAX=29
+  #define A_LIMIT_BIT       29  // reuse p1.29 from Z-MAX
+  #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 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
+  #define CONTROL_PIN       NotUsed
+  #define CONTROL_PORT      NotUsed
+  #define CONTROL_RESET_BIT         0  // Uno Analog Pin 0
+  #define CONTROL_FEED_HOLD_BIT     1  // Uno Analog Pin 1
+  #define CONTROL_CYCLE_START_BIT   2  // Uno Analog Pin 2
+  #define CONTROL_SAFETY_DOOR_BIT   1  // Uno Analog Pin 1 NOTE: Safety door is shared with feed hold. Enabled by config define.
+  #define CONTROL_INT       PCIE1  // Pin change interrupt enable pin
+  #define CONTROL_INT_vect  PCINT1_vect
+  #define CONTROL_PCMSK     NotUsed // Pin change interrupt register
+  #define CONTROL_MASK      ((1<<CONTROL_RESET_BIT)|(1<<CONTROL_FEED_HOLD_BIT)|(1<<CONTROL_CYCLE_START_BIT)|(1<<CONTROL_SAFETY_DOOR_BIT))
+  #define CONTROL_INVERT_MASK   CONTROL_MASK // May be re-defined to only invert certain control pins.
+
+  // Define probe switch input pin.
+  #define PROBE_DDR       NotUsed
+  #define PROBE_PIN       NotUsed
+  #define PROBE_PORT      NotUsed
+  #define PROBE_BIT       5  // Uno Analog Pin 5
+  #define PROBE_MASK      (1<<PROBE_BIT)
+
+  // 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
+  // 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
+  #define SPINDLE_PWM_USE_PRIMARY_PIN   false
+  #define SPINDLE_PWM_USE_SECONDARY_PIN true
+
+  // Variable spindle configuration below. Do not change unless you know what you are doing.
+  // NOTE: Only used when variable spindle is enabled.
+  #define SPINDLE_PWM_MAX_VALUE     255 // Don't change. 328p fast PWM mode fixes top value as 255.
+  #ifndef SPINDLE_PWM_MIN_VALUE
+    #define SPINDLE_PWM_MIN_VALUE   1   // Must be greater than zero.
+  #endif
+  //#define SPINDLE_PWM_OFF_VALUE     0 // Defined in config.h
+  #define SPINDLE_PWM_RANGE         (SPINDLE_PWM_MAX_VALUE-SPINDLE_PWM_MIN_VALUE)
+  #define SPINDLE_TCCRA_REGISTER	TCCR2A
+  #define SPINDLE_TCCRB_REGISTER	TCCR2B
+  #define SPINDLE_OCR_REGISTER      OCR2A
+  #define SPINDLE_COMB_BIT	        COM2A1
+#endif
+
+
+#ifdef CPU_MAP_MKS_SBASE // (MKS SBASE Boards)
+
+  // Define serial port pins and interrupt vectors.
+  #define SERIAL_RX     USART_RX_vect
+  #define SERIAL_UDRE   USART_UDRE_vect
+
+  // Define step pulse output pins. NOTE: All step bit pins must be on the same port.
+  #define STEP_DDR        LPC_GPIO2->FIODIR
+  #define STEP_PORT       LPC_GPIO2->FIOPIN
+  #define X_STEP_BIT      0
+  #define Y_STEP_BIT      1
+  #define Z_STEP_BIT      2
+  #define A_STEP_BIT      3
+  #define STEP_MASK       ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
+
+  // Define step direction output pins. NOTE: All direction pins must be on the same port.
+  #define DIRECTION_DDR     LPC_GPIO0->FIODIR
+  #define DIRECTION_PORT    LPC_GPIO0->FIOPIN
+  #define X_DIRECTION_BIT   5
+  #define Y_DIRECTION_BIT   11
+  #define Z_DIRECTION_BIT   20
+  #define A_DIRECTION_BIT   22
+  #define DIRECTION_MASK    ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
+
+  // Define stepper driver enable/disable output pin.
+  #define STEPPERS_DISABLE_DDR    LPC_GPIO0->FIODIR
+  #define STEPPERS_DISABLE_PORT   LPC_GPIO0->FIOPIN
+  #define X_DISABLE_BIT           4
+  #define Y_DISABLE_BIT           10
+  #define Z_DISABLE_BIT           19
+  #define A_DISABLE_BIT           21
+  #define STEPPERS_DISABLE_MASK   ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
+
+  // Define homing/hard limit switch input pins and limit interrupt vectors.
+  // NOTE: All limit bit pins must be on the same port, but not on a port with other input pins (CONTROL).
+  #define LIMIT_DDR         LPC_GPIO1->FIODIR
+  #define LIMIT_PIN         LPC_GPIO1->FIOPIN
+  #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 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 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
+  #define CONTROL_PIN       NotUsed
+  #define CONTROL_PORT      NotUsed
+  #define CONTROL_RESET_BIT         0  // Uno Analog Pin 0
+  #define CONTROL_FEED_HOLD_BIT     1  // Uno Analog Pin 1
+  #define CONTROL_CYCLE_START_BIT   2  // Uno Analog Pin 2
+  #define CONTROL_SAFETY_DOOR_BIT   1  // Uno Analog Pin 1 NOTE: Safety door is shared with feed hold. Enabled by config define.
+  #define CONTROL_INT       PCIE1  // Pin change interrupt enable pin
+  #define CONTROL_INT_vect  PCINT1_vect
+  #define CONTROL_PCMSK     NotUsed // Pin change interrupt register
+  #define CONTROL_MASK      ((1<<CONTROL_RESET_BIT)|(1<<CONTROL_FEED_HOLD_BIT)|(1<<CONTROL_CYCLE_START_BIT)|(1<<CONTROL_SAFETY_DOOR_BIT))
+  #define CONTROL_INVERT_MASK   CONTROL_MASK // May be re-defined to only invert certain control pins.
+
+  // Define probe switch input pin.
+  #define PROBE_DDR       NotUsed
+  #define PROBE_PIN       NotUsed
+  #define PROBE_PORT      NotUsed
+  #define PROBE_BIT       5  // Uno Analog Pin 5
+  #define PROBE_MASK      (1<<PROBE_BIT)
+
+  // 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
+  // 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
+  #define SPINDLE_PWM_USE_PRIMARY_PIN   false
+  #define SPINDLE_PWM_USE_SECONDARY_PIN true
+
+  // Stepper current control
+  #define CURRENT_I2C Driver_I2C1       // I2C driver for current control. Comment out to disable (for C3d boards!)
+  #define CURRENT_MCP44XX_ADDR 0b0101100  // Address of MCP44XX
+  #define CURRENT_WIPERS {0, 1, 6, 7};    // Wiper registers (X, Y, Z, A)
+  #define CURRENT_FACTOR 113.33           // Convert amps to digipot value
+
+  // Variable spindle configuration below. Do not change unless you know what you are doing.
+  // NOTE: Only used when variable spindle is enabled.
+  #define SPINDLE_PWM_MAX_VALUE     255 // Don't change. 328p fast PWM mode fixes top value as 255.
+  #ifndef SPINDLE_PWM_MIN_VALUE
+    #define SPINDLE_PWM_MIN_VALUE   1   // Must be greater than zero.
+  #endif
+  //#define SPINDLE_PWM_OFF_VALUE     0 // Defined in config.h
+  #define SPINDLE_PWM_RANGE         (SPINDLE_PWM_MAX_VALUE-SPINDLE_PWM_MIN_VALUE)
+  #define SPINDLE_TCCRA_REGISTER	TCCR2A
+  #define SPINDLE_TCCRB_REGISTER	TCCR2B
+  #define SPINDLE_OCR_REGISTER      OCR2A
+  #define SPINDLE_COMB_BIT	        COM2A1
+#endif
+
+
+#ifdef CPU_MAP_AZTEEG_X5 // (Azteeg X5 Boards)  not tested yet!
+
+  // Define serial port pins and interrupt vectors.
+  #define SERIAL_RX     USART_RX_vect
+  #define SERIAL_UDRE   USART_UDRE_vect
+
+  // Define step pulse output pins. NOTE: All step bit pins must be on the same port.
+  #define STEP_DDR        LPC_GPIO2->FIODIR
+  #define STEP_PORT       LPC_GPIO2->FIOPIN
+  #define X_STEP_BIT      1
+  #define Y_STEP_BIT      2
+  #define Z_STEP_BIT      3
+  #define A_STEP_BIT      0
+  #define STEP_MASK       ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
+
+  // Define step direction output pins. NOTE: All direction pins must be on the same port.
+  #define DIRECTION_DDR     LPC_GPIO0->FIODIR
+  #define DIRECTION_PORT    LPC_GPIO0->FIOPIN
+  #define X_DIRECTION_BIT   11
+  #define Y_DIRECTION_BIT   20
+  #define Z_DIRECTION_BIT   22
+  #define A_DIRECTION_BIT   5
+  #define DIRECTION_MASK    ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
+
+  // Define stepper driver enable/disable output pin.
+  #define STEPPERS_DISABLE_DDR    LPC_GPIO0->FIODIR
+  #define STEPPERS_DISABLE_PORT   LPC_GPIO0->FIOPIN
+  #define X_DISABLE_BIT           10
+  #define Y_DISABLE_BIT           19
+  #define Z_DISABLE_BIT           21
+  #define A_DISABLE_BIT           4
+  #define STEPPERS_DISABLE_MASK   ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
+
+  // Define homing/hard limit switch input pins and limit interrupt vectors.
+  // NOTE: All limit bit pins must be on the same port, but not on a port with other input pins (CONTROL).
+  #define LIMIT_DDR         LPC_GPIO1->FIODIR
+  #define LIMIT_PIN         LPC_GPIO1->FIOPIN
+  #define LIMIT_PORT        LPC_GPIO1->FIOPIN
+  #define X_LIMIT_BIT       24  // X-MIN=24, X-MAX=27
+  #define Y_LIMIT_BIT       25  // Y-MIN=25, Y-MAX=28
+  #define Z_LIMIT_BIT	    26  // Z-MIN=26, Z-MAX=29
+  #define A_LIMIT_BIT       27  // reuse p1.27, as X-MAX is not used
+  #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 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
+  #define CONTROL_PIN       NotUsed
+  #define CONTROL_PORT      NotUsed
+  #define CONTROL_RESET_BIT         0  // Uno Analog Pin 0
+  #define CONTROL_FEED_HOLD_BIT     1  // Uno Analog Pin 1
+  #define CONTROL_CYCLE_START_BIT   2  // Uno Analog Pin 2
+  #define CONTROL_SAFETY_DOOR_BIT   1  // Uno Analog Pin 1 NOTE: Safety door is shared with feed hold. Enabled by config define.
+  #define CONTROL_INT       PCIE1  // Pin change interrupt enable pin
+  #define CONTROL_INT_vect  PCINT1_vect
+  #define CONTROL_PCMSK     NotUsed // Pin change interrupt register
+  #define CONTROL_MASK      ((1<<CONTROL_RESET_BIT)|(1<<CONTROL_FEED_HOLD_BIT)|(1<<CONTROL_CYCLE_START_BIT)|(1<<CONTROL_SAFETY_DOOR_BIT))
+  #define CONTROL_INVERT_MASK   CONTROL_MASK // May be re-defined to only invert certain control pins.
+
+  // Define probe switch input pin.
+  #define PROBE_DDR       NotUsed
+  #define PROBE_PIN       NotUsed
+  #define PROBE_PORT      NotUsed
+  #define PROBE_BIT       5  // Uno Analog Pin 5
+  #define PROBE_MASK      (1<<PROBE_BIT)
+
+  // 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
+  #define SPINDLE_PWM_USE_PRIMARY_PIN   false
+  #define SPINDLE_PWM_USE_SECONDARY_PIN true
+
+  // Stepper current control via SPI not ported yet!
+
+  // Variable spindle configuration below. Do not change unless you know what you are doing.
+  // NOTE: Only used when variable spindle is enabled.
+  #define SPINDLE_PWM_MAX_VALUE     255 // Don't change. 328p fast PWM mode fixes top value as 255.
+  #ifndef SPINDLE_PWM_MIN_VALUE
+    #define SPINDLE_PWM_MIN_VALUE   1   // Must be greater than zero.
+  #endif
+  //#define SPINDLE_PWM_OFF_VALUE     0 // Defined in config.h
+  #define SPINDLE_PWM_RANGE         (SPINDLE_PWM_MAX_VALUE-SPINDLE_PWM_MIN_VALUE)
+  #define SPINDLE_TCCRA_REGISTER	TCCR2A
+  #define SPINDLE_TCCRB_REGISTER	TCCR2B
+  #define SPINDLE_OCR_REGISTER      OCR2A
+  #define SPINDLE_COMB_BIT	        COM2A1
+#endif
+
+
 /*
 #ifdef CPU_MAP_CUSTOM_PROC
   // For a custom pin map or different processor, copy and edit one of the available cpu

grbl/defaults.h

@@ -115,7 +115,7 @@
   #define DEFAULT_ARC_TOLERANCE 0.002       // mm
   #define DEFAULT_REPORT_INCHES 0           // false
   #define DEFAULT_INVERT_ST_ENABLE 0        // false
-  #define DEFAULT_INVERT_LIMIT_PINS 1       // true
+  #define DEFAULT_INVERT_LIMIT_PINS 1       // true for microswitches / false for optical sensors
   #define DEFAULT_SOFT_LIMIT_ENABLE 1       // true
   #define DEFAULT_HARD_LIMIT_ENABLE 0       // false
   #define DEFAULT_INVERT_PROBE_PIN 0        // false

grbl/limits.c

@@ -307,9 +307,17 @@ void limits_go_home(uint8_t cycle_mask)
         set_axis_position = 0;
       #else
         if ( bit_istrue(settings.homing_dir_mask,bit(idx)) ) {
-          set_axis_position = lround((settings.max_travel[idx]+settings.homing_pulloff)*settings.steps_per_mm[idx]);
+          #ifdef HOMING_FORCE_POSITIVE_SPACE
+            set_axis_position = 0; //lround(settings.homing_pulloff*settings.steps_per_mm[idx]);
+          #else
+            set_axis_position = lround((settings.max_travel[idx]-settings.homing_pulloff)*settings.steps_per_mm[idx]);
+          #endif
         } else {
-          set_axis_position = lround(-settings.homing_pulloff*settings.steps_per_mm[idx]);
+          #ifdef HOMING_FORCE_POSITIVE_SPACE
+            set_axis_position = lround(-settings.max_travel[idx]*settings.steps_per_mm[idx]);
+          #else
+            set_axis_position = lround(-settings.homing_pulloff*settings.steps_per_mm[idx]);
+          #endif
         }
       #endif
 

grbl/report.c

@@ -71,7 +71,6 @@ static void report_util_setting_string(uint8_t n) {
     case 30: printPgmString(PSTR("rpm max")); break;
     case 31: printPgmString(PSTR("rpm min")); break;
     case 32: printPgmString(PSTR("laser")); break;
-    case 33: printPgmString(PSTR("spindle_pwm_freq")); break;
     default:
       n -= AXIS_SETTINGS_START_VAL;
       uint8_t idx = 0;
@@ -97,11 +96,6 @@ static void report_util_uint8_setting(uint8_t n, int val) {
   print_uint8_base10(val); 
   report_util_line_feed(); // report_util_setting_string(n); 
 }
-static void report_util_uint32_setting(uint8_t n, int val) { 
-  report_util_setting_prefix(n); 
-  print_uint32_base10(val); 
-  report_util_line_feed(); // report_util_setting_string(n); 
-}
 static void report_util_float_setting(uint8_t n, float val, uint8_t n_decimal) { 
   report_util_setting_prefix(n); 
   printFloat(val,n_decimal);

grbl/system.c

@@ -345,7 +345,11 @@ uint8_t system_check_travel_limits(float *target)
       }
     #else
       // NOTE: max_travel is stored as negative
-      if (target[idx] > 0 || target[idx] < settings.max_travel[idx]) { return(true); }
+      #ifdef HOMING_FORCE_POSITIVE_SPACE
+        if (target[idx] < 0 || target[idx] > -settings.max_travel[idx]) { return(true); }
+      #else
+        if (target[idx] > 0 || target[idx] < settings.max_travel[idx]) { return(true); }
+      #endif
     #endif
   }
   return(false);