Browse Source

Merge pull request #411 from STB3/Marlin_w_STB_Board_support

Add STB board support to Marlin (next step towards graphic LCD implementation)
daid 12 years ago
parent
commit
d6ce63c49c
3 changed files with 1511 additions and 1480 deletions
  1. 19
    8
      Marlin/Configuration.h
  2. 1465
    1464
      Marlin/language.h
  3. 27
    8
      Marlin/pins.h

+ 19
- 8
Marlin/Configuration.h View File

34
 // 6  = Sanguinololu < 1.2
34
 // 6  = Sanguinololu < 1.2
35
 // 62 = Sanguinololu 1.2 and above
35
 // 62 = Sanguinololu 1.2 and above
36
 // 63 = Melzi
36
 // 63 = Melzi
37
+// 64 = STB V1.1
37
 // 7  = Ultimaker
38
 // 7  = Ultimaker
38
 // 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare)
39
 // 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare)
39
 // 8  = Teensylu
40
 // 8  = Teensylu
314
 
315
 
315
 //LCD and SD support
316
 //LCD and SD support
316
 //#define ULTRA_LCD  //general lcd support, also 16x2
317
 //#define ULTRA_LCD  //general lcd support, also 16x2
318
+//#define DOGLCD	// Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
317
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
319
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
318
 
320
 
319
 //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
321
 //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
322
 // The RepRapDiscount Smart Controller (white PCB)
324
 // The RepRapDiscount Smart Controller (white PCB)
323
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
325
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
324
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
326
 //#define REPRAP_DISCOUNT_SMART_CONTROLLER
325
-
326
-// The GADGETS3D G3D LCD/SD Controller (blue PCB)
327
-// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
327
+
328
+// The GADGETS3D G3D LCD/SD Controller (blue PCB)
329
+// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
328
 //#define G3D_PANEL
330
 //#define G3D_PANEL
329
 
331
 
330
 //automatic expansion
332
 //automatic expansion
347
 //  #define NEWPANEL  //enable this if you have a click-encoder panel
349
 //  #define NEWPANEL  //enable this if you have a click-encoder panel
348
   #define SDSUPPORT
350
   #define SDSUPPORT
349
   #define ULTRA_LCD
351
   #define ULTRA_LCD
350
-  #define LCD_WIDTH 20
351
-  #define LCD_HEIGHT 4
352
-  
352
+	#ifdef DOGLCD	// Change number of lines to match the DOG graphic display
353
+		#define LCD_WIDTH 20
354
+		#define LCD_HEIGHT 5
355
+	#else
356
+		#define LCD_WIDTH 20
357
+		#define LCD_HEIGHT 4
358
+	#endif
353
 #else //no panel but just lcd 
359
 #else //no panel but just lcd 
354
   #ifdef ULTRA_LCD
360
   #ifdef ULTRA_LCD
355
-    #define LCD_WIDTH 16
356
-    #define LCD_HEIGHT 2    
361
+	#ifdef DOGLCD	// Change number of lines to match the 128x64 graphics display
362
+		#define LCD_WIDTH 20
363
+		#define LCD_HEIGHT 5
364
+	#else
365
+		#define LCD_WIDTH 16
366
+		#define LCD_HEIGHT 2
367
+	#endif    
357
   #endif
368
   #endif
358
 #endif
369
 #endif
359
 
370
 

+ 1465
- 1464
Marlin/language.h
File diff suppressed because it is too large
View File


+ 27
- 8
Marlin/pins.h View File

644
 * Sanguinololu pin assignment
644
 * Sanguinololu pin assignment
645
 *
645
 *
646
 ****************************************************************************************/
646
 ****************************************************************************************/
647
+#if MOTHERBOARD == 64
648
+#define STB
649
+#endif
647
 #if MOTHERBOARD == 63
650
 #if MOTHERBOARD == 63
648
 #define MELZI
651
 #define MELZI
649
 #endif
652
 #endif
650
-#if MOTHERBOARD == 62 || MOTHERBOARD == 63
653
+#if MOTHERBOARD == 62 || MOTHERBOARD == 63 || MOTHERBOARD == 64
651
 #undef MOTHERBOARD
654
 #undef MOTHERBOARD
652
 #define MOTHERBOARD 6
655
 #define MOTHERBOARD 6
653
 #define SANGUINOLOLU_V_1_2 
656
 #define SANGUINOLOLU_V_1_2 
687
 #define FAN_PIN            4
690
 #define FAN_PIN            4
688
 #endif
691
 #endif
689
 
692
 
693
+#ifdef STB
694
+#define FAN_PIN            4
695
+#endif
696
+
690
 #define PS_ON_PIN          -1
697
 #define PS_ON_PIN          -1
691
 #define KILL_PIN           -1
698
 #define KILL_PIN           -1
692
 
699
 
727
      //we have no buzzer installed
734
      //we have no buzzer installed
728
      #define BEEPER -1
735
      #define BEEPER -1
729
      //LCD Pins
736
      //LCD Pins
730
-     #define LCD_PINS_RS        4
731
-     #define LCD_PINS_ENABLE    17
732
-     #define LCD_PINS_D4        30
733
-     #define LCD_PINS_D5        29
734
-     #define LCD_PINS_D6        28
735
-     #define LCD_PINS_D7        27
736
-     
737
+	 	 #ifdef DOGLCD
738
+			 // Pins for DOGM SPI LCD Support
739
+			 #define DOGLCD_A0	30
740
+			 #define DOGLCD_CS	29
741
+			 // GLCD features
742
+			 #define LCD_CONTRAST 1
743
+			 // Uncomment screen orientation
744
+		     // #define LCD_SCREEN_ROT_0
745
+		     // #define LCD_SCREEN_ROT_90
746
+			 #define LCD_SCREEN_ROT_180
747
+		     // #define LCD_SCREEN_ROT_270
748
+			 #else // standard Hitachi LCD controller
749
+			 #define LCD_PINS_RS        4
750
+			 #define LCD_PINS_ENABLE    17
751
+			 #define LCD_PINS_D4        30
752
+			 #define LCD_PINS_D5        29
753
+			 #define LCD_PINS_D6        28
754
+			 #define LCD_PINS_D7        27
755
+         #endif
737
      //The encoder and click button
756
      //The encoder and click button
738
      #define BTN_EN1 11  //must be a hardware interrupt pin
757
      #define BTN_EN1 11  //must be a hardware interrupt pin
739
      #define BTN_EN2 10 //must be hardware interrupt pin
758
      #define BTN_EN2 10 //must be hardware interrupt pin

Loading…
Cancel
Save