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

Made board switchable in config.h

Browse Source
This commit is contained in:
cprezzi 2017-07-12 18:34:50 +02:00
parent 54ae403094
commit a661778252
2 changed files with 23 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grbl/config.h
View File

@ -32,20 +32,17 @@
// 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 boards with NXP LPC1769 mcu //#define CPU_MAP_AZTEEG_X5 // Azteeg X5 Board (NXP LPC1769 MCU)
// Define machine type for machine specific defaults // Define machine type for machine specific defaults
//#define DEFAULTS_GENERIC //#define DEFAULTS_GENERIC
#define DEFAULTS_K40 #define DEFAULTS_K40
//#define DEFAULTS_FABKIT //#define DEFAULTS_FABKIT
// For machines with A axis (like rotation axis)
#define ENABLE_A_AXIS
// Serial baud rate // Serial baud rate
// #define BAUD_RATE 230400 // #define BAUD_RATE 230400
#define BAUD_RATE 115200 #define BAUD_RATE 115200

88
grbl/cpu_map.h
View File

@ -162,11 +162,7 @@
#define X_STEP_BIT 0 #define X_STEP_BIT 0
#define Y_STEP_BIT 1 #define Y_STEP_BIT 1
#define Z_STEP_BIT 2 #define Z_STEP_BIT 2
#ifdef ENABLE_A_AXIS #define A_STEP_BIT 3
#define A_STEP_BIT 3
#endif
//#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_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 step direction output pins. NOTE: All direction pins must be on the same port.
@ -175,11 +171,7 @@
#define X_DIRECTION_BIT 5 #define X_DIRECTION_BIT 5
#define Y_DIRECTION_BIT 11 #define Y_DIRECTION_BIT 11
#define Z_DIRECTION_BIT 20 #define Z_DIRECTION_BIT 20
#ifdef ENABLE_A_AXIS #define A_DIRECTION_BIT 22
#define A_DIRECTION_BIT 22
#endif
//#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 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 stepper driver enable/disable output pin.
@ -188,11 +180,7 @@
#define X_DISABLE_BIT 4 #define X_DISABLE_BIT 4
#define Y_DISABLE_BIT 10 #define Y_DISABLE_BIT 10
#define Z_DISABLE_BIT 19 #define Z_DISABLE_BIT 19
#ifdef ENABLE_A_AXIS #define A_DISABLE_BIT 21
#define A_DISABLE_BIT 21
#endif
//#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 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. // Define homing/hard limit switch input pins and limit interrupt vectors.
@ -203,11 +191,7 @@
#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 29 // Z-MIN=28, Z-MAX=29
#ifdef ENABLE_A_AXIS #define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
#endif
//#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 #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.
@ -282,9 +266,7 @@
#define X_STEP_BIT 0 #define X_STEP_BIT 0
#define Y_STEP_BIT 1 #define Y_STEP_BIT 1
#define Z_STEP_BIT 2 #define Z_STEP_BIT 2
#ifdef ENABLE_A_AXIS #define A_STEP_BIT 3
#define A_STEP_BIT 3
#endif
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits #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 step direction output pins. NOTE: All direction pins must be on the same port.
@ -293,9 +275,7 @@
#define X_DIRECTION_BIT 5 #define X_DIRECTION_BIT 5
#define Y_DIRECTION_BIT 11 #define Y_DIRECTION_BIT 11
#define Z_DIRECTION_BIT 20 #define Z_DIRECTION_BIT 20
#ifdef ENABLE_A_AXIS #define A_DIRECTION_BIT 22
#define A_DIRECTION_BIT 22
#endif
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits #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 stepper driver enable/disable output pin.
@ -304,9 +284,7 @@
#define X_DISABLE_BIT 4 #define X_DISABLE_BIT 4
#define Y_DISABLE_BIT 10 #define Y_DISABLE_BIT 10
#define Z_DISABLE_BIT 19 #define Z_DISABLE_BIT 19
#ifdef ENABLE_A_AXIS #define A_DISABLE_BIT 21
#define A_DISABLE_BIT 21
#endif
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT)) #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. // Define homing/hard limit switch input pins and limit interrupt vectors.
@ -317,9 +295,7 @@
#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 28 // Z-MIN=28, Z-MAX=29 #define Z_LIMIT_BIT 28 // Z-MIN=28, Z-MAX=29
#ifdef ENABLE_A_AXIS #define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
#define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
#endif
#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.
@ -388,9 +364,7 @@
#define X_STEP_BIT 0 #define X_STEP_BIT 0
#define Y_STEP_BIT 1 #define Y_STEP_BIT 1
#define Z_STEP_BIT 2 #define Z_STEP_BIT 2
#ifdef ENABLE_A_AXIS #define A_STEP_BIT 3
#define A_STEP_BIT 3
#endif
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits #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 step direction output pins. NOTE: All direction pins must be on the same port.
@ -399,9 +373,7 @@
#define X_DIRECTION_BIT 5 #define X_DIRECTION_BIT 5
#define Y_DIRECTION_BIT 11 #define Y_DIRECTION_BIT 11
#define Z_DIRECTION_BIT 20 #define Z_DIRECTION_BIT 20
#ifdef ENABLE_A_AXIS #define A_DIRECTION_BIT 22
#define A_DIRECTION_BIT 22
#endif
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits #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 stepper driver enable/disable output pin.
@ -410,9 +382,7 @@
#define X_DISABLE_BIT 4 #define X_DISABLE_BIT 4
#define Y_DISABLE_BIT 10 #define Y_DISABLE_BIT 10
#define Z_DISABLE_BIT 19 #define Z_DISABLE_BIT 19
#ifdef ENABLE_A_AXIS #define A_DISABLE_BIT 21
#define A_DISABLE_BIT 21
#endif
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT)) #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. // Define homing/hard limit switch input pins and limit interrupt vectors.
@ -423,9 +393,7 @@
#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 28 // Z-MIN=28, Z-MAX=29 #define Z_LIMIT_BIT 28 // Z-MIN=28, Z-MAX=29
#ifdef ENABLE_A_AXIS #define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
#define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
#endif
#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.
@ -494,9 +462,7 @@
#define X_STEP_BIT 0 #define X_STEP_BIT 0
#define Y_STEP_BIT 1 #define Y_STEP_BIT 1
#define Z_STEP_BIT 2 #define Z_STEP_BIT 2
#ifdef ENABLE_A_AXIS #define A_STEP_BIT 3
#define A_STEP_BIT 3
#endif
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits #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 step direction output pins. NOTE: All direction pins must be on the same port.
@ -505,9 +471,7 @@
#define X_DIRECTION_BIT 5 #define X_DIRECTION_BIT 5
#define Y_DIRECTION_BIT 11 #define Y_DIRECTION_BIT 11
#define Z_DIRECTION_BIT 20 #define Z_DIRECTION_BIT 20
#ifdef ENABLE_A_AXIS #define A_DIRECTION_BIT 22
#define A_DIRECTION_BIT 22
#endif
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits #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 stepper driver enable/disable output pin.
@ -516,9 +480,7 @@
#define X_DISABLE_BIT 4 #define X_DISABLE_BIT 4
#define Y_DISABLE_BIT 10 #define Y_DISABLE_BIT 10
#define Z_DISABLE_BIT 19 #define Z_DISABLE_BIT 19
#ifdef ENABLE_A_AXIS #define A_DISABLE_BIT 21
#define A_DISABLE_BIT 21
#endif
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT)) #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. // Define homing/hard limit switch input pins and limit interrupt vectors.
@ -529,9 +491,7 @@
#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 29 // Z-MIN=28, Z-MAX=29
#ifdef ENABLE_A_AXIS #define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
#endif
#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.
@ -606,9 +566,7 @@
#define X_STEP_BIT 1 #define X_STEP_BIT 1
#define Y_STEP_BIT 2 #define Y_STEP_BIT 2
#define Z_STEP_BIT 3 #define Z_STEP_BIT 3
#ifdef ENABLE_A_AXIS #define A_STEP_BIT 0
#define A_STEP_BIT 0
#endif
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits #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 step direction output pins. NOTE: All direction pins must be on the same port.
@ -617,9 +575,7 @@
#define X_DIRECTION_BIT 11 #define X_DIRECTION_BIT 11
#define Y_DIRECTION_BIT 20 #define Y_DIRECTION_BIT 20
#define Z_DIRECTION_BIT 22 #define Z_DIRECTION_BIT 22
#ifdef ENABLE_A_AXIS #define A_DIRECTION_BIT 5
#define A_DIRECTION_BIT 5
#endif
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits #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 stepper driver enable/disable output pin.
@ -628,9 +584,7 @@
#define X_DISABLE_BIT 10 #define X_DISABLE_BIT 10
#define Y_DISABLE_BIT 19 #define Y_DISABLE_BIT 19
#define Z_DISABLE_BIT 21 #define Z_DISABLE_BIT 21
#ifdef ENABLE_A_AXIS #define A_DISABLE_BIT 4
#define A_DISABLE_BIT 4
#endif
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT)) #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. // Define homing/hard limit switch input pins and limit interrupt vectors.
@ -641,9 +595,7 @@
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=27 #define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=27
#define Y_LIMIT_BIT 25 // Y-MIN=25, Y-MAX=28 #define Y_LIMIT_BIT 25 // Y-MIN=25, Y-MAX=28
#define Z_LIMIT_BIT 26 // Z-MIN=26, Z-MAX=29 #define Z_LIMIT_BIT 26 // Z-MIN=26, Z-MAX=29
#ifdef ENABLE_A_AXIS #define A_LIMIT_BIT 27 // reuse p1.27, as X-MAX is not used
#define A_LIMIT_BIT 27 // reuse p1.27, as X-MAX is not used
#endif
#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.