Browse Source

Viki 2 Implementation

I've insert the define and pointer entries for the Viki 2 and miniViki
from Panucatt in all of the example configs and main config. With these
additions and with pins done in the old single pin.h style...I was able
to get the display working fine save for needing to turn Delta Segments
per Second down. But that's a common graphics lcd issue being looked
into right now.

I need assistance in understanding how the new divided pins files fit
together because my previous attempts at trying to get it to work
appropriately didn't seem successful. This originally came from trying
to find out how to swap the XYZ Min and Max Endstop pins in the Azteeg
X3 Pro. It only comes with one set of connectors and they're Min
Endstops. My previous experience didn't turn out well trying to tell the
firmware to home to the Min Endstops so the best solution I found was to
swap the pins in the firmware. If I'm missing a conflict with a setup
other than delta please let me know, but it makes sense in my setup.
Natealus 9 years ago
parent
commit
38a500d05c

+ 22
- 0
Marlin/Configuration.h View File

584
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
584
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
585
 //#define MAKRPANEL
585
 //#define MAKRPANEL
586
 
586
 
587
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
588
+// http://panucatt.com
589
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
590
+//#define VIKI2
591
+//#define miniVIKI
592
+
587
 // The RepRapDiscount Smart Controller (white PCB)
593
 // The RepRapDiscount Smart Controller (white PCB)
588
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
594
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
589
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
595
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
617
  #define DEFAULT_LCD_CONTRAST 17
623
  #define DEFAULT_LCD_CONTRAST 17
618
 #endif
624
 #endif
619
 
625
 
626
+#if defined(miniVIKI) || defined(VIKI2)
627
+ #define ULTRA_LCD  //general LCD support, also 16x2
628
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
629
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
630
+ 
631
+  #ifdef miniVIKI
632
+   #define DEFAULT_LCD_CONTRAST 95
633
+  #else
634
+   #define DEFAULT_LCD_CONTRAST 40
635
+  #endif
636
+  
637
+ #define ENCODER_PULSES_PER_STEP 4
638
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
639
+#endif
640
+
641
+
620
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
642
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
621
  #define DOGLCD
643
  #define DOGLCD
622
  #define U8GLIB_ST7920
644
  #define U8GLIB_ST7920

+ 9
- 0
Marlin/Marlin_main.cpp View File

632
   digitalWrite(SERVO0_PIN, LOW); // turn it off
632
   digitalWrite(SERVO0_PIN, LOW); // turn it off
633
 #endif // Z_PROBE_SLED
633
 #endif // Z_PROBE_SLED
634
   setup_homepin();
634
   setup_homepin();
635
+  
636
+#ifdef STAT_LED_RED
637
+  pinMode(STAT_LED_RED, OUTPUT);
638
+  digitalWrite(STAT_LED_RED, LOW); // turn it off
639
+#endif
640
+#ifdef STAT_LED_BLUE
641
+  pinMode(STAT_LED_BLUE, OUTPUT);
642
+  digitalWrite(STAT_LED_BLUE, LOW); // turn it off
643
+#endif  
635
 }
644
 }
636
 
645
 
637
 
646
 

+ 3
- 0
Marlin/dogm_lcd_implementation.h View File

92
 #elif defined(MAKRPANEL)
92
 #elif defined(MAKRPANEL)
93
 // The MaKrPanel display, ST7565 controller as well
93
 // The MaKrPanel display, ST7565 controller as well
94
 U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
94
 U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
95
+#elif defined(VIKI2) || defined(miniVIKI)
96
+// Mini Viki and Viki 2.0 LCD, ST7565 controller as well
97
+U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
95
 #else
98
 #else
96
 // for regular DOGM128 display with HW-SPI
99
 // for regular DOGM128 display with HW-SPI
97
 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0
100
 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0

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

590
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
590
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
591
 //#define MAKRPANEL
591
 //#define MAKRPANEL
592
 
592
 
593
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
594
+// http://panucatt.com
595
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
596
+//#define VIKI2
597
+//#define miniVIKI
598
+
593
 // The RepRapDiscount Smart Controller (white PCB)
599
 // The RepRapDiscount Smart Controller (white PCB)
594
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
600
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
595
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
601
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
623
  #define DEFAULT_LCD_CONTRAST 17
629
  #define DEFAULT_LCD_CONTRAST 17
624
 #endif
630
 #endif
625
 
631
 
632
+#if defined(miniVIKI) || defined(VIKI2)
633
+ #define ULTRA_LCD  //general LCD support, also 16x2
634
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
635
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
636
+ 
637
+  #ifdef miniVIKI
638
+   #define DEFAULT_LCD_CONTRAST 95
639
+  #else
640
+   #define DEFAULT_LCD_CONTRAST 40
641
+  #endif
642
+  
643
+ #define ENCODER_PULSES_PER_STEP 4
644
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
645
+#endif
646
+
647
+
626
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
648
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
627
  #define DOGLCD
649
  #define DOGLCD
628
  #define U8GLIB_ST7920
650
  #define U8GLIB_ST7920

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

600
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
600
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
601
 //#define MAKRPANEL
601
 //#define MAKRPANEL
602
 
602
 
603
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
604
+// http://panucatt.com
605
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
606
+//#define VIKI2
607
+//#define miniVIKI
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
633
  #define DEFAULT_LCD_CONTRAST 17
639
  #define DEFAULT_LCD_CONTRAST 17
634
 #endif
640
 #endif
635
 
641
 
642
+#if defined(miniVIKI) || defined(VIKI2)
643
+ #define ULTRA_LCD  //general LCD support, also 16x2
644
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
645
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
646
+ 
647
+  #ifdef miniVIKI
648
+   #define DEFAULT_LCD_CONTRAST 95
649
+  #else
650
+   #define DEFAULT_LCD_CONTRAST 40
651
+  #endif
652
+  
653
+ #define ENCODER_PULSES_PER_STEP 4
654
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
655
+#endif
656
+
657
+
636
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
658
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
637
  #define DOGLCD
659
  #define DOGLCD
638
  #define U8GLIB_ST7920
660
  #define U8GLIB_ST7920

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

593
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
593
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
594
 //#define MAKRPANEL
594
 //#define MAKRPANEL
595
 
595
 
596
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
597
+// http://panucatt.com
598
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
599
+//#define VIKI2
600
+//#define miniVIKI
601
+
596
 // The RepRapDiscount Smart Controller (white PCB)
602
 // The RepRapDiscount Smart Controller (white PCB)
597
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
603
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
598
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
604
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
626
  #define DEFAULT_LCD_CONTRAST 17
632
  #define DEFAULT_LCD_CONTRAST 17
627
 #endif
633
 #endif
628
 
634
 
635
+#if defined(miniVIKI) || defined(VIKI2)
636
+ #define ULTRA_LCD  //general LCD support, also 16x2
637
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
638
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
639
+ 
640
+  #ifdef miniVIKI
641
+   #define DEFAULT_LCD_CONTRAST 95
642
+  #else
643
+   #define DEFAULT_LCD_CONTRAST 40
644
+  #endif
645
+  
646
+ #define ENCODER_PULSES_PER_STEP 4
647
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
648
+#endif
649
+
650
+
629
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
651
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
630
  #define DOGLCD
652
  #define DOGLCD
631
  #define U8GLIB_ST7920
653
  #define U8GLIB_ST7920

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

594
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
594
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
595
 //#define MAKRPANEL
595
 //#define MAKRPANEL
596
 
596
 
597
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
598
+// http://panucatt.com
599
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
600
+//#define VIKI2
601
+//#define miniVIKI
602
+
597
 // The RepRapDiscount Smart Controller (white PCB)
603
 // The RepRapDiscount Smart Controller (white PCB)
598
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
604
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
599
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
605
 #define REPRAP_DISCOUNT_SMART_CONTROLLER
627
  #define DEFAULT_LCD_CONTRAST 17
633
  #define DEFAULT_LCD_CONTRAST 17
628
 #endif
634
 #endif
629
 
635
 
636
+#if defined(miniVIKI) || defined(VIKI2)
637
+ #define ULTRA_LCD  //general LCD support, also 16x2
638
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
639
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
640
+ 
641
+  #ifdef miniVIKI
642
+   #define DEFAULT_LCD_CONTRAST 95
643
+  #else
644
+   #define DEFAULT_LCD_CONTRAST 40
645
+  #endif
646
+  
647
+ #define ENCODER_PULSES_PER_STEP 4
648
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
649
+#endif
650
+
651
+
630
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
652
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
631
  #define DOGLCD
653
  #define DOGLCD
632
  #define U8GLIB_ST7920
654
  #define U8GLIB_ST7920

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

498
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
498
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
499
 //#define MAKRPANEL
499
 //#define MAKRPANEL
500
 
500
 
501
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
502
+// http://panucatt.com
503
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
504
+//#define VIKI2
505
+//#define miniVIKI
506
+
501
 // The RepRapDiscount Smart Controller (white PCB)
507
 // The RepRapDiscount Smart Controller (white PCB)
502
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
508
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
503
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
509
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
538
  #define DEFAULT_LCD_CONTRAST 17
544
  #define DEFAULT_LCD_CONTRAST 17
539
 #endif
545
 #endif
540
 
546
 
547
+#if defined(miniVIKI) || defined(VIKI2)
548
+ #define ULTRA_LCD  //general LCD support, also 16x2
549
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
550
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
551
+ 
552
+  #ifdef miniVIKI
553
+   #define DEFAULT_LCD_CONTRAST 95
554
+  #else
555
+   #define DEFAULT_LCD_CONTRAST 40
556
+  #endif
557
+  
558
+ #define ENCODER_PULSES_PER_STEP 4
559
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
560
+#endif
561
+
562
+
541
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
563
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
542
  #define DOGLCD
564
  #define DOGLCD
543
  #define U8GLIB_ST7920
565
  #define U8GLIB_ST7920

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

568
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
568
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
569
 //#define MAKRPANEL
569
 //#define MAKRPANEL
570
 
570
 
571
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
572
+// http://panucatt.com
573
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
574
+//#define VIKI2
575
+//#define miniVIKI
576
+
571
 // The RepRapDiscount Smart Controller (white PCB)
577
 // The RepRapDiscount Smart Controller (white PCB)
572
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
578
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
573
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
579
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
601
  #define DEFAULT_LCD_CONTRAST 17
607
  #define DEFAULT_LCD_CONTRAST 17
602
 #endif
608
 #endif
603
 
609
 
610
+#if defined(miniVIKI) || defined(VIKI2)
611
+ #define ULTRA_LCD  //general LCD support, also 16x2
612
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
613
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
614
+ 
615
+  #ifdef miniVIKI
616
+   #define DEFAULT_LCD_CONTRAST 95
617
+  #else
618
+   #define DEFAULT_LCD_CONTRAST 40
619
+  #endif
620
+  
621
+ #define ENCODER_PULSES_PER_STEP 4
622
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
623
+#endif
624
+
625
+
604
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
626
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
605
  #define DOGLCD
627
  #define DOGLCD
606
  #define U8GLIB_ST7920
628
  #define U8GLIB_ST7920

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

581
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
581
 // http://reprap.org/wiki/MaKr3d_MaKrPanel
582
 //#define MAKRPANEL
582
 //#define MAKRPANEL
583
 
583
 
584
+// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
585
+// http://panucatt.com
586
+// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
587
+//#define VIKI2
588
+//#define miniVIKI
589
+
584
 // The RepRapDiscount Smart Controller (white PCB)
590
 // The RepRapDiscount Smart Controller (white PCB)
585
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
591
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
586
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
592
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
614
  #define DEFAULT_LCD_CONTRAST 17
620
  #define DEFAULT_LCD_CONTRAST 17
615
 #endif
621
 #endif
616
 
622
 
623
+#if defined(miniVIKI) || defined(VIKI2)
624
+ #define ULTRA_LCD  //general LCD support, also 16x2
625
+ #define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
626
+ #define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
627
+ 
628
+  #ifdef miniVIKI
629
+   #define DEFAULT_LCD_CONTRAST 95
630
+  #else
631
+   #define DEFAULT_LCD_CONTRAST 40
632
+  #endif
633
+  
634
+ #define ENCODER_PULSES_PER_STEP 4
635
+ #define ENCODER_STEPS_PER_MENU_ITEM 1
636
+#endif
637
+
638
+
617
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
639
 #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
618
  #define DOGLCD
640
  #define DOGLCD
619
  #define U8GLIB_ST7920
641
  #define U8GLIB_ST7920

Loading…
Cancel
Save