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

Change pinMode to SET_INPUT or SET_OUTPUT

Browse source 
Original code is using WRITE from fastio, but original used pinMode to
set pin direction and did not use the fastio SET_INPUT or SET_OUTPUT.
This caused an issue with the rotary encoder interface to  boards based
on teensyduino, since for teensyduino pin numbers for fastio and the
usual Arduino IO are different.
This commit is contained in:
Filip Mulier 2014-08-04 21:44:04 -05:00
parent c13a831ea1
commit 1d0fe035f3
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
pinMode(BTN_EN1,INPUT); SET_INPUT(BTN_EN1);
pinMode(BTN_EN2,INPUT); SET_INPUT(BTN_EN2);
WRITE(BTN_EN1,HIGH); WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH); WRITE(BTN_EN2,HIGH);
#if BTN_ENC > 0 #if BTN_ENC > 0
pinMode(BTN_ENC,INPUT); SET_INPUT(BTN_ENC);
WRITE(BTN_ENC,HIGH); WRITE(BTN_ENC,HIGH);
#endif #endif
#ifdef REPRAPWORLD_KEYPAD #ifdef REPRAPWORLD_KEYPAD
pinMode(SHIFT_CLK,OUTPUT); SET_OUTPUT(SHIFT_CLK);
pinMode(SHIFT_LD,OUTPUT); SET_OUTPUT(SHIFT_LD);
pinMode(SHIFT_OUT,INPUT); SET_INPUT(SHIFT_OUT);
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
pinMode (SR_DATA_PIN, OUTPUT); SET_OUTPUT(SR_DATA_PIN);
pinMode (SR_CLK_PIN, OUTPUT); SET_OUTPUT(SR_CLK_PIN);
#elif defined(SHIFT_CLK) #elif defined(SHIFT_CLK)
pinMode(SHIFT_CLK,OUTPUT); SET_OUTPUT(SHIFT_CLK);
pinMode(SHIFT_LD,OUTPUT); SET_OUTPUT(SHIFT_LD);
pinMode(SHIFT_EN,OUTPUT); SET_OUTPUT(SHIFT_EN);
pinMode(SHIFT_OUT,INPUT); SET_INPUT(SHIFT_OUT);
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)
pinMode(SDCARDDETECT,INPUT); SET_INPUT(SDCARDDETECT);
WRITE(SDCARDDETECT, HIGH); WRITE(SDCARDDETECT, HIGH);
lcd_oldcardstatus = IS_SD_INSERTED; lcd_oldcardstatus = IS_SD_INSERTED;
#endif//(SDCARDDETECT > 0) #endif//(SDCARDDETECT > 0)