Browse Source

Other small tweaks

Scott Lahteine 10 years ago
parent
commit
1857e611d3
2 changed files with 5 additions and 5 deletions
  1. 4
    4
      Marlin/cardreader.cpp
  2. 1
    1
      Marlin/ultralcd.cpp

+ 4
- 4
Marlin/cardreader.cpp View File

@@ -91,10 +91,10 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m
91 91
     {
92 92
       char pn0 = p.name[0];
93 93
       if (pn0 == DIR_NAME_FREE) break;
94
-      if (pn0 == DIR_NAME_DELETED || pn0 == '.'|| pn0 == '_') continue;
95
-      if (longFilename[0] != '\0' &&
96
-          (longFilename[0] == '.' || longFilename[0] == '_')) continue;
97
-      
94
+      if (pn0 == DIR_NAME_DELETED || pn0 == '.' || pn0 == '_') continue;
95
+      char lf0 = longFilename[0];
96
+      if (lf0 == '.' || lf0 == '_') continue;
97
+
98 98
       if (!DIR_IS_FILE_OR_SUBDIR(&p)) continue;
99 99
       filenameIsDir=DIR_IS_SUBDIR(&p);
100 100
 

+ 1
- 1
Marlin/ultralcd.cpp View File

@@ -261,7 +261,7 @@ static void lcd_status_screen()
261 261
 
262 262
     if (feedmultiply < 10)
263 263
         feedmultiply = 10;
264
-    if (feedmultiply > 999)
264
+    else if (feedmultiply > 999)
265 265
         feedmultiply = 999;
266 266
 #endif//ULTIPANEL
267 267
 }

Loading…
Cancel
Save