-disabled CARDDETECT if PIN is set to -1

- redo disable Beeper if PIN is set to -1

diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index 08ac950d38e1fc68a81470032126fd0e7b43a947..f89f3461368c234b18c57ac35ba549323028a8f4 100644 (file)
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -27,7 +27,11 @@
     
     #define CLICKED (buttons&EN_C)
     #define BLOCK {blocking=millis()+blocktime;}
-    #define CARDINSERTED (READ(SDCARDDETECT)==0)
+    #if (SDCARDDETECT > -1)
+    {
+      #define CARDINSERTED (READ(SDCARDDETECT)==0)
+    }
+    #endif
     
   #else
 

diff --git a/Marlin/ultralcd.pde b/Marlin/ultralcd.pde
index 720567f2ee30cd358646a3a02bf1fdeab5b07075..1c23383ed3c5db3626b5ec1ba51057d0f1a3cbf7 100644 (file)
--- a/Marlin/ultralcd.pde
+++ b/Marlin/ultralcd.pde
@@ -130,7 +130,7 @@ void beep()
 {
   //return;
   #ifdef ULTIPANEL
-       if (BEEPER > -1)
+       #if (BEEPER > -1)
        {
                pinMode(BEEPER,OUTPUT);
                for(int8_t i=0;i<20;i++){
@@ -140,6 +140,7 @@ void beep()
                delay(5);
                }
        }
+        #endif
   #endif
 }
 
@@ -147,7 +148,7 @@ void beepshort()
 {
   //return;
   #ifdef ULTIPANEL
-       if (BEEPER > -1)
+       #if (BEEPER > -1)
        {
                pinMode(BEEPER,OUTPUT);
                for(int8_t i=0;i<10;i++){
@@ -157,6 +158,7 @@ void beepshort()
                delay(3);
                }
        }
+        #endif
   #endif  
 }
 
@@ -203,7 +205,11 @@ void buttons_init()
     WRITE(BTN_EN1,HIGH);
     WRITE(BTN_EN2,HIGH);
     WRITE(BTN_ENC,HIGH);
-    WRITE(SDCARDDETECT,HIGH);
+    #if (SDCARDDETECT > -1)
+    {
+      WRITE(SDCARDDETECT,HIGH);
+    }
+    #endif
   #else
     pinMode(SHIFT_CLK,OUTPUT);
     pinMode(SHIFT_LD,OUTPUT);