|
@@ -66,7 +66,7 @@
|
66
|
66
|
#define Y_MAX_PIN 15 //10k pullup to 3.3V, 1K series
|
67
|
67
|
#define Z_MIN_PIN 18 //10k pullup to 3.3V, 1K series
|
68
|
68
|
#define Z_MAX_PIN 19 //10k pullup to 3.3V, 1K series
|
69
|
|
-//#define Z_probe_pin 1 // AUX-1
|
|
69
|
+//#define Z_PROBE_PIN 1 // AUX-1
|
70
|
70
|
|
71
|
71
|
|
72
|
72
|
//
|
|
@@ -267,23 +267,18 @@
|
267
|
267
|
//#define SHIFT_EN 41 // J5-4 & AUX-4
|
268
|
268
|
#endif
|
269
|
269
|
|
270
|
|
- #if ENABLED(SDSUPPORT)
|
271
|
|
- #define SDCARD_SORT_ALPHA // Using SORT feature to keep one directory level in RAM
|
272
|
|
- // When going up/down directory levels the SD card is
|
273
|
|
- // accessed but the garbage/lines are removed when the
|
274
|
|
- // LCD updates
|
275
|
|
-
|
276
|
|
- // SD Card Sorting options
|
277
|
|
- #if ENABLED(SDCARD_SORT_ALPHA)
|
278
|
|
- #define SDSORT_LIMIT 255 // Maximum number of sorted items (10-256). Costs 27 bytes each.
|
279
|
|
- #define FOLDER_SORTING -1 // -1=above 0=none 1=below
|
280
|
|
- #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
|
281
|
|
- #define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
|
282
|
|
- #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
|
283
|
|
- #define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.
|
284
|
|
- #define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
|
285
|
|
- #endif
|
286
|
|
- #endif
|
|
270
|
+ #define SDCARD_SORT_ALPHA // Using SORT feature to keep one directory level in RAM
|
|
271
|
+ // When going up/down directory levels the SD card is
|
|
272
|
+ // accessed but the garbage/lines are removed when the
|
|
273
|
+ // LCD updates
|
|
274
|
+
|
|
275
|
+ #define SDSORT_LIMIT 256 // Maximum number of sorted items (10-256). Costs 27 bytes each.
|
|
276
|
+ #define FOLDER_SORTING -1 // -1=above 0=none 1=below
|
|
277
|
+ #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code.
|
|
278
|
+ #define SDSORT_USES_RAM true // Pre-allocate a static array for faster pre-sorting.
|
|
279
|
+ #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
|
|
280
|
+ #define SDSORT_CACHE_NAMES true // Keep sorted items in RAM longer for speedy performance. Most expensive option.
|
|
281
|
+ #define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
|
287
|
282
|
|
288
|
283
|
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
|
289
|
284
|
// #define LCD_SCREEN_ROT_180
|
|
@@ -307,7 +302,7 @@
|
307
|
302
|
#undef LCD_PINS_D5 //59 // J3-8 & AUX-2
|
308
|
303
|
#define DOGLCD_A0 59 // J3-8 & AUX-2
|
309
|
304
|
#undef LCD_PINS_D6 //63 // J5-3 & AUX-2
|
310
|
|
- #undef LCD_PINS_D7 //6 // (SERVO1) J5-1 & SERVO connector
|
|
305
|
+ #undef LCD_PINS_D7 // 6 // (SERVO1) J5-1 & SERVO connector
|
311
|
306
|
#define DOGLCD_SCK SCK_PIN
|
312
|
307
|
#define DOGLCD_MOSI MOSI_PIN
|
313
|
308
|
|
|
@@ -335,17 +330,17 @@
|
335
|
330
|
// Ethernet pins
|
336
|
331
|
//
|
337
|
332
|
#ifndef ULTIPANEL
|
338
|
|
-#define ENET_MDIO 71 // J12-4
|
339
|
|
-#define ENET_RX_ER 73 // J12-6
|
340
|
|
-#define ENET_RXD1 75 // J12-8
|
|
333
|
+ #define ENET_MDIO 71 // J12-4
|
|
334
|
+ #define ENET_RX_ER 73 // J12-6
|
|
335
|
+ #define ENET_RXD1 75 // J12-8
|
341
|
336
|
#endif
|
342
|
|
-#define ENET_MOC 70 // J12-3
|
343
|
|
-#define REF_CLK 72 // J12-5
|
344
|
|
-#define ENET_RXD0 74 // J12-7
|
345
|
|
-#define ENET_CRS 76 // J12-9
|
346
|
|
-#define ENET_TX_EN 77 // J12-10
|
347
|
|
-#define ENET_TXD0 78 // J12-11
|
348
|
|
-#define ENET_TXD1 79 // J12-12
|
|
337
|
+#define ENET_MOC 70 // J12-3
|
|
338
|
+#define REF_CLK 72 // J12-5
|
|
339
|
+#define ENET_RXD0 74 // J12-7
|
|
340
|
+#define ENET_CRS 76 // J12-9
|
|
341
|
+#define ENET_TX_EN 77 // J12-10
|
|
342
|
+#define ENET_TXD0 78 // J12-11
|
|
343
|
+#define ENET_TXD1 79 // J12-12
|
349
|
344
|
|
350
|
345
|
/**
|
351
|
346
|
* PWMS
|