Selaa lähdekoodia

New TMC2208 constructor

Co-Authored-By: teemuatlut <teemu.mantykallio@live.fi>
Scott Lahteine 6 vuotta sitten
vanhempi
commit
1561e61df7
1 muutettua tiedostoa jossa 56 lisäystä ja 13 poistoa
  1. 56
    13
      Marlin/src/module/stepper_indirection.cpp

+ 56
- 13
Marlin/src/module/stepper_indirection.cpp Näytä tiedosto

@@ -292,8 +292,7 @@
292 292
   #endif
293 293
 
294 294
   #define _TMC2208_DEFINE_HARDWARE(ST) TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL)
295
-  #define _TMC2208_DEFINE_SOFTWARE(ST) SoftwareSerial ST##_HARDWARE_SERIAL = SoftwareSerial(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN); \
296
-                                       TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL, ST##_SERIAL_RX_PIN > -1)
295
+  #define _TMC2208_DEFINE_SOFTWARE(ST) TMC2208Stepper stepper##ST(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN, ST##_SERIAL_RX_PIN > -1)
297 296
 
298 297
   // Stepper objects of TMC2208 steppers used
299 298
   #if AXIS_DRIVER_TYPE(X, TMC2208)
@@ -376,37 +375,81 @@
376 375
 
377 376
   void tmc2208_serial_begin() {
378 377
     #if AXIS_DRIVER_TYPE(X, TMC2208)
379
-      X_HARDWARE_SERIAL.begin(115200);
378
+      #ifdef X_HARDWARE_SERIAL
379
+        X_HARDWARE_SERIAL.begin(115200);
380
+      #else
381
+        stepperX.beginSerial(115200);
382
+      #endif
380 383
     #endif
381 384
     #if AXIS_DRIVER_TYPE(X2, TMC2208)
382
-      X2_HARDWARE_SERIAL.begin(115200);
385
+      #ifdef X2_HARDWARE_SERIAL
386
+        X2_HARDWARE_SERIAL.begin(115200);
387
+      #else
388
+        stepperX2.beginSerial(115200);
389
+      #endif
383 390
     #endif
384 391
     #if AXIS_DRIVER_TYPE(Y, TMC2208)
385
-      Y_HARDWARE_SERIAL.begin(115200);
392
+      #ifdef Y_HARDWARE_SERIAL
393
+        Y_HARDWARE_SERIAL.begin(115200);
394
+      #else
395
+        stepperY.beginSerial(115200);
396
+      #endif
386 397
     #endif
387 398
     #if AXIS_DRIVER_TYPE(Y2, TMC2208)
388
-      Y2_HARDWARE_SERIAL.begin(115200);
399
+      #ifdef Y2_HARDWARE_SERIAL
400
+        Y2_HARDWARE_SERIAL.begin(115200);
401
+      #else
402
+        stepperY2.beginSerial(115200);
403
+      #endif
389 404
     #endif
390 405
     #if AXIS_DRIVER_TYPE(Z, TMC2208)
391
-      Z_HARDWARE_SERIAL.begin(115200);
406
+      #ifdef Z_HARDWARE_SERIAL
407
+        Z_HARDWARE_SERIAL.begin(115200);
408
+      #else
409
+        stepperZ.beginSerial(115200);
410
+      #endif
392 411
     #endif
393 412
     #if AXIS_DRIVER_TYPE(Z2, TMC2208)
394
-      Z2_HARDWARE_SERIAL.begin(115200);
413
+      #ifdef Z2_HARDWARE_SERIAL
414
+        Z2_HARDWARE_SERIAL.begin(115200);
415
+      #else
416
+        stepperZ2.beginSerial(115200);
417
+      #endif
395 418
     #endif
396 419
     #if AXIS_DRIVER_TYPE(E0, TMC2208)
397
-      E0_HARDWARE_SERIAL.begin(115200);
420
+      #ifdef E0_HARDWARE_SERIAL
421
+        E0_HARDWARE_SERIAL.begin(115200);
422
+      #else
423
+        stepperE0.beginSerial(115200);
424
+      #endif
398 425
     #endif
399 426
     #if AXIS_DRIVER_TYPE(E1, TMC2208)
400
-      E1_HARDWARE_SERIAL.begin(115200);
427
+      #ifdef E1_HARDWARE_SERIAL
428
+        E1_HARDWARE_SERIAL.begin(115200);
429
+      #else
430
+        stepperE1.beginSerial(115200);
431
+      #endif
401 432
     #endif
402 433
     #if AXIS_DRIVER_TYPE(E2, TMC2208)
403
-      E2_HARDWARE_SERIAL.begin(115200);
434
+      #ifdef E2_HARDWARE_SERIAL
435
+        E2_HARDWARE_SERIAL.begin(115200);
436
+      #else
437
+        stepperE2.beginSerial(115200);
438
+      #endif
404 439
     #endif
405 440
     #if AXIS_DRIVER_TYPE(E3, TMC2208)
406
-      E3_HARDWARE_SERIAL.begin(115200);
441
+      #ifdef E3_HARDWARE_SERIAL
442
+        E3_HARDWARE_SERIAL.begin(115200);
443
+      #else
444
+        stepperE3.beginSerial(115200);
445
+      #endif
407 446
     #endif
408 447
     #if AXIS_DRIVER_TYPE(E4, TMC2208)
409
-      E4_HARDWARE_SERIAL.begin(115200);
448
+      #ifdef E4_HARDWARE_SERIAL
449
+        E4_HARDWARE_SERIAL.begin(115200);
450
+      #else
451
+        stepperE4.beginSerial(115200);
452
+      #endif
410 453
     #endif
411 454
   }
412 455
 

Loading…
Peruuta
Tallenna