thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Move VIKI SCK/MOSI pins fix to Conditionals_POST.h

Scott Lahteine 7 years ago
parent
e9bcb9d048
commit
560d366b80
30 changed files with 12 additions and 201 deletions
Split View Show Diff Stats
  1. 0
    6
      Marlin/Configuration_adv.h
  2. 0
    6
      Marlin/src/config/default/Configuration_adv.h
  3. 0
    7
      Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
  4. 0
    7
      Marlin/src/config/examples/Anet/A6/Configuration_adv.h
  5. 0
    7
      Marlin/src/config/examples/Anet/A8/Configuration_adv.h
  6. 0
    7
      Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
  7. 0
    7
      Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
  8. 0
    7
      Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
  9. 0
    7
      Marlin/src/config/examples/Cartesio/Configuration_adv.h
  10. 0
    7
      Marlin/src/config/examples/Felix/Configuration_adv.h
  11. 0
    7
      Marlin/src/config/examples/Folger Tech/i3-2020/Configuration_adv.h
  12. 0
    7
      Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
  13. 0
    7
      Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
  14. 0
    7
      Marlin/src/config/examples/RigidBot/Configuration_adv.h
  15. 0
    7
      Marlin/src/config/examples/SCARA/Configuration_adv.h
  16. 0
    7
      Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
  17. 0
    7
      Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
  18. 0
    7
      Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
  19. 0
    7
      Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
  20. 0
    7
      Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
  21. 0
    7
      Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
  22. 0
    7
      Marlin/src/config/examples/delta/generic/Configuration_adv.h
  23. 0
    7
      Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
  24. 0
    7
      Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
  25. 0
    7
      Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
  26. 0
    7
      Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
  27. 0
    7
      Marlin/src/config/examples/makibox/Configuration_adv.h
  28. 0
    7
      Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
  29. 0
    7
      Marlin/src/config/examples/wt150/Configuration_adv.h
  30. 12
    0
      Marlin/src/inc/Conditionals_post.h

+ 0
- 6
Marlin/Configuration_adv.h View File 

@@ -576,12 +576,6 @@
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 578
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 579 
 #endif // DOGLCD
586 580
587 581 
 // @section safety

+ 0
- 6
Marlin/src/config/default/Configuration_adv.h View File 

@@ -576,12 +576,6 @@
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 578
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 579 
 #endif // DOGLCD
586 580
587 581 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Anet/A6/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Anet/A8/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Cartesio/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Felix/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Folger Tech/i3-2020/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/RigidBot/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/SCARA/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h View File 

@@ -564,13 +564,6 @@
564 564 
   // Enable this option and reduce the value to optimize screen updates.
565 565 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
566 566 
   //#define DOGM_SPI_DELAY_US 5
567 
-
568 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
569 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
570 
-    #define DOGLCD_SCK SCK_PIN
571 
-    #define DOGLCD_MOSI MOSI_PIN
572 
-  #endif
573 
-
574 567 
 #endif // DOGLCD
575 568
576 569 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h View File 

@@ -588,13 +588,6 @@
588 588 
   // Enable this option and reduce the value to optimize screen updates.
589 589 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
590 590 
   //#define DOGM_SPI_DELAY_US 5
591 
-
592 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
593 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
594 
-    #define DOGLCD_SCK SCK_PIN
595 
-    #define DOGLCD_MOSI MOSI_PIN
596 
-  #endif
597 
-
598 591 
 #endif // DOGLCD
599 592
600 593 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h View File 

@@ -577,13 +577,6 @@
577 577 
   // Enable this option and reduce the value to optimize screen updates.
578 578 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
579 579 
   //#define DOGM_SPI_DELAY_US 5
580 
-
581 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
582 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
583 
-    #define DOGLCD_SCK SCK_PIN
584 
-    #define DOGLCD_MOSI MOSI_PIN
585 
-  #endif
586 
-
587 580 
 #endif // DOGLCD
588 581
589 582 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h View File 

@@ -577,13 +577,6 @@
577 577 
   // Enable this option and reduce the value to optimize screen updates.
578 578 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
579 579 
   //#define DOGM_SPI_DELAY_US 5
580 
-
581 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
582 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
583 
-    #define DOGLCD_SCK SCK_PIN
584 
-    #define DOGLCD_MOSI MOSI_PIN
585 
-  #endif
586 
-
587 580 
 #endif // DOGLCD
588 581
589 582 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/delta/generic/Configuration_adv.h View File 

@@ -577,13 +577,6 @@
577 577 
   // Enable this option and reduce the value to optimize screen updates.
578 578 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
579 579 
   //#define DOGM_SPI_DELAY_US 5
580 
-
581 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
582 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
583 
-    #define DOGLCD_SCK SCK_PIN
584 
-    #define DOGLCD_MOSI MOSI_PIN
585 
-  #endif
586 
-
587 580 
 #endif // DOGLCD
588 581
589 582 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h View File 

@@ -577,13 +577,6 @@
577 577 
   // Enable this option and reduce the value to optimize screen updates.
578 578 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
579 579 
   //#define DOGM_SPI_DELAY_US 5
580 
-
581 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
582 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
583 
-    #define DOGLCD_SCK SCK_PIN
584 
-    #define DOGLCD_MOSI MOSI_PIN
585 
-  #endif
586 
-
587 580 
 #endif // DOGLCD
588 581
589 582 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h View File 

@@ -582,13 +582,6 @@
582 582 
   // Enable this option and reduce the value to optimize screen updates.
583 583 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
584 584 
   //#define DOGM_SPI_DELAY_US 5
585 
-
586 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
587 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
588 
-    #define DOGLCD_SCK SCK_PIN
589 
-    #define DOGLCD_MOSI MOSI_PIN
590 
-  #endif
591 
-
592 585 
 #endif // DOGLCD
593 586
594 587 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h View File 

@@ -577,13 +577,6 @@
577 577 
   // Enable this option and reduce the value to optimize screen updates.
578 578 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
579 579 
   //#define DOGM_SPI_DELAY_US 5
580 
-
581 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
582 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
583 
-    #define DOGLCD_SCK SCK_PIN
584 
-    #define DOGLCD_MOSI MOSI_PIN
585 
-  #endif
586 
-
587 580 
 #endif // DOGLCD
588 581
589 582 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/makibox/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 0
- 7
Marlin/src/config/examples/wt150/Configuration_adv.h View File 

@@ -575,13 +575,6 @@
575 575 
   // Enable this option and reduce the value to optimize screen updates.
576 576 
   // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
577 577 
   //#define DOGM_SPI_DELAY_US 5
578 
-
579 
-  // VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
580 
-  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
581 
-    #define DOGLCD_SCK SCK_PIN
582 
-    #define DOGLCD_MOSI MOSI_PIN
583 
-  #endif
584 
-
585 578 
 #endif // DOGLCD
586 579
587 580 
 // @section safety

+ 12
- 0
Marlin/src/inc/Conditionals_post.h View File 

@@ -857,6 +857,18 @@
857 857 
   #endif
858 858
859 859 
   /**
860 
+   * VIKI2 and miniVIKI require DOGLCD_SCK and DOGLCD_MOSI to be defined.
861 
+   */
862 
+  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
863 
+    #ifndef DOGLCD_SCK
864 
+      #define DOGLCD_SCK  SCK_PIN
865 
+    #endif
866 
+    #ifndef DOGLCD_MOSI
867 
+      #define DOGLCD_MOSI MOSI_PIN
868 
+    #endif
869 
+  #endif
870 
+
871 
+  /**
860 872 
    * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
861 873 
    */
862 874 
   #ifndef Z_HOMING_HEIGHT

Write Preview
Loading…
Cancel
Save