Skip to content

Commit a661778

Browse files
cprezzicprezzi
committed
Made board switchable in config.h
1 parent 54ae403 commit a661778

File tree

2 files changed

+23
-74
lines changed

2 files changed

+23
-74
lines changed

‎grbl/config.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,17 @@
3232

3333

3434
// Define board type for pin map and default settings.
35-
//#define CPU_MAP_SMOOTHIEBOARD // Smoothieboard (NXP LPC1769 MCU)
36-
#define CPU_MAP_C3D_REMIX // Cohesion3D Remix (NXP LPC1769 MCU)
35+
#define CPU_MAP_SMOOTHIEBOARD // Smoothieboard (NXP LPC1769 MCU)
36+
//#define CPU_MAP_C3D_REMIX // Cohesion3D Remix (NXP LPC1769 MCU)
3737
//#define CPU_MAP_C3D_MINI // Cohesion3D Mini (NXP LPC1769 MCU)
3838
//#define CPU_MAP_MKS_SBASE // MKS SBASE Board (NXP LPC1768 MCU)
39-
//#define CPU_MAP_AZTEEG_X5 // Azteeg X5 boards with NXP LPC1769 mcu
39+
//#define CPU_MAP_AZTEEG_X5 // Azteeg X5 Board (NXP LPC1769 MCU)
4040

4141
// Define machine type for machine specific defaults
4242
//#define DEFAULTS_GENERIC
4343
#define DEFAULTS_K40
4444
//#define DEFAULTS_FABKIT
4545

46-
// For machines with A axis (like rotation axis)
47-
#define ENABLE_A_AXIS
48-
4946
// Serial baud rate
5047
// #define BAUD_RATE 230400
5148
#define BAUD_RATE 115200

‎grbl/cpu_map.h

+20-68
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,7 @@
162162
#define X_STEP_BIT 0
163163
#define Y_STEP_BIT 1
164164
#define Z_STEP_BIT 2
165-
#ifdef ENABLE_A_AXIS
166-
#define A_STEP_BIT 3
167-
#endif
168-
//#define B_STEP_BIT 8
169-
//#define C_STEP_BIT 9
165+
#define A_STEP_BIT 3
170166
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
171167

172168
// Define step direction output pins. NOTE: All direction pins must be on the same port.
@@ -175,11 +171,7 @@
175171
#define X_DIRECTION_BIT 5
176172
#define Y_DIRECTION_BIT 11
177173
#define Z_DIRECTION_BIT 20
178-
#ifdef ENABLE_A_AXIS
179-
#define A_DIRECTION_BIT 22
180-
#endif
181-
//#define B_DIRECTION_BIT 13
182-
//#define C_DIRECTION_BIT NotUsed
174+
#define A_DIRECTION_BIT 22
183175
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
184176

185177
// Define stepper driver enable/disable output pin.
@@ -188,11 +180,7 @@
188180
#define X_DISABLE_BIT 4
189181
#define Y_DISABLE_BIT 10
190182
#define Z_DISABLE_BIT 19
191-
#ifdef ENABLE_A_AXIS
192-
#define A_DISABLE_BIT 21
193-
#endif
194-
//#define B_DISABLE_BIT 29
195-
//#define C_DISABLE_BIT NotUsed
183+
#define A_DISABLE_BIT 21
196184
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
197185

198186
// Define homing/hard limit switch input pins and limit interrupt vectors.
@@ -203,11 +191,7 @@
203191
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25
204192
#define Y_LIMIT_BIT 26 // Y-MIN=26, Y-MAX=27
205193
#define Z_LIMIT_BIT 29 // Z-MIN=28, Z-MAX=29
206-
#ifdef ENABLE_A_AXIS
207-
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
208-
#endif
209-
//#define B_LIMIT_BIT NotUsed
210-
//#define C_LIMIT_BIT NotUsed
194+
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
211195
#define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
212196

213197
// Define flood and mist coolant enable output pins.
@@ -282,9 +266,7 @@
282266
#define X_STEP_BIT 0
283267
#define Y_STEP_BIT 1
284268
#define Z_STEP_BIT 2
285-
#ifdef ENABLE_A_AXIS
286-
#define A_STEP_BIT 3
287-
#endif
269+
#define A_STEP_BIT 3
288270
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
289271

290272
// Define step direction output pins. NOTE: All direction pins must be on the same port.
@@ -293,9 +275,7 @@
293275
#define X_DIRECTION_BIT 5
294276
#define Y_DIRECTION_BIT 11
295277
#define Z_DIRECTION_BIT 20
296-
#ifdef ENABLE_A_AXIS
297-
#define A_DIRECTION_BIT 22
298-
#endif
278+
#define A_DIRECTION_BIT 22
299279
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
300280

301281
// Define stepper driver enable/disable output pin.
@@ -304,9 +284,7 @@
304284
#define X_DISABLE_BIT 4
305285
#define Y_DISABLE_BIT 10
306286
#define Z_DISABLE_BIT 19
307-
#ifdef ENABLE_A_AXIS
308-
#define A_DISABLE_BIT 21
309-
#endif
287+
#define A_DISABLE_BIT 21
310288
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
311289

312290
// Define homing/hard limit switch input pins and limit interrupt vectors.
@@ -317,9 +295,7 @@
317295
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25
318296
#define Y_LIMIT_BIT 26 // Y-MIN=26, Y-MAX=27
319297
#define Z_LIMIT_BIT 28 // Z-MIN=28, Z-MAX=29
320-
#ifdef ENABLE_A_AXIS
321-
#define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
322-
#endif
298+
#define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
323299
#define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
324300

325301
// Define flood and mist coolant enable output pins.
@@ -388,9 +364,7 @@
388364
#define X_STEP_BIT 0
389365
#define Y_STEP_BIT 1
390366
#define Z_STEP_BIT 2
391-
#ifdef ENABLE_A_AXIS
392-
#define A_STEP_BIT 3
393-
#endif
367+
#define A_STEP_BIT 3
394368
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
395369

396370
// Define step direction output pins. NOTE: All direction pins must be on the same port.
@@ -399,9 +373,7 @@
399373
#define X_DIRECTION_BIT 5
400374
#define Y_DIRECTION_BIT 11
401375
#define Z_DIRECTION_BIT 20
402-
#ifdef ENABLE_A_AXIS
403-
#define A_DIRECTION_BIT 22
404-
#endif
376+
#define A_DIRECTION_BIT 22
405377
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
406378

407379
// Define stepper driver enable/disable output pin.
@@ -410,9 +382,7 @@
410382
#define X_DISABLE_BIT 4
411383
#define Y_DISABLE_BIT 10
412384
#define Z_DISABLE_BIT 19
413-
#ifdef ENABLE_A_AXIS
414-
#define A_DISABLE_BIT 21
415-
#endif
385+
#define A_DISABLE_BIT 21
416386
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
417387

418388
// Define homing/hard limit switch input pins and limit interrupt vectors.
@@ -423,9 +393,7 @@
423393
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25
424394
#define Y_LIMIT_BIT 26 // Y-MIN=26, Y-MAX=27
425395
#define Z_LIMIT_BIT 28 // Z-MIN=28, Z-MAX=29
426-
#ifdef ENABLE_A_AXIS
427-
#define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
428-
#endif
396+
#define A_LIMIT_BIT 29 // reuse p1.29 from Z-MAX
429397
#define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
430398

431399
// Define flood and mist coolant enable output pins.
@@ -494,9 +462,7 @@
494462
#define X_STEP_BIT 0
495463
#define Y_STEP_BIT 1
496464
#define Z_STEP_BIT 2
497-
#ifdef ENABLE_A_AXIS
498-
#define A_STEP_BIT 3
499-
#endif
465+
#define A_STEP_BIT 3
500466
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
501467

502468
// Define step direction output pins. NOTE: All direction pins must be on the same port.
@@ -505,9 +471,7 @@
505471
#define X_DIRECTION_BIT 5
506472
#define Y_DIRECTION_BIT 11
507473
#define Z_DIRECTION_BIT 20
508-
#ifdef ENABLE_A_AXIS
509-
#define A_DIRECTION_BIT 22
510-
#endif
474+
#define A_DIRECTION_BIT 22
511475
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
512476

513477
// Define stepper driver enable/disable output pin.
@@ -516,9 +480,7 @@
516480
#define X_DISABLE_BIT 4
517481
#define Y_DISABLE_BIT 10
518482
#define Z_DISABLE_BIT 19
519-
#ifdef ENABLE_A_AXIS
520-
#define A_DISABLE_BIT 21
521-
#endif
483+
#define A_DISABLE_BIT 21
522484
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
523485

524486
// Define homing/hard limit switch input pins and limit interrupt vectors.
@@ -529,9 +491,7 @@
529491
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=25
530492
#define Y_LIMIT_BIT 26 // Y-MIN=26, Y-MAX=27
531493
#define Z_LIMIT_BIT 29 // Z-MIN=28, Z-MAX=29
532-
#ifdef ENABLE_A_AXIS
533-
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
534-
#endif
494+
#define A_LIMIT_BIT 28 // reuse p1.28, as z-min is not often used
535495
#define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
536496

537497
// Define flood and mist coolant enable output pins.
@@ -606,9 +566,7 @@
606566
#define X_STEP_BIT 1
607567
#define Y_STEP_BIT 2
608568
#define Z_STEP_BIT 3
609-
#ifdef ENABLE_A_AXIS
610-
#define A_STEP_BIT 0
611-
#endif
569+
#define A_STEP_BIT 0
612570
#define STEP_MASK ((1<<X_STEP_BIT)|(1<<Y_STEP_BIT)|(1<<Z_STEP_BIT)|(1<<A_STEP_BIT)) // All step bits
613571

614572
// Define step direction output pins. NOTE: All direction pins must be on the same port.
@@ -617,9 +575,7 @@
617575
#define X_DIRECTION_BIT 11
618576
#define Y_DIRECTION_BIT 20
619577
#define Z_DIRECTION_BIT 22
620-
#ifdef ENABLE_A_AXIS
621-
#define A_DIRECTION_BIT 5
622-
#endif
578+
#define A_DIRECTION_BIT 5
623579
#define DIRECTION_MASK ((1<<X_DIRECTION_BIT)|(1<<Y_DIRECTION_BIT)|(1<<Z_DIRECTION_BIT)|(1<<A_DIRECTION_BIT)) // All direction bits
624580

625581
// Define stepper driver enable/disable output pin.
@@ -628,9 +584,7 @@
628584
#define X_DISABLE_BIT 10
629585
#define Y_DISABLE_BIT 19
630586
#define Z_DISABLE_BIT 21
631-
#ifdef ENABLE_A_AXIS
632-
#define A_DISABLE_BIT 4
633-
#endif
587+
#define A_DISABLE_BIT 4
634588
#define STEPPERS_DISABLE_MASK ((1<<X_DISABLE_BIT)|(1<<Y_DISABLE_BIT)|(1<<Z_DISABLE_BIT)|(1<<A_DISABLE_BIT))
635589

636590
// Define homing/hard limit switch input pins and limit interrupt vectors.
@@ -641,9 +595,7 @@
641595
#define X_LIMIT_BIT 24 // X-MIN=24, X-MAX=27
642596
#define Y_LIMIT_BIT 25 // Y-MIN=25, Y-MAX=28
643597
#define Z_LIMIT_BIT 26 // Z-MIN=26, Z-MAX=29
644-
#ifdef ENABLE_A_AXIS
645-
#define A_LIMIT_BIT 27 // reuse p1.27, as X-MAX is not used
646-
#endif
598+
#define A_LIMIT_BIT 27 // reuse p1.27, as X-MAX is not used
647599
#define LIMIT_MASK ((1<<X_LIMIT_BIT)|(1<<Y_LIMIT_BIT)|(1<<Z_LIMIT_BIT)|(1<<A_LIMIT_BIT)) // All limit bits
648600

649601
// Define flood and mist coolant enable output pins.

0 commit comments

Comments
 (0)