Explorar el Código

Modernize configs

Scott Lahteine hace 7 años
padre
commit
09fa34a9e1

+ 1
- 1
Marlin/src/config/examples/Anet/A6/Configuration_adv.h Ver fichero

@@ -601,7 +601,7 @@
601 601
  */
602 602
 //#define BABYSTEPPING
603 603
 #if ENABLED(BABYSTEPPING)
604
-  //#define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
+  //#define BABYSTEP_XY            // Also enable X/Y Babystepping. Not supported on DELTA!
605 605
   #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
606 606
   #define BABYSTEP_MULTIPLICATOR 100 // Babysteps are very small. Increase for faster motion.
607 607
   //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping

+ 1
- 11
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h Ver fichero

@@ -1106,57 +1106,46 @@
1106 1106
   //#define E4_IS_L6470
1107 1107
 
1108 1108
   #define X_MICROSTEPS      16 // number of microsteps
1109
-  #define X_K_VAL           50 // 0 - 255, Higher values, are higher power. Be careful not to go too high
1110 1109
   #define X_OVERCURRENT   2000 // maxc current in mA. If the current goes over this value, the driver will switch off
1111 1110
   #define X_STALLCURRENT  1500 // current in mA where the driver will detect a stall
1112 1111
 
1113 1112
   #define X2_MICROSTEPS     16
1114
-  #define X2_K_VAL          50
1115 1113
   #define X2_OVERCURRENT  2000
1116 1114
   #define X2_STALLCURRENT 1500
1117 1115
 
1118 1116
   #define Y_MICROSTEPS      16
1119
-  #define Y_K_VAL           50
1120 1117
   #define Y_OVERCURRENT   2000
1121 1118
   #define Y_STALLCURRENT  1500
1122 1119
 
1123 1120
   #define Y2_MICROSTEPS     16
1124
-  #define Y2_K_VAL          50
1125 1121
   #define Y2_OVERCURRENT  2000
1126 1122
   #define Y2_STALLCURRENT 1500
1127 1123
 
1128 1124
   #define Z_MICROSTEPS      16
1129
-  #define Z_K_VAL           50
1130 1125
   #define Z_OVERCURRENT   2000
1131 1126
   #define Z_STALLCURRENT  1500
1132 1127
 
1133 1128
   #define Z2_MICROSTEPS     16
1134
-  #define Z2_K_VAL          50
1135 1129
   #define Z2_OVERCURRENT  2000
1136 1130
   #define Z2_STALLCURRENT 1500
1137 1131
 
1138 1132
   #define E0_MICROSTEPS     16
1139
-  #define E0_K_VAL          50
1140 1133
   #define E0_OVERCURRENT  2000
1141 1134
   #define E0_STALLCURRENT 1500
1142 1135
 
1143 1136
   #define E1_MICROSTEPS     16
1144
-  #define E1_K_VAL          50
1145 1137
   #define E1_OVERCURRENT  2000
1146 1138
   #define E1_STALLCURRENT 1500
1147 1139
 
1148 1140
   #define E2_MICROSTEPS     16
1149
-  #define E2_K_VAL          50
1150 1141
   #define E2_OVERCURRENT  2000
1151 1142
   #define E2_STALLCURRENT 1500
1152 1143
 
1153 1144
   #define E3_MICROSTEPS     16
1154
-  #define E3_K_VAL          50
1155 1145
   #define E3_OVERCURRENT  2000
1156 1146
   #define E3_STALLCURRENT 1500
1157 1147
 
1158 1148
   #define E4_MICROSTEPS     16
1159
-  #define E4_K_VAL          50
1160 1149
   #define E4_OVERCURRENT  2000
1161 1150
   #define E4_STALLCURRENT 1500
1162 1151
 
@@ -1298,6 +1287,7 @@
1298 1287
 #if ENABLED(CUSTOM_USER_MENUS)
1299 1288
   #define USER_SCRIPT_DONE "M117 User Script Done"
1300 1289
   #define USER_SCRIPT_AUDIBLE_FEEDBACK
1290
+  //#define USER_SCRIPT_RETURN  // Return to status screen after a script
1301 1291
 
1302 1292
   #define USER_DESC_1 "Home & UBL Info"
1303 1293
   #define USER_GCODE_1 "G28\nG29 W"

+ 3
- 2
Marlin/src/pins/pins_AZTEEG_X3.h Ver fichero

@@ -50,6 +50,9 @@
50 50
 //
51 51
 // LCD / Controller
52 52
 //
53
+#undef STAT_LED_RED_PIN
54
+#undef STAT_LED_BLUE_PIN
55
+
53 56
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
54 57
 
55 58
   #undef DOGLCD_A0
@@ -59,8 +62,6 @@
59 62
   #define DOGLCD_CS         32
60 63
   #define BTN_ENC           12
61 64
 
62
-  #undef STAT_LED_RED_PIN
63
-  #undef STAT_LED_BLUE_PIN
64 65
   #define STAT_LED_RED_PIN  64
65 66
   #define STAT_LED_BLUE_PIN 63
66 67
 

+ 1
- 1
Marlin/src/pins/pins_AZTEEG_X3_PRO.h Ver fichero

@@ -138,7 +138,7 @@
138 138
   #undef BEEPER_PIN
139 139
   #define  BEEPER_PIN      12   // 33 isn't physically available to the LCD display
140 140
 #else
141
-  #define STAT_LED_RED_PIN 32
141
+  #define STAT_LED_RED_PIN  32
142 142
   #define STAT_LED_BLUE_PIN 35
143 143
 #endif
144 144
 

+ 19
- 20
Marlin/src/pins/pins_RAMPS_RE_ARM.h Ver fichero

@@ -247,12 +247,11 @@
247 247
   #define DOGLCD_A0           59  // J3-8 & AUX-2
248 248
   #define DOGLCD_CS           63  // J5-3 & AUX-2
249 249
 
250
-#ifdef ULTIPANEL
251
-
252
-  #define LCD_PINS_D5         71  // ENET_MDIO
253
-  #define LCD_PINS_D6         73  // ENET_RX_ER
254
-  #define LCD_PINS_D7         75  // ENET_RXD1
255
-#endif
250
+  #ifdef ULTIPANEL
251
+    #define LCD_PINS_D5       71  // ENET_MDIO
252
+    #define LCD_PINS_D6       73  // ENET_RX_ER
253
+    #define LCD_PINS_D7       75  // ENET_RXD1
254
+  #endif
256 255
 
257 256
   #if ENABLED(NEWPANEL)
258 257
     #if ENABLED(REPRAPWORLD_KEYPAD)
@@ -267,21 +266,21 @@
267 266
     //#define SHIFT_EN            41  // J5-4 & AUX-4
268 267
   #endif
269 268
 
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
269
+  #define SDCARD_SORT_ALPHA         // Using SORT feature to keep one directory level in RAM
270
+                                    // When going up/down directory levels the SD card is
271
+                                    // accessed but the garbage/lines are removed when the
272
+                                    // LCD updates
274 273
 
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!
274
+  #define SDSORT_LIMIT       256    // Maximum number of sorted items (10-256). Costs 27 bytes each.
275
+  #define FOLDER_SORTING     -1     // -1=above  0=none  1=below
276
+  #define SDSORT_GCODE       false  // Allow turning sorting on/off with LCD and M34 g-code.
277
+  #define SDSORT_USES_RAM    true   // Pre-allocate a static array for faster pre-sorting.
278
+  #define SDSORT_USES_STACK  false  // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.)
279
+  #define SDSORT_CACHE_NAMES true   // Keep sorted items in RAM longer for speedy performance. Most expensive option.
280
+  #define SDSORT_DYNAMIC_RAM false  // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use!
282 281
 
283
- #if ENABLED(VIKI2) || ENABLED(miniVIKI)
284
-//    #define LCD_SCREEN_ROT_180
282
+  #if ENABLED(VIKI2) || ENABLED(miniVIKI)
283
+    // #define LCD_SCREEN_ROT_180
285 284
 
286 285
     #undef  BEEPER_PIN
287 286
     #define BEEPER_PIN          37  // may change if cable changes
@@ -309,12 +308,12 @@
309 308
     #define STAT_LED_BLUE_PIN   63  // may change if cable changes
310 309
     #define STAT_LED_RED_PIN     6  // may change if cable changes
311 310
   #endif
311
+
312 312
   //#define MISO_PIN            50  // system defined J3-10 & AUX-3
313 313
   //#define MOSI_PIN            51  // system defined J3-10 & AUX-3
314 314
   //#define SCK_PIN             52  // system defined J3-9 & AUX-3
315 315
   //#define SS_PIN              53  // system defined J3-5 & AUX-3 - sometimes called SDSS
316 316
 
317
-
318 317
   #if ENABLED(MINIPANEL)
319 318
     // GLCD features
320 319
     //#define LCD_CONTRAST   190

Loading…
Cancelar
Guardar