Pārlūkot izejas kodu

Getting rid of SDEXTRASLOW, SDSLOW variables.

Ruwan J Egoda Gamage 9 gadus atpakaļ
vecāks
revīzija
b58083b0fa

+ 1
- 7
Marlin/cardreader.cpp Parādīt failu

@@ -195,13 +195,7 @@ void CardReader::initsd() {
195 195
   cardOK = false;
196 196
   if (root.isOpen()) root.close();
197 197
 
198
-  #if ENABLED(SDULTRASLOW)
199
-    #define SPI_SPEED SPI_SIXTEENTH_SPEED
200
-  #elif ENABLED(SDEXTRASLOW)
201
-    #define SPI_SPEED SPI_QUARTER_SPEED
202
-  #elif ENABLED(SDSLOW)
203
-    #define SPI_SPEED SPI_HALF_SPEED
204
-  #else
198
+  #ifndef SPI_SPEED
205 199
     #define SPI_SPEED SPI_FULL_SPEED
206 200
   #endif
207 201
 

+ 1
- 3
Marlin/example_configurations/Felix/Configuration.h Parādīt failu

@@ -649,9 +649,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
649 649
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
650 650
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
651 651
 // Changed behaviour! If you need SDSUPPORT uncomment it!
652
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
653
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
654
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
652
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
655 653
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
656 654
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
657 655
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/Felix/Configuration_DUAL.h Parādīt failu

@@ -618,9 +618,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
618 618
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
619 619
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
620 620
 // Changed behaviour! If you need SDSUPPORT uncomment it!
621
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
622
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
623
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
621
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
624 622
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
625 623
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
626 624
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/Hephestos/Configuration.h Parādīt failu

@@ -658,9 +658,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
658 658
 #define ULTRA_LCD  //general LCD support, also 16x2
659 659
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
660 660
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
661
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
662
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
663
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
661
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
664 662
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
665 663
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
666 664
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/K8200/Configuration.h Parādīt failu

@@ -654,9 +654,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
654 654
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
655 655
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
656 656
 // Changed behaviour! If you need SDSUPPORT uncomment it!
657
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
658
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
659
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
657
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
660 658
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
661 659
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
662 660
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Parādīt failu

@@ -666,9 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
666 666
 #define ULTRA_LCD  //general LCD support, also 16x2
667 667
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
668 668
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
669
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
670
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
671
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
669
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
672 670
 #define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
673 671
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
674 672
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/RigidBot/Configuration.h Parādīt failu

@@ -658,9 +658,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
658 658
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
659 659
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
660 660
 // Changed behaviour! If you need SDSUPPORT uncomment it!
661
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
662
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
663
-#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
661
+#define SPI_SPEED SPI_EIGHTH_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
664 662
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
665 663
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
666 664
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/SCARA/Configuration.h Parādīt failu

@@ -674,9 +674,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
674 674
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
675 675
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
676 676
 // Changed behaviour! If you need SDSUPPORT uncomment it!
677
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
678
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
679
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
677
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
680 678
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
681 679
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
682 680
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/TAZ4/Configuration.h Parādīt failu

@@ -685,9 +685,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
685 685
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
686 686
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
687 687
 // Changed behaviour! If you need SDSUPPORT uncomment it!
688
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
689
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
690
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
688
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
691 689
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
692 690
 #define ENCODER_PULSES_PER_STEP 2 // Increase if you have a high resolution encoder
693 691
 #define ENCODER_STEPS_PER_MENU_ITEM 1 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/WITBOX/Configuration.h Parādīt failu

@@ -657,9 +657,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
657 657
 #define ULTRA_LCD  //general LCD support, also 16x2
658 658
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
659 659
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
660
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
661
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
662
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
660
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
663 661
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
664 662
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
665 663
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/adafruit/ST7565/Configuration.h Parādīt failu

@@ -666,9 +666,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
666 666
 //#define ULTRA_LCD  //general LCD support, also 16x2
667 667
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
668 668
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
669
-#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
670
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
671
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
669
+#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
672 670
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
673 671
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
674 672
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/delta/biv2.5/Configuration.h Parādīt failu

@@ -788,9 +788,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
788 788
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
789 789
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
790 790
 // Changed behaviour! If you need SDSUPPORT uncomment it!
791
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
792
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
793
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
791
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
794 792
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
795 793
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
796 794
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/delta/generic/Configuration.h Parādīt failu

@@ -789,9 +789,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
789 789
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
790 790
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
791 791
 // Changed behaviour! If you need SDSUPPORT uncomment it!
792
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
793
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
794
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
792
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
795 793
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
796 794
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
797 795
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/delta/kossel_mini/Configuration.h Parādīt failu

@@ -793,9 +793,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
793 793
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
794 794
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
795 795
 // Changed behaviour! If you need SDSUPPORT uncomment it!
796
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
797
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
798
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
796
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
799 797
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
800 798
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
801 799
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/delta/kossel_pro/Configuration.h Parādīt failu

@@ -783,9 +783,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
783 783
 //#define ULTRA_LCD  //general LCD support, also 16x2
784 784
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
785 785
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
786
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
787
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
788
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
786
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
789 787
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
790 788
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
791 789
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/makibox/Configuration.h Parādīt failu

@@ -668,9 +668,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
668 668
 //#define ULTRA_LCD  //general LCD support, also 16x2
669 669
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
670 670
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
671
-#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
672
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
673
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
671
+#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
674 672
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
675 673
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
676 674
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

+ 1
- 3
Marlin/example_configurations/tvrrug/Round2/Configuration.h Parādīt failu

@@ -661,9 +661,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
661 661
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
662 662
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
663 663
 // Changed behaviour! If you need SDSUPPORT uncomment it!
664
-//#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
665
-//#define SDEXTRASLOW // Use even slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
666
-//#define SDULTRASLOW // Use slowest SD transfer mode (not normally needed - uncomment if you're getting volume init error)
664
+//#define SPI_SPEED SPI_HALF_SPEED // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
667 665
 //#define SD_CHECK_AND_RETRY // Use CRC checks and retries on the SD communication
668 666
 //#define ENCODER_PULSES_PER_STEP 1 // Increase if you have a high resolution encoder
669 667
 //#define ENCODER_STEPS_PER_MENU_ITEM 5 // Set according to ENCODER_PULSES_PER_STEP or your liking

Notiek ielāde…
Atcelt
Saglabāt