Skip to content

Commit

Permalink
Merge pull request MarlinFirmware#721 from drf5n/lcdOnly
Browse files Browse the repository at this point in the history
Enable basic ULTRA_LCD screen w/o encoders and menus.
  • Loading branch information
ErikZalm committed Jan 31, 2014
2 parents 4c7e950 + 61a7256 commit 84df13f
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions Marlin/ultralcd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -989,7 +989,6 @@ void lcd_init()
#ifdef NEWPANEL
pinMode(BTN_EN1,INPUT);
pinMode(BTN_EN2,INPUT);
pinMode(SDCARDDETECT,INPUT);
WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH);
#if BTN_ENC > 0
Expand All @@ -1003,28 +1002,33 @@ void lcd_init()
WRITE(SHIFT_OUT,HIGH);
WRITE(SHIFT_LD,HIGH);
#endif
#else
#ifdef SR_LCD_2W_NL
#else // Not NEWPANEL
#ifdef SR_LCD_2W_NL // Non latching 2 wire shiftregister
pinMode (SR_DATA_PIN, OUTPUT);
pinMode (SR_CLK_PIN, OUTPUT);
#else
#elif defined(SHIFT_CLK)
pinMode(SHIFT_CLK,OUTPUT);
pinMode(SHIFT_LD,OUTPUT);
pinMode(SHIFT_EN,OUTPUT);
pinMode(SHIFT_OUT,INPUT);
WRITE(SHIFT_OUT,HIGH);
WRITE(SHIFT_LD,HIGH);
WRITE(SHIFT_EN,LOW);
#endif // SR_LCD_2W_NL
#else
#ifdef ULTIPANEL
#error ULTIPANEL requires an encoder
#endif
#endif // SR_LCD_2W_NL
#endif//!NEWPANEL

#if (SDCARDDETECT > 0)
#if defined (SDSUPPORT) && defined(SDCARDDETECT) && (SDCARDDETECT > 0)
pinMode(SDCARDDETECT,INPUT);
WRITE(SDCARDDETECT, HIGH);
lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > 0)
#ifdef LCD_HAS_SLOW_BUTTONS
#ifdef LCD_HAS_SLOW_BUTTONS
slow_buttons = 0;
#endif
#endif
lcd_buttons_update();
#ifdef ULTIPANEL
encoderDiff = 0;
Expand Down

0 comments on commit 84df13f

Please sign in to comment.