SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Change pinMode to SET_INPUT or SET_OUTPUT"

Browse source 
This reverts commit 1d0fe035f3.
This commit is contained in:
Filip Mulier 2014-08-16 13:26:48 -05:00
parent e3c88a5120
commit 75b3a68b65
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Marlin/ultralcd.cpp
View file

@ -1133,30 +1133,30 @@ void lcd_init()
lcd_implementation_init(); lcd_implementation_init();
#ifdef NEWPANEL #ifdef NEWPANEL
SET_INPUT(BTN_EN1); pinMode(BTN_EN1,INPUT);
SET_INPUT(BTN_EN2); pinMode(BTN_EN2,INPUT);
WRITE(BTN_EN1,HIGH); WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH); WRITE(BTN_EN2,HIGH);
#if BTN_ENC > 0 #if BTN_ENC > 0
SET_INPUT(BTN_ENC); pinMode(BTN_ENC,INPUT);
WRITE(BTN_ENC,HIGH); WRITE(BTN_ENC,HIGH);
#endif #endif
#ifdef REPRAPWORLD_KEYPAD #ifdef REPRAPWORLD_KEYPAD
SET_OUTPUT(SHIFT_CLK); pinMode(SHIFT_CLK,OUTPUT);
SET_OUTPUT(SHIFT_LD); pinMode(SHIFT_LD,OUTPUT);
SET_INPUT(SHIFT_OUT); pinMode(SHIFT_OUT,INPUT);
WRITE(SHIFT_OUT,HIGH); WRITE(SHIFT_OUT,HIGH);
WRITE(SHIFT_LD,HIGH); WRITE(SHIFT_LD,HIGH);
#endif #endif
#else // Not NEWPANEL #else // Not NEWPANEL
#ifdef SR_LCD_2W_NL // Non latching 2 wire shift register #ifdef SR_LCD_2W_NL // Non latching 2 wire shift register
SET_OUTPUT(SR_DATA_PIN); pinMode (SR_DATA_PIN, OUTPUT);
SET_OUTPUT(SR_CLK_PIN); pinMode (SR_CLK_PIN, OUTPUT);
#elif defined(SHIFT_CLK) #elif defined(SHIFT_CLK)
SET_OUTPUT(SHIFT_CLK); pinMode(SHIFT_CLK,OUTPUT);
SET_OUTPUT(SHIFT_LD); pinMode(SHIFT_LD,OUTPUT);
SET_OUTPUT(SHIFT_EN); pinMode(SHIFT_EN,OUTPUT);
SET_INPUT(SHIFT_OUT); pinMode(SHIFT_OUT,INPUT);
WRITE(SHIFT_OUT,HIGH); WRITE(SHIFT_OUT,HIGH);
WRITE(SHIFT_LD,HIGH); WRITE(SHIFT_LD,HIGH);
WRITE(SHIFT_EN,LOW); WRITE(SHIFT_EN,LOW);
@ -1168,7 +1168,7 @@ void lcd_init()
#endif//!NEWPANEL #endif//!NEWPANEL
#if defined (SDSUPPORT) && defined(SDCARDDETECT) && (SDCARDDETECT > 0) #if defined (SDSUPPORT) && defined(SDCARDDETECT) && (SDCARDDETECT > 0)
SET_INPUT(SDCARDDETECT); pinMode(SDCARDDETECT,INPUT);
WRITE(SDCARDDETECT, HIGH); WRITE(SDCARDDETECT, HIGH);
lcd_oldcardstatus = IS_SD_INSERTED; lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > 0) #endif//(SDCARDDETECT > 0)