ultralcd: Use SET_{OUTPUT|INPUT}() instead of pinMode() to set pin di…

…rection
MarlinFirmware · Jan 19, 2014 · cc41b44 · cc41b44
1 parent 875a39c
commit cc41b44
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
@@ -987,34 +987,36 @@ void lcd_init()
     lcd_implementation_init();
 
 #ifdef NEWPANEL
-    pinMode(BTN_EN1,INPUT);
-    pinMode(BTN_EN2,INPUT);
-    pinMode(SDCARDDETECT,INPUT);
+    SET_INPUT(BTN_EN1);
+    SET_INPUT(BTN_EN2);
+#if (SDCARDDETECT != -1)
+    SET_INPUT(SDCARDDETECT);
+#endif
     WRITE(BTN_EN1,HIGH);
     WRITE(BTN_EN2,HIGH);
   #if BTN_ENC > 0
-    pinMode(BTN_ENC,INPUT);
+    SET_INPUT(BTN_ENC);
     WRITE(BTN_ENC,HIGH);
   #endif
   #ifdef REPRAPWORLD_KEYPAD
-    pinMode(SHIFT_CLK,OUTPUT);
-    pinMode(SHIFT_LD,OUTPUT);
-    pinMode(SHIFT_OUT,INPUT);
+    SET_OUTPUT(SHIFT_CLK);
+    SET_OUTPUT(SHIFT_LD);
+    SET_INPUT(SHIFT_OUT);
     WRITE(SHIFT_OUT,HIGH);
     WRITE(SHIFT_LD,HIGH);
   #endif
 #else
   #ifdef SR_LCD_2W_NL
-     pinMode (SR_DATA_PIN, OUTPUT);
-     pinMode (SR_CLK_PIN, OUTPUT);
+     SET_OUTPUT(SR_DATA_PIN);
+     SET_OUTPUT(SR_CLK_PIN);
   #else
-     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);
+    SET_OUTPUT(SHIFT_CLK);
+    SET_OUTPUT(SHIFT_LD);
+    SET_OUTPUT(SHIFT_EN);
+    SET_INPUT(SHIFT_OUT);
+    WRITE(SHIFT_OUT,HIGH);
+    WRITE(SHIFT_LD,HIGH); 
+    WRITE(SHIFT_EN,LOW);
    #endif // SR_LCD_2W_NL
 #endif//!NEWPANEL