merged SBUBA82 and Justblair

2012-02-21 20:26:59 +01:00
parent 2cc9a89830 b976692d0f
commit d298dd121f
15 changed files with 1520 additions and 75 deletions
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@ -29,10 +29,17 @@
    #define BLOCK {blocking=millis()+blocktime;}
    #if (SDCARDDETECT > -1)
    {
-      #define CARDINSERTED (READ(SDCARDDETECT)==0)
+
+	#ifdef SDCARDDETECTINVERTED 
+		#define CARDINSERTED (READ(SDCARDDETECT)!=0)
+
+	#else
+		#define CARDINSERTED (READ(SDCARDDETECT)==0)
    }
    #endif
-    
+
+	#endif  //SDCARDTETECTINVERTED
+
  #else

    //atomatic, do not change