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

Merge SDCARDDETECTINVERTED (#2144)

Richard Wackerbarth 9 years ago
parent
2bf482ce65 08968c29bb
commit
bdf778bec2
15 changed files with 25 additions and 4 deletions
Unified View Show Diff Stats
  1. 4
    3
      Marlin/Conditionals.h
  2. 1
    0
      Marlin/Configuration.h
  3. 3
    1
      Marlin/Configuration_adv.h
  4. 1
    0
      Marlin/example_configurations/Felix/Configuration.h
  5. 6
    0
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  6. 1
    0
      Marlin/example_configurations/Hephestos/Configuration.h
  7. 1
    0
      Marlin/example_configurations/K8200/Configuration.h
  8. 1
    0
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  9. 1
    0
      Marlin/example_configurations/SCARA/Configuration.h
  10. 1
    0
      Marlin/example_configurations/WITBOX/Configuration.h
  11. 1
    0
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  12. 1
    0
      Marlin/example_configurations/delta/generic/Configuration.h
  13. 1
    0
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  14. 1
    0
      Marlin/example_configurations/makibox/Configuration.h
  15. 1
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 4
- 3
Marlin/Conditionals.h View File

33 
       #define DEFAULT_LCD_CONTRAST 40
 33 
       #define DEFAULT_LCD_CONTRAST 40
34 
     #elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
 34 
     #elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
35 
       #define DEFAULT_LCD_CONTRAST 110
 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 
       #define U8GLIB_LM6059_AF
 39 
       #define U8GLIB_LM6059_AF
39 
     #endif
 40 
     #endif
40
41
322 
     #define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS] / EXTRUSION_AREA)
 323 
     #define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS] / EXTRUSION_AREA)
323 
   #endif
 324 
   #endif
324
325
325 
-  #ifdef ULTIPANEL
326 
+  #if defined(ULTIPANEL) && !defined(ELB_FULL_GRAPHIC_CONTROLLER)
326 
     #undef SDCARDDETECTINVERTED
 327 
     #undef SDCARDDETECTINVERTED
327 
   #endif
 328 
   #endif
328
329

+ 1
- 0
Marlin/Configuration.h View File

670 
 //
 670 
 //
671 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 671 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
672 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 672 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
673 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
673
674
674 
 // The RepRapDiscount Smart Controller (white PCB)
 675 
 // The RepRapDiscount Smart Controller (white PCB)
675 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 676 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 3
- 1
Marlin/Configuration_adv.h View File

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

610 
 //
 610 
 //
611 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 611 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
612 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 612 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
613 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
613
614
614 
 // The RepRapDiscount Smart Controller (white PCB)
 615 
 // The RepRapDiscount Smart Controller (white PCB)
615 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 616 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 0
Marlin/example_configurations/Felix/Configuration_DUAL.h View File

600 
 //#define VIKI2
 600 
 //#define VIKI2
601 
 //#define miniVIKI
 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 
 // The RepRapDiscount Smart Controller (white PCB)
 609 
 // The RepRapDiscount Smart Controller (white PCB)
604 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 610 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
605 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
 611 
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER

+ 1
- 0
Marlin/example_configurations/Hephestos/Configuration.h View File

633 
 //
 633 
 //
634 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 634 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
635 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 635 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
636 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
636
637
637 
 // The RepRapDiscount Smart Controller (white PCB)
 638 
 // The RepRapDiscount Smart Controller (white PCB)
638 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 639 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/K8200/Configuration.h View File

688 
 //
 688 
 //
689 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 689 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
690 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 690 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
691 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
691
692
692 
 // The RepRapDiscount Smart Controller (white PCB)
 693 
 // The RepRapDiscount Smart Controller (white PCB)
693 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 694 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

671 
 //
 671 
 //
672 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 672 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
673 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 673 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
674 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
674
675
675 
 // The RepRapDiscount Smart Controller (white PCB)
 676 
 // The RepRapDiscount Smart Controller (white PCB)
676 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 677 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

668 
 //
 668 
 //
669 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 669 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
670 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 670 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
671 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
671
672
672 
 // The RepRapDiscount Smart Controller (white PCB)
 673 
 // The RepRapDiscount Smart Controller (white PCB)
673 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 674 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/WITBOX/Configuration.h View File

632 
 //
 632 
 //
633 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 633 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
634 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 634 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
635 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
635
636
636 
 // The RepRapDiscount Smart Controller (white PCB)
 637 
 // The RepRapDiscount Smart Controller (white PCB)
637 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 638 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

675 
 //
 675 
 //
676 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 676 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
677 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 677 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
678 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
678
679
679 
 // The RepRapDiscount Smart Controller (white PCB)
 680 
 // The RepRapDiscount Smart Controller (white PCB)
680 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 681 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/delta/generic/Configuration.h View File

678 
 //
 678 
 //
679 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 679 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
680 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 680 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
681 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
681
682
682 
 // The RepRapDiscount Smart Controller (white PCB)
 683 
 // The RepRapDiscount Smart Controller (white PCB)
683 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 684 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

682 
 //
 682 
 //
683 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 683 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
684 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 684 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
685 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
685
686
686 
 // The RepRapDiscount Smart Controller (white PCB)
 687 
 // The RepRapDiscount Smart Controller (white PCB)
687 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 688 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/makibox/Configuration.h View File

630 
 //
 630 
 //
631 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 631 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
632 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 632 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
633 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
633
634
634 
 // The RepRapDiscount Smart Controller (white PCB)
 635 
 // The RepRapDiscount Smart Controller (white PCB)
635 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 636 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

636 
 //
 636 
 //
637 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
 637 
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
638 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
 638 
 //#define ELB_FULL_GRAPHIC_CONTROLLER
639 
+//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
639
640
640 
 // The RepRapDiscount Smart Controller (white PCB)
 641 
 // The RepRapDiscount Smart Controller (white PCB)
641 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
 642 
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

Write Preview
Loading…
Cancel
Save