Переглянути джерело

Added default configurations for deltas when DELTA is defined

Jim Morris 12 роки тому
джерело
коміт
460751503e
2 змінених файлів з 72 додано та 6 видалено
  1. 65
    4
      Marlin/Configuration.h
  2. 7
    2
      Marlin/Configuration_adv.h

+ 65
- 4
Marlin/Configuration.h Переглянути файл

@@ -74,7 +74,7 @@
74 74
 //============================== Delta Settings =============================
75 75
 //===========================================================================
76 76
 // Enable DELTA kinematics
77
-//#define DELTA
77
+#define DELTA
78 78
 
79 79
 // Make delta curves from many straight lines (linear interpolation).
80 80
 // This is a trade-off between visible corners (not enough segments)
@@ -277,11 +277,26 @@
277 277
 #endif
278 278
 
279 279
 // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
280
+#ifdef DELTA
281
+const bool X_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
282
+const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
283
+const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
284
+
285
+#else
280 286
 const bool X_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
281 287
 const bool Y_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
282 288
 const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
289
+#endif // DELTA
290
+
291
+#ifdef DELTA
292
+// deltas never have min endstops
293
+#define DISABLE_MIN_ENDSTOPS
294
+
295
+#else
296
+
283 297
 //#define DISABLE_MAX_ENDSTOPS
284 298
 //#define DISABLE_MIN_ENDSTOPS
299
+#endif // delta
285 300
 
286 301
 // Disable max endstops for compatibility with endstop checking routine
287 302
 #if defined(COREXY) && !defined(DISABLE_MAX_ENDSTOPS)
@@ -300,21 +315,41 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
300 315
 #define DISABLE_Z false
301 316
 #define DISABLE_E false // For all extruders
302 317
 
303
-#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
318
+#ifdef DELTA
319
+#define INVERT_X_DIR false // DELTA does not invert
320
+#define INVERT_Y_DIR false
321
+#define INVERT_Z_DIR false
322
+
323
+#else
324
+
325
+#define INVERT_X_DIR true     // for Mendel set to false, for Orca set to true
304 326
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
305 327
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
328
+#endif // DELTA
329
+
306 330
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
307 331
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
308 332
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
309 333
 
310 334
 // ENDSTOP SETTINGS:
311 335
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
336
+#ifdef DELTA
337
+// deltas always home to max
338
+#define X_HOME_DIR 1
339
+#define Y_HOME_DIR 1
340
+#define Z_HOME_DIR 1
341
+#define min_software_endstops false // If true, axis won't move to coordinates less than HOME_POS.
342
+#define max_software_endstops false  // If true, axis won't move to coordinates greater than the defined lengths below.
343
+
344
+#else
345
+
312 346
 #define X_HOME_DIR -1
313 347
 #define Y_HOME_DIR -1
314 348
 #define Z_HOME_DIR -1
315
-
316 349
 #define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
317 350
 #define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
351
+#endif // delta
352
+
318 353
 // Travel limits after homing
319 354
 #define X_MAX_POS 205
320 355
 #define X_MIN_POS 0
@@ -332,22 +367,48 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
332 367
 //#define BED_CENTER_AT_0_0  // If defined, the center of the bed is at (X=0, Y=0)
333 368
 
334 369
 //Manual homing switch locations:
370
+
371
+#ifdef DELTA
372
+#define MANUAL_HOME_POSITIONS  // MANUAL_*_HOME_POS below will be used
335 373
 // For deltabots this means top and center of the cartesian print volume.
336 374
 #define MANUAL_X_HOME_POS 0
337 375
 #define MANUAL_Y_HOME_POS 0
376
+#define MANUAL_Z_HOME_POS 250 // For delta: Distance between nozzle and print surface after homing.
377
+
378
+#else
379
+
380
+#define MANUAL_X_HOME_POS 0
381
+#define MANUAL_Y_HOME_POS 0
338 382
 #define MANUAL_Z_HOME_POS 0
339
-//#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing.
383
+#endif // DELTA
340 384
 
341 385
 //// MOVEMENT SETTINGS
342 386
 #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
387
+
388
+#ifdef DELTA
389
+// delta homing speeds must be the same on xyz
390
+#define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0}  // set the homing speeds (mm/min)
391
+
392
+#else
393
+
343 394
 #define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0}  // set the homing speeds (mm/min)
395
+#endif // DELTA
344 396
 
345 397
 // default settings
398
+#ifdef DELTA
399
+// delta speeds must be the same on xyz
400
+#define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 80, 760*1.1}  // default steps per unit for Kossel (GT2, 20 tooth)
401
+#define DEFAULT_MAX_FEEDRATE          {500, 500, 500, 25}    // (mm/sec)
402
+#define DEFAULT_MAX_ACCELERATION      {9000,9000,9000,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
403
+
404
+#else
346 405
 
347 406
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200.0*8/3,760*1.1}  // default steps per unit for Ultimaker
348 407
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)
349 408
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
350 409
 
410
+#endif // DELTA
411
+
351 412
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
352 413
 #define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
353 414
 

+ 7
- 2
Marlin/Configuration_adv.h Переглянути файл

@@ -148,8 +148,13 @@
148 148
 
149 149
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
150 150
 #define X_HOME_RETRACT_MM 5 
151
-#define Y_HOME_RETRACT_MM 5 
152
-#define Z_HOME_RETRACT_MM 1 
151
+#define Y_HOME_RETRACT_MM 5
152
+#ifdef DELTA
153
+#define Z_HOME_RETRACT_MM 5
154
+#else
155
+#define Z_HOME_RETRACT_MM 1
156
+#endif
157
+
153 158
 //#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
154 159
 
155 160
 #define AXIS_RELATIVE_MODES {false, false, false, false}

Завантаження…
Відмінити
Зберегти