From 5ad7af8dfb15ceca6a3c9a1de3ab432896753979 Mon Sep 17 00:00:00 2001 From: Claudio Prezzi Date: Sun, 8 Oct 2017 13:55:39 +0200 Subject: [PATCH] Activated HOMING_FORCE_POSITIVE_SPACE and added SPINDLE_PWM_PIN_2_4 param --- grbl/config.h | 5 ++++- grbl/cpu_map.h | 32 ++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/grbl/config.h b/grbl/config.h index 2bc7ec4..9208a29 100644 --- a/grbl/config.h +++ b/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 diff --git a/grbl/cpu_map.h b/grbl/cpu_map.h index 73ac863..4b48c53 100644 --- a/grbl/cpu_map.h +++ b/grbl/cpu_map.h @@ -230,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 // BIG MOSFET Q6 (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 @@ -335,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 // BED MOSFET (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 @@ -401,7 +409,7 @@ // Define flood and mist coolant enable output pins. #define COOLANT_FLOOD_DDR NotUsed #define COOLANT_FLOOD_PORT NotUsed - #define COOLANT_FLOOD_BIT 6 // not available + #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) @@ -434,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 // BED MOSFET (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 @@ -533,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 @@ -638,7 +654,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 // use Hotend MOSFET (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