ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Compare commits

base: ManuelW:beta06_4axis
Branches Tags
ManuelW:master ManuelW:more-axis
ManuelW:mw-v0.1 ManuelW:beta08_4axes ManuelW:beta07_4axes ManuelW:beta06_4axis ManuelW:beta05_A-axis_i2c_v1.1f ManuelW:beta05+A-axis-v1.1f ManuelW:beta05-corexy-v1.1f ManuelW:beta05-smoothie-v1.1f ManuelW:beta05-v1.1f ManuelW:beta04-v1.1f ManuelW:beta03-v1.1f ManuelW:beta01 ManuelW:beta02 ManuelW:beta1
..
compare: ManuelW:more-axis
Branches Tags
ManuelW:master ManuelW:more-axis
ManuelW:mw-v0.1 ManuelW:beta08_4axes ManuelW:beta07_4axes ManuelW:beta06_4axis ManuelW:beta05_A-axis_i2c_v1.1f ManuelW:beta05+A-axis-v1.1f ManuelW:beta05-corexy-v1.1f ManuelW:beta05-smoothie-v1.1f ManuelW:beta05-v1.1f ManuelW:beta04-v1.1f ManuelW:beta03-v1.1f ManuelW:beta01 ManuelW:beta02 ManuelW:beta1

2 Commits
beta06_4ax ... more-axis

Author SHA1 Message Date
cprezzi
dc92bf565e Support coolant flood and mist for remix board 2017-08-03 15:01:34 +02:00
cprezzi
436615095f Always use MIN endstop pins (independant of board!) 2017-07-12 19:01:01 +02:00
2 changed files with 17 additions and 16 deletions
Expand all files Collapse all files

6
grbl/config.h
View File

@ -32,8 +32,8 @@
// Define board type for pin map and default settings. // Define board type for pin map and default settings.
#define CPU_MAP_SMOOTHIEBOARD // Smoothieboard (NXP LPC1769 MCU) //#define CPU_MAP_SMOOTHIEBOARD // Smoothieboard (NXP LPC1769 MCU)
//#define CPU_MAP_C3D_REMIX // Cohesion3D Remix (NXP LPC1769 MCU) #define CPU_MAP_C3D_REMIX // Cohesion3D Remix (NXP LPC1769 MCU)
//#define CPU_MAP_C3D_MINI // Cohesion3D Mini (NXP LPC1769 MCU) //#define CPU_MAP_C3D_MINI // Cohesion3D Mini (NXP LPC1769 MCU)
//#define CPU_MAP_MKS_SBASE // MKS SBASE Board (NXP LPC1768 MCU) //#define CPU_MAP_MKS_SBASE // MKS SBASE Board (NXP LPC1768 MCU)
//#define CPU_MAP_AZTEEG_X5 // Azteeg X5 Board (NXP LPC1769 MCU) //#define CPU_MAP_AZTEEG_X5 // Azteeg X5 Board (NXP LPC1769 MCU)
@ -569,7 +569,7 @@
// LPC176x flash blocks have a rating of 10,000 write cycles. To prevent excess wear, we don't // 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. // 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 // 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 // may not correlate to what is executing, because `WPos:` is based on the g-code parser state, which

25
grbl/cpu_map.h
View File

@ -190,17 +190,17 @@
#define LIMIT_PORT LPC_GPIO1->FIOPIN #define LIMIT_PORT LPC_GPIO1->FIOPIN
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25 #define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25
#define Y_LIMIT_BIT 26 // 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 Z_LIMIT_BIT 28 // Z-MIN=28, Z-MAX=29
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used #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 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 flood and mist coolant enable output pins.
#define COOLANT_FLOOD_DDR NotUsed #define COOLANT_FLOOD_DDR NotUsed
#define COOLANT_FLOOD_PORT NotUsed #define COOLANT_FLOOD_PORT NotUsed
#define COOLANT_FLOOD_BIT 3 // Uno Analog Pin 3 #define COOLANT_FLOOD_BIT 6 // MOSFET 2.6
#define COOLANT_MIST_DDR NotUsed #define COOLANT_MIST_DDR NotUsed
#define COOLANT_MIST_PORT NotUsed #define COOLANT_MIST_PORT NotUsed
#define COOLANT_MIST_BIT 4 // Uno Analog Pin 3 #define COOLANT_MIST_BIT 7 // MOSFET 2.7
// Define user-control controls (cycle start, reset, feed hold) input pins. // 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). // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
@ -299,12 +299,13 @@
#define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits #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 flood and mist coolant enable output pins.
#define COOLANT_FLOOD_DDR NotUsed #define COOLANT_FLOOD_DDR LPC_GPIO2->FIODIR
#define COOLANT_FLOOD_PORT NotUsed #define COOLANT_FLOOD_PORT LPC_GPIO2->FIOPIN
#define COOLANT_FLOOD_BIT 3 // Uno Analog Pin 3 #define COOLANT_FLOOD_BIT 6 // MOSFET 2.6
#define COOLANT_MIST_DDR NotUsed #define COOLANT_MIST_DDR LPC_GPIO2->FIODIR
#define COOLANT_MIST_PORT NotUsed #define COOLANT_MIST_PORT LPC_GPIO2->FIOPIN
#define COOLANT_MIST_BIT 4 // Uno Analog Pin 3 #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. // 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). // NOTE: All CONTROLs pins must be on the same port and not on a port with other input pins (limits).
@ -490,8 +491,8 @@
#define LIMIT_PORT LPC_GPIO1->FIOPIN #define LIMIT_PORT LPC_GPIO1->FIOPIN
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25 #define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25
#define Y_LIMIT_BIT 26 // 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 Z_LIMIT_BIT 28 // Z-MIN=28, Z-MAX=29
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used #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 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 flood and mist coolant enable output pins.