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

Merge pull request #1527 from maverikou/panel_one 

Added support for PanelOne from T3P3.
Scott Lahteine 9 years ago
parent
a5bbd402bf 8742b6bd56
commit
a99470fbb0
9 changed files with 80 additions and 6 deletions
Split View Show Diff Stats
  1. 8
    0
      Marlin/Configuration.h
  2. 8
    0
      Marlin/example_configurations/Hephestos/Configuration.h
  3. 8
    0
      Marlin/example_configurations/K8200/Configuration.h
  4. 8
    0
      Marlin/example_configurations/SCARA/Configuration.h
  5. 8
    0
      Marlin/example_configurations/WITBOX/Configuration.h
  6. 8
    0
      Marlin/example_configurations/delta/Configuration.h
  7. 8
    0
      Marlin/example_configurations/makibox/Configuration.h
  8. 8
    0
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  9. 16
    6
      Marlin/pins_RAMPS_13.h

+ 8
- 0
Marlin/Configuration.h View File 

@@ -585,6 +585,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
585 585 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
586 586 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
587 587
588 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
589 
+// http://reprap.org/wiki/PanelOne
590 
+//#define PANEL_ONE
591 
+
588 592 
 // The MaKr3d Makr-Panel with graphic controller and SD support
589 593 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
590 594 
 //#define MAKRPANEL
 
@@ -643,6 +647,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
643 647 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
644 648 
 #endif
645 649
650 
+#if defined (PANEL_ONE)
651 
+ #define SDSUPPORT
652 
+ #define ULTIMAKERCONTROLLER
653 
+#endif
646 654
647 655 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
648 656 
  #define DOGLCD

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

@@ -587,6 +587,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
587 587 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
588 588 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
589 589
590 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
591 
+// http://reprap.org/wiki/PanelOne
592 
+//#define PANEL_ONE
593 
+
590 594 
 // The MaKr3d Makr-Panel with graphic controller and SD support
591 595 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
592 596 
 //#define MAKRPANEL
 
@@ -645,6 +649,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
645 649 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
646 650 
 #endif
647 651
652 
+#if defined (PANEL_ONE)
653 
+ #define SDSUPPORT
654 
+ #define ULTIMAKERCONTROLLER
655 
+#endif
648 656
649 657 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
650 658 
  #define DOGLCD

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

@@ -597,6 +597,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
597 597 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
598 598 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
599 599
600 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
601 
+// http://reprap.org/wiki/PanelOne
602 
+//#define PANEL_ONE
603 
+
600 604 
 // The MaKr3d Makr-Panel with graphic controller and SD support
601 605 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
602 606 
 //#define MAKRPANEL
 
@@ -655,6 +659,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
655 659 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
656 660 
 #endif
657 661
662 
+#if defined (PANEL_ONE)
663 
+ #define SDSUPPORT
664 
+ #define ULTIMAKERCONTROLLER
665 
+#endif
658 666
659 667 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
660 668 
  #define DOGLCD

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

@@ -590,6 +590,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
590 590 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
591 591 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
592 592
593 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
594 
+// http://reprap.org/wiki/PanelOne
595 
+//#define PANEL_ONE
596 
+
593 597 
 // The MaKr3d Makr-Panel with graphic controller and SD support
594 598 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
595 599 
 //#define MAKRPANEL
 
@@ -648,6 +652,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
648 652 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
649 653 
 #endif
650 654
655 
+#if defined (PANEL_ONE)
656 
+ #define SDSUPPORT
657 
+ #define ULTIMAKERCONTROLLER
658 
+#endif
651 659
652 660 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
653 661 
  #define DOGLCD

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

@@ -591,6 +591,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
591 591 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
592 592 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
593 593
594 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
595 
+// http://reprap.org/wiki/PanelOne
596 
+//#define PANEL_ONE
597 
+
594 598 
 // The MaKr3d Makr-Panel with graphic controller and SD support
595 599 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
596 600 
 //#define MAKRPANEL
 
@@ -649,6 +653,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
649 653 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
650 654 
 #endif
651 655
656 
+#if defined (PANEL_ONE)
657 
+ #define SDSUPPORT
658 
+ #define ULTIMAKERCONTROLLER
659 
+#endif
652 660
653 661 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
654 662 
  #define DOGLCD

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

@@ -495,6 +495,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
495 495 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
496 496 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
497 497
498 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
499 
+// http://reprap.org/wiki/PanelOne
500 
+//#define PANEL_ONE
501 
+
498 502 
 // The MaKr3d Makr-Panel with graphic controller and SD support
499 503 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
500 504 
 //#define MAKRPANEL
 
@@ -560,6 +564,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
560 564 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
561 565 
 #endif
562 566
567 
+#if defined (PANEL_ONE)
568 
+ #define SDSUPPORT
569 
+ #define ULTIMAKERCONTROLLER
570 
+#endif
563 571
564 572 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
565 573 
  #define DOGLCD

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

@@ -565,6 +565,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
565 565 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
566 566 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
567 567
568 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
569 
+// http://reprap.org/wiki/PanelOne
570 
+//#define PANEL_ONE
571 
+
568 572 
 // The MaKr3d Makr-Panel with graphic controller and SD support
569 573 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
570 574 
 //#define MAKRPANEL
 
@@ -623,6 +627,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
623 627 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
624 628 
 #endif
625 629
630 
+#if defined (PANEL_ONE)
631 
+ #define SDSUPPORT
632 
+ #define ULTIMAKERCONTROLLER
633 
+#endif
626 634
627 635 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
628 636 
  #define DOGLCD

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

@@ -578,6 +578,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
578 578 
 //#define LCD_FEEDBACK_FREQUENCY_HZ 1000	// this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
579 579 
 //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
580 580
581 
+// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
582 
+// http://reprap.org/wiki/PanelOne
583 
+//#define PANEL_ONE
584 
+
581 585 
 // The MaKr3d Makr-Panel with graphic controller and SD support
582 586 
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
583 587 
 //#define MAKRPANEL
 
@@ -636,6 +640,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
636 640 
  #define ENCODER_STEPS_PER_MENU_ITEM 1
637 641 
 #endif
638 642
643 
+#if defined (PANEL_ONE)
644 
+ #define SDSUPPORT
645 
+ #define ULTIMAKERCONTROLLER
646 
+#endif
639 647
640 648 
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
641 649 
  #define DOGLCD

+ 16
- 6
Marlin/pins_RAMPS_13.h View File 

@@ -122,12 +122,22 @@
122 122 
 #ifdef ULTRA_LCD
123 123
124 124 
   #ifdef NEWPANEL
125 
-    #define LCD_PINS_RS 16
126 
-    #define LCD_PINS_ENABLE 17
127 
-    #define LCD_PINS_D4 23
128 
-    #define LCD_PINS_D5 25
129 
-    #define LCD_PINS_D6 27
130 
-    #define LCD_PINS_D7 29
125 
+    #ifdef PANEL_ONE
126 
+      #define LCD_PINS_RS 40
127 
+      #define LCD_PINS_ENABLE 42
128 
+      #define LCD_PINS_D4 65
129 
+      #define LCD_PINS_D5 66
130 
+      #define LCD_PINS_D6 44
131 
+      #define LCD_PINS_D7 64
132 
+    #else
133 
+      #define LCD_PINS_RS 16
134 
+      #define LCD_PINS_ENABLE 17
135 
+      #define LCD_PINS_D4 23
136 
+      #define LCD_PINS_D5 25
137 
+      #define LCD_PINS_D6 27
138 
+      #define LCD_PINS_D7 29
139 
+    #endif
140 
+
131 141
132 142 
     #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
133 143 
       #define BEEPER 37

Write Preview
Loading…
Cancel
Save