Browse Source

Apply items specified in code review

Followup to #8122
Scott Lahteine 7 years ago
parent
commit
2cdde08339

+ 16
- 0
Marlin/src/inc/Conditionals_post.h View File

@@ -1162,4 +1162,20 @@
1162 1162
   #define NOT_A_PIN 0 // For PINS_DEBUGGING
1163 1163
 #endif
1164 1164
 
1165
+// Force SDCARD_SORT_ALPHA to be enabled for Graphical LCD on LPC1768
1166
+// because of a bug in the shared SPI implementation. (See #8122)
1167
+#if defined(TARGET_LPC1768) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
1168
+  #define SDCARD_SORT_ALPHA         // Keeps one directory level in RAM. Changing
1169
+                                    // directory levels still glitches the screen,
1170
+                                    // but the following LCD update cleans it up.
1171
+  #undef SDSORT_LIMIT
1172
+  #undef SDSORT_USES_RAM
1173
+  #undef SDSORT_USES_STACK
1174
+  #undef SDSORT_CACHE_NAMES
1175
+  #define SDSORT_LIMIT       256    // Maximum number of sorted items (10-256). Costs 27 bytes each.
1176
+  #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
1177
+  #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
1178
+  #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
1179
+#endif
1180
+
1165 1181
 #endif // CONDITIONALS_POST_H

+ 2
- 3
Marlin/src/lcd/ultralcd.cpp View File

@@ -3775,9 +3775,8 @@ void kill_screen(const char* lcd_msg) {
3775 3775
     void lcd_sdcard_menu() {
3776 3776
       ENCODER_DIRECTION_MENUS();
3777 3777
 
3778
-      const uint16_t fileCnt = card.get_num_Files();  // Only access SD card if sort not active
3779
-                                                      // This minimizes garbage on RepRap Discount Full Graphics Smart Controller
3780
-                                                      // when using the Re-ARM card.
3778
+      const uint16_t fileCnt = card.get_num_Files();
3779
+
3781 3780
       START_MENU();
3782 3781
       MENU_BACK(MSG_MAIN);
3783 3782
       card.getWorkDirName();

+ 0
- 19
Marlin/src/pins/pins_AZSMZ_MINI.h View File

@@ -112,25 +112,6 @@
112 112
 #define ENET_TXD0          P1_0
113 113
 #define ENET_TXD1          P1_1
114 114
 
115
-
116
-#if (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && !defined(SDCARD_SORT_ALPHA)) // needed because of shared SPI
117
-  #define SDCARD_SORT_ALPHA         // Using SORT feature to keep one directory level in RAM
118
-                                    // When going up/down directory levels the SD card is
119
-                                    // accessed but the garbage/lines are removed when the
120
-                                    // LCD updates
121
-
122
-  #define SDSORT_LIMIT       256    // Maximum number of sorted items (10-256). Costs 27 bytes each.
123
-  #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
124
-  #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
125
-  #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
126
-  #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
127
-  #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
128
-  #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
129
-  #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
130
-                                    // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
131
-  #define MAX_VFAT_ENTRIES SDSORT_CACHE_VFATS
132
-#endif
133
-
134 115
 /**
135 116
  *  PWMs
136 117
  *

+ 0
- 19
Marlin/src/pins/pins_MKS_SBASE.h View File

@@ -174,25 +174,6 @@
174 174
 #define ENET_TXD0          P1_0   // J12-11
175 175
 #define ENET_TXD1          P1_1   // J12-12
176 176
 
177
-
178
-#if (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && !defined(SDCARD_SORT_ALPHA)) // needed because of shared SPI
179
-  #define SDCARD_SORT_ALPHA         // Using SORT feature to keep one directory level in RAM
180
-                                    // When going up/down directory levels the SD card is
181
-                                    // accessed but the garbage/lines are removed when the
182
-                                    // LCD updates
183
-
184
-  #define SDSORT_LIMIT       256    // Maximum number of sorted items (10-256). Costs 27 bytes each.
185
-  #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
186
-  #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
187
-  #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
188
-  #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
189
-  #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
190
-  #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
191
-  #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
192
-                                    // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
193
-  #define MAX_VFAT_ENTRIES SDSORT_CACHE_VFATS
194
-#endif
195
-
196 177
 /**
197 178
  *  PWMs
198 179
  *

+ 0
- 18
Marlin/src/pins/pins_RAMPS_RE_ARM.h View File

@@ -259,24 +259,6 @@
259 259
     //#define SHIFT_EN            P1_22  // J5-4 & AUX-4
260 260
   #endif
261 261
 
262
-  #if (ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && !defined(SDCARD_SORT_ALPHA)) // needed because of shared SPI
263
-    #define SDCARD_SORT_ALPHA         // Using SORT feature to keep one directory level in RAM
264
-                                      // When going up/down directory levels the SD card is
265
-                                      // accessed but the garbage/lines are removed when the
266
-                                      // LCD updates
267
-
268
-    #define SDSORT_LIMIT       256    // Maximum number of sorted items (10-256). Costs 27 bytes each.
269
-    #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
270
-    #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
271
-    #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
272
-    #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
273
-    #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
274
-    #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
275
-    #define SDSORT_CACHE_VFATS 2      // Maximum number of 13-byte VFAT entries to use for sorting.
276
-                                      // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM.
277
-    #define MAX_VFAT_ENTRIES SDSORT_CACHE_VFATS
278
-  #endif
279
-
280 262
   #if ENABLED(VIKI2) || ENABLED(miniVIKI)
281 263
     // #define LCD_SCREEN_ROT_180
282 264
 

+ 1
- 3
Marlin/src/sd/SdFatConfig.h View File

@@ -134,9 +134,7 @@
134 134
 #define FILENAME_LENGTH 13 // Number of UTF-16 characters per entry
135 135
 
136 136
 // Number of VFAT entries used. Each entry has 13 UTF-16 characters
137
-#ifdef MAX_VFAT_ENTRIES
138
-  #undef MAX_VFAT_ENTRIES
139
-#endif  
137
+#undef MAX_VFAT_ENTRIES
140 138
 #if ENABLED(SCROLL_LONG_FILENAMES)
141 139
   #define MAX_VFAT_ENTRIES (5)
142 140
 #else

Loading…
Cancel
Save