Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request MarlinFirmware#411 from STB3/Marlin_w_STB_Board_su…
…pport

Add STB board support to Marlin (next step towards graphic LCD implementation)
  • Loading branch information
daid committed Mar 18, 2013
2 parents 92782f9 + 140e095 commit d6ce63c
Show file tree
Hide file tree
Showing 3 changed files with 1,511 additions and 1,480 deletions.
27 changes: 19 additions & 8 deletions Marlin/Configuration.h
Expand Up @@ -34,6 +34,7 @@
// 6 = Sanguinololu < 1.2 // 6 = Sanguinololu < 1.2
// 62 = Sanguinololu 1.2 and above // 62 = Sanguinololu 1.2 and above
// 63 = Melzi // 63 = Melzi
// 64 = STB V1.1
// 7 = Ultimaker // 7 = Ultimaker
// 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare) // 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare)
// 8 = Teensylu // 8 = Teensylu
Expand Down Expand Up @@ -314,6 +315,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th


//LCD and SD support //LCD and SD support
//#define ULTRA_LCD //general lcd support, also 16x2 //#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 SDSUPPORT // Enable SD Card Support in Hardware Console


//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store. //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
Expand All @@ -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) // The RepRapDiscount Smart Controller (white PCB)
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
//#define REPRAP_DISCOUNT_SMART_CONTROLLER //#define REPRAP_DISCOUNT_SMART_CONTROLLER


// The GADGETS3D G3D LCD/SD Controller (blue PCB) // The GADGETS3D G3D LCD/SD Controller (blue PCB)
// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel // http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel
//#define G3D_PANEL //#define G3D_PANEL


//automatic expansion //automatic expansion
Expand All @@ -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 NEWPANEL //enable this if you have a click-encoder panel
#define SDSUPPORT #define SDSUPPORT
#define ULTRA_LCD #define ULTRA_LCD
#define LCD_WIDTH 20 #ifdef DOGLCD // Change number of lines to match the DOG graphic display
#define LCD_HEIGHT 4 #define LCD_WIDTH 20

#define LCD_HEIGHT 5
#else
#define LCD_WIDTH 20
#define LCD_HEIGHT 4
#endif
#else //no panel but just lcd #else //no panel but just lcd
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#define LCD_WIDTH 16 #ifdef DOGLCD // Change number of lines to match the 128x64 graphics display
#define LCD_HEIGHT 2 #define LCD_WIDTH 20
#define LCD_HEIGHT 5
#else
#define LCD_WIDTH 16
#define LCD_HEIGHT 2
#endif
#endif #endif
#endif #endif


Expand Down

0 comments on commit d6ce63c

Please sign in to comment.