Browse Source

Small fixes after merge

Erik van der Zalm 13 years ago
parent
commit
8816ef1c64
3 changed files with 12 additions and 18 deletions
  1. 0
    7
      Marlin/Configuration.h
  2. 6
    0
      Marlin/Configuration_adv.h
  3. 6
    11
      Marlin/ultralcd.h

+ 0
- 7
Marlin/Configuration.h View File

@@ -183,13 +183,6 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
183 183
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
184 184
 
185 185
 //#define ULTIPANEL
186
-// If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
187
-// You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT 
188
-// in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
189
-// be commented out otherwise
190
-#define SDCARDDETECTINVERTED 
191
-
192
-#define ULTIPANEL
193 186
 #ifdef ULTIPANEL
194 187
   #define NEWPANEL  //enable this if you have a click-encoder panel
195 188
   #define SDSUPPORT

+ 6
- 0
Marlin/Configuration_adv.h View File

@@ -148,6 +148,12 @@
148 148
 
149 149
 const int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
150 150
 
151
+// If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
152
+// You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT 
153
+// in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
154
+// be commented out otherwise
155
+//#define SDCARDDETECTINVERTED 
156
+
151 157
 //===========================================================================
152 158
 //=============================Buffers           ============================
153 159
 //===========================================================================

+ 6
- 11
Marlin/ultralcd.h View File

@@ -28,17 +28,12 @@
28 28
     #define CLICKED (buttons&EN_C)
29 29
     #define BLOCK {blocking=millis()+blocktime;}
30 30
     #if (SDCARDDETECT > -1)
31
-    {
32
-
33
-	#ifdef SDCARDDETECTINVERTED 
34
-		#define CARDINSERTED (READ(SDCARDDETECT)!=0)
35
-
36
-	#else
37
-		#define CARDINSERTED (READ(SDCARDDETECT)==0)
38
-    }
39
-    #endif
40
-
41
-	#endif  //SDCARDTETECTINVERTED
31
+      #ifdef SDCARDDETECTINVERTED 
32
+        #define CARDINSERTED (READ(SDCARDDETECT)!=0)
33
+      #else
34
+        #define CARDINSERTED (READ(SDCARDDETECT)==0)
35
+      #endif
36
+    #endif  //SDCARDTETECTINVERTED
42 37
 
43 38
   #else
44 39
 

Loading…
Cancel
Save