Procházet zdrojové kódy

Merge SDCARDDETECTINVERTED (#2144)

Richard Wackerbarth před 9 roky
rodič
revize
bdf778bec2

+ 4
- 3
Marlin/Conditionals.h Zobrazit soubor

@@ -33,8 +33,9 @@
33 33
       #define DEFAULT_LCD_CONTRAST 40
34 34
     #elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
35 35
       #define DEFAULT_LCD_CONTRAST 110
36
-      #define SDCARDDETECTINVERTED
37
-      #define SDSLOW
36
+      #ifdef ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
37
+        #define SDCARDDETECTINVERTED
38
+      #endif
38 39
       #define U8GLIB_LM6059_AF
39 40
     #endif
40 41
 
@@ -322,7 +323,7 @@
322 323
     #define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS] / EXTRUSION_AREA)
323 324
   #endif
324 325
 
325
-  #ifdef ULTIPANEL
326
+  #if defined(ULTIPANEL) && !defined(ELB_FULL_GRAPHIC_CONTROLLER)
326 327
     #undef SDCARDDETECTINVERTED
327 328
   #endif
328 329
 

+ 1
- 0
Marlin/Configuration.h Zobrazit soubor

@@ -670,6 +670,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
670 670
 //
671 671
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
672 672
 //#define ELB_FULL_GRAPHIC_CONTROLLER
673
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
673 674
 
674 675
 // The RepRapDiscount Smart Controller (white PCB)
675 676
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 3
- 1
Marlin/Configuration_adv.h Zobrazit soubor

@@ -289,7 +289,9 @@
289 289
   // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
290 290
   // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
291 291
   // be commented out otherwise
292
-  #define SDCARDDETECTINVERTED
292
+  #ifndef ELB_FULL_GRAPHIC_CONTROLLER
293
+    #define SDCARDDETECTINVERTED
294
+  #endif
293 295
 
294 296
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
295 297
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 0
Marlin/example_configurations/Felix/Configuration.h Zobrazit soubor

@@ -610,6 +610,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
610 610
 //
611 611
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
612 612
 //#define ELB_FULL_GRAPHIC_CONTROLLER
613
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
613 614
 
614 615
 // The RepRapDiscount Smart Controller (white PCB)
615 616
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 0
Marlin/example_configurations/Felix/Configuration_DUAL.h Zobrazit soubor

@@ -600,6 +600,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
600 600
 //#define VIKI2
601 601
 //#define miniVIKI
602 602
 
603
+// This is a new controller currently under development.  https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
604
+//
605
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
606
+//#define ELB_FULL_GRAPHIC_CONTROLLER
607
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
608
+
603 609
 // The RepRapDiscount Smart Controller (white PCB)
604 610
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
605 611
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER

+ 1
- 0
Marlin/example_configurations/Hephestos/Configuration.h Zobrazit soubor

@@ -633,6 +633,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
633 633
 //
634 634
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
635 635
 //#define ELB_FULL_GRAPHIC_CONTROLLER
636
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
636 637
 
637 638
 // The RepRapDiscount Smart Controller (white PCB)
638 639
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/K8200/Configuration.h Zobrazit soubor

@@ -688,6 +688,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
688 688
 //
689 689
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
690 690
 //#define ELB_FULL_GRAPHIC_CONTROLLER
691
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
691 692
 
692 693
 // The RepRapDiscount Smart Controller (white PCB)
693 694
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Zobrazit soubor

@@ -671,6 +671,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
671 671
 //
672 672
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
673 673
 //#define ELB_FULL_GRAPHIC_CONTROLLER
674
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
674 675
 
675 676
 // The RepRapDiscount Smart Controller (white PCB)
676 677
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/SCARA/Configuration.h Zobrazit soubor

@@ -668,6 +668,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
668 668
 //
669 669
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
670 670
 //#define ELB_FULL_GRAPHIC_CONTROLLER
671
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
671 672
 
672 673
 // The RepRapDiscount Smart Controller (white PCB)
673 674
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/WITBOX/Configuration.h Zobrazit soubor

@@ -632,6 +632,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
632 632
 //
633 633
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
634 634
 //#define ELB_FULL_GRAPHIC_CONTROLLER
635
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
635 636
 
636 637
 // The RepRapDiscount Smart Controller (white PCB)
637 638
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/delta/biv2.5/Configuration.h Zobrazit soubor

@@ -675,6 +675,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
675 675
 //
676 676
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
677 677
 //#define ELB_FULL_GRAPHIC_CONTROLLER
678
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
678 679
 
679 680
 // The RepRapDiscount Smart Controller (white PCB)
680 681
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/delta/generic/Configuration.h Zobrazit soubor

@@ -678,6 +678,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
678 678
 //
679 679
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
680 680
 //#define ELB_FULL_GRAPHIC_CONTROLLER
681
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
681 682
 
682 683
 // The RepRapDiscount Smart Controller (white PCB)
683 684
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h Zobrazit soubor

@@ -682,6 +682,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
682 682
 //
683 683
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
684 684
 //#define ELB_FULL_GRAPHIC_CONTROLLER
685
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
685 686
 
686 687
 // The RepRapDiscount Smart Controller (white PCB)
687 688
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/makibox/Configuration.h Zobrazit soubor

@@ -630,6 +630,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
630 630
 //
631 631
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
632 632
 //#define ELB_FULL_GRAPHIC_CONTROLLER
633
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
633 634
 
634 635
 // The RepRapDiscount Smart Controller (white PCB)
635 636
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h Zobrazit soubor

@@ -636,6 +636,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
636 636
 //
637 637
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
638 638
 //#define ELB_FULL_GRAPHIC_CONTROLLER
639
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
639 640
 
640 641
 // The RepRapDiscount Smart Controller (white PCB)
641 642
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

Loading…
Zrušit
Uložit