Skip to content
Browse files

Merge pull request #411 from STB3/Marlin_w_STB_Board_support

Add STB board support to Marlin (next step towards graphic LCD implementation)
  • Loading branch information...
2 parents 92782f9 + 140e095 commit d6ce63c49c0f9d5bd5e3ee59e85a793fdb46721f @daid daid committed Mar 18, 2013
Showing with 1,511 additions and 1,480 deletions.
  1. +19 −8 Marlin/Configuration.h
  2. +1,465 −1,464 Marlin/language.h
  3. +27 −8 Marlin/pins.h
View
27 Marlin/Configuration.h
@@ -34,6 +34,7 @@
// 6 = Sanguinololu < 1.2
// 62 = Sanguinololu 1.2 and above
// 63 = Melzi
+// 64 = STB V1.1
// 7 = Ultimaker
// 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare)
// 8 = Teensylu
@@ -314,6 +315,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
//LCD and SD support
//#define ULTRA_LCD //general lcd support, also 16x2
+//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
//#define SDSUPPORT // Enable SD Card Support in Hardware Console
//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
@@ -322,9 +324,9 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
// The RepRapDiscount Smart Controller (white PCB)
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
//#define REPRAP_DISCOUNT_SMART_CONTROLLER
-
-// The GADGETS3D G3D LCD/SD Controller (blue PCB)
-// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
+
+// The GADGETS3D G3D LCD/SD Controller (blue PCB)
+// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
//#define G3D_PANEL
//automatic expansion
@@ -347,13 +349,22 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
// #define NEWPANEL //enable this if you have a click-encoder panel
#define SDSUPPORT
#define ULTRA_LCD
- #define LCD_WIDTH 20
- #define LCD_HEIGHT 4
-
+ #ifdef DOGLCD // Change number of lines to match the DOG graphic display
+ #define LCD_WIDTH 20
+ #define LCD_HEIGHT 5
+ #else
+ #define LCD_WIDTH 20
+ #define LCD_HEIGHT 4
+ #endif
#else //no panel but just lcd
#ifdef ULTRA_LCD
- #define LCD_WIDTH 16
- #define LCD_HEIGHT 2
+ #ifdef DOGLCD // Change number of lines to match the 128x64 graphics display
+ #define LCD_WIDTH 20
+ #define LCD_HEIGHT 5
+ #else
+ #define LCD_WIDTH 16
+ #define LCD_HEIGHT 2
+ #endif
#endif
#endif
View
2,929 Marlin/language.h
1,465 additions, 1,464 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
35 Marlin/pins.h
@@ -644,10 +644,13 @@
* Sanguinololu pin assignment
*
****************************************************************************************/
+#if MOTHERBOARD == 64
+#define STB
+#endif
#if MOTHERBOARD == 63
#define MELZI
#endif
-#if MOTHERBOARD == 62 || MOTHERBOARD == 63
+#if MOTHERBOARD == 62 || MOTHERBOARD == 63 || MOTHERBOARD == 64
#undef MOTHERBOARD
#define MOTHERBOARD 6
#define SANGUINOLOLU_V_1_2
@@ -687,6 +690,10 @@
#define FAN_PIN 4
#endif
+#ifdef STB
+#define FAN_PIN 4
+#endif
+
#define PS_ON_PIN -1
#define KILL_PIN -1
@@ -727,13 +734,25 @@
//we have no buzzer installed
#define BEEPER -1
//LCD Pins
- #define LCD_PINS_RS 4
- #define LCD_PINS_ENABLE 17
- #define LCD_PINS_D4 30
- #define LCD_PINS_D5 29
- #define LCD_PINS_D6 28
- #define LCD_PINS_D7 27
-
+ #ifdef DOGLCD
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_A0 30
+ #define DOGLCD_CS 29
+ // GLCD features
+ #define LCD_CONTRAST 1
+ // Uncomment screen orientation
+ // #define LCD_SCREEN_ROT_0
+ // #define LCD_SCREEN_ROT_90
+ #define LCD_SCREEN_ROT_180
+ // #define LCD_SCREEN_ROT_270
+ #else // standard Hitachi LCD controller
+ #define LCD_PINS_RS 4
+ #define LCD_PINS_ENABLE 17
+ #define LCD_PINS_D4 30
+ #define LCD_PINS_D5 29
+ #define LCD_PINS_D6 28
+ #define LCD_PINS_D7 27
+ #endif
//The encoder and click button
#define BTN_EN1 11 //must be a hardware interrupt pin
#define BTN_EN2 10 //must be hardware interrupt pin

0 comments on commit d6ce63c

Please sign in to comment.
Something went wrong with that request. Please try again.