|
@@ -177,6 +177,21 @@
|
177
|
177
|
#endif
|
178
|
178
|
|
179
|
179
|
/**
|
|
180
|
+ * Two separate X-carriages with extruders that connect to a moving part
|
|
181
|
+ * via a magnetic docking mechanism. Requires SOL1_PIN and SOL2_PIN.
|
|
182
|
+ */
|
|
183
|
+//#define PARKING_EXTRUDER
|
|
184
|
+#if ENABLED(PARKING_EXTRUDER)
|
|
185
|
+ #define PARKING_EXTRUDER_SOLENOIDS_INVERT // If enabled, the solenoid is NOT magnetized with applied voltage
|
|
186
|
+ #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW // LOW or HIGH pin signal energizes the coil
|
|
187
|
+ #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // Delay (ms) for magnetic field. No delay if 0 or not defined.
|
|
188
|
+ #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
|
|
189
|
+ #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
|
|
190
|
+ #define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking
|
|
191
|
+ #define HOTEND_OFFSET_Z { 0.0, 1.3 } // Z-offsets of the two hotends. The first must be 0.
|
|
192
|
+#endif
|
|
193
|
+
|
|
194
|
+/**
|
180
|
195
|
* "Mixing Extruder"
|
181
|
196
|
* - Adds a new code, M165, to set the current mix factors.
|
182
|
197
|
* - Extends the stepping routines to move multiple steppers in proportion to the mix.
|
|
@@ -186,7 +201,7 @@
|
186
|
201
|
*/
|
187
|
202
|
//#define MIXING_EXTRUDER
|
188
|
203
|
#if ENABLED(MIXING_EXTRUDER)
|
189
|
|
- #define MIXING_STEPPERS 3 // Number of steppers in your mixing extruder
|
|
204
|
+ #define MIXING_STEPPERS 2 // Number of steppers in your mixing extruder
|
190
|
205
|
#define MIXING_VIRTUAL_TOOLS 16 // Use the Virtual Tool method with M163 and M164
|
191
|
206
|
//#define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands
|
192
|
207
|
#endif
|
|
@@ -543,7 +558,7 @@
|
543
|
558
|
|
544
|
559
|
/**
|
545
|
560
|
* Default Jerk (mm/s)
|
546
|
|
- * Override with M205 X Y Z EM
|
|
561
|
+ * Override with M205 X Y Z E
|
547
|
562
|
*
|
548
|
563
|
* "Jerk" specifies the minimum speed change that requires acceleration.
|
549
|
564
|
* When changing speed and direction, if the difference is less than the
|
|
@@ -596,7 +611,7 @@
|
596
|
611
|
* Probe Type
|
597
|
612
|
*
|
598
|
613
|
* Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
|
599
|
|
- * You must activate one of these to use Auto Bed Leveling below.
|
|
614
|
+ * Activate one of these to use Auto Bed Leveling below.
|
600
|
615
|
*/
|
601
|
616
|
|
602
|
617
|
/**
|
|
@@ -627,14 +642,15 @@
|
627
|
642
|
#endif
|
628
|
643
|
|
629
|
644
|
/**
|
630
|
|
- * Enable if probing seems unreliable. Heaters and/or fans - consistent with the
|
631
|
|
- * options selected below - will be disabled during probing so as to minimize
|
632
|
|
- * potential EM interference by quieting/silencing the source of the 'noise' (the change
|
633
|
|
- * in current flowing through the wires). This is likely most useful to users of the
|
634
|
|
- * BLTouch probe, but may also help those with inductive or other probe types.
|
|
645
|
+ * Enable one or more of the following if probing seems unreliable.
|
|
646
|
+ * Heaters and/or fans can be disabled during probing to minimize electrical
|
|
647
|
+ * noise. A delay can also be added to allow noise and vibration to settle.
|
|
648
|
+ * These options are most useful for the BLTouch probe, but may also improve
|
|
649
|
+ * readings with inductive probes and piezo sensors.
|
635
|
650
|
*/
|
636
|
651
|
//#define PROBING_HEATERS_OFF // Turn heaters off when probing
|
637
|
652
|
//#define PROBING_FANS_OFF // Turn fans off when probing
|
|
653
|
+//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
|
638
|
654
|
|
639
|
655
|
// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
|
640
|
656
|
//#define SOLENOID_PROBE
|
|
@@ -935,7 +951,7 @@
|
935
|
951
|
#define UBL_PROBE_PT_3_X 180
|
936
|
952
|
#define UBL_PROBE_PT_3_Y 20
|
937
|
953
|
|
938
|
|
- #define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
|
954
|
+ //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
|
939
|
955
|
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle
|
940
|
956
|
#define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
|
941
|
957
|
|
|
@@ -964,6 +980,9 @@
|
964
|
980
|
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
|
965
|
981
|
#endif
|
966
|
982
|
|
|
983
|
+// Add a menu item to move between bed corners for manual bed adjustment
|
|
984
|
+//#define LEVEL_BED_CORNERS
|
|
985
|
+
|
967
|
986
|
/**
|
968
|
987
|
* Commands to execute at the end of G29 probing.
|
969
|
988
|
* Useful to retract or move the Z probe out of the way.
|
|
@@ -1033,7 +1052,7 @@
|
1033
|
1052
|
//
|
1034
|
1053
|
// M100 Free Memory Watcher
|
1035
|
1054
|
//
|
1036
|
|
-#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
|
|
1055
|
+//#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
|
1037
|
1056
|
|
1038
|
1057
|
//
|
1039
|
1058
|
// G20/G21 Inch mode support
|
|
@@ -1204,7 +1223,7 @@
|
1204
|
1223
|
* - Click the controller to view the LCD menu
|
1205
|
1224
|
* - The LCD will display Japanese, Western, or Cyrillic text
|
1206
|
1225
|
*
|
1207
|
|
- * See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language
|
|
1226
|
+ * See http://marlinfw.org/docs/development/lcd_language.html
|
1208
|
1227
|
*
|
1209
|
1228
|
* :['JAPANESE', 'WESTERN', 'CYRILLIC']
|
1210
|
1229
|
*/
|
|
@@ -1331,12 +1350,6 @@
|
1331
|
1350
|
//#define ULTIPANEL
|
1332
|
1351
|
|
1333
|
1352
|
//
|
1334
|
|
-// Cartesio UI
|
1335
|
|
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
|
1336
|
|
-//
|
1337
|
|
-//#define CARTESIO_UI
|
1338
|
|
-
|
1339
|
|
-//
|
1340
|
1353
|
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
|
1341
|
1354
|
// http://reprap.org/wiki/PanelOne
|
1342
|
1355
|
//
|
|
@@ -1419,6 +1432,12 @@
|
1419
|
1432
|
//#define BQ_LCD_SMART_CONTROLLER
|
1420
|
1433
|
|
1421
|
1434
|
//
|
|
1435
|
+// Cartesio UI
|
|
1436
|
+// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
|
|
1437
|
+//
|
|
1438
|
+//#define CARTESIO_UI
|
|
1439
|
+
|
|
1440
|
+//
|
1422
|
1441
|
// ANET_10 Controller supported displays.
|
1423
|
1442
|
//
|
1424
|
1443
|
//#define ANET_KEYPAD_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin.
|
|
@@ -1505,6 +1524,35 @@
|
1505
|
1524
|
//#define OLED_PANEL_TINYBOY2
|
1506
|
1525
|
|
1507
|
1526
|
//
|
|
1527
|
+// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller
|
|
1528
|
+// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html
|
|
1529
|
+//
|
|
1530
|
+//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602
|
|
1531
|
+
|
|
1532
|
+//
|
|
1533
|
+// MKS MINI12864 with graphic controller and SD support
|
|
1534
|
+// http://reprap.org/wiki/MKS_MINI_12864
|
|
1535
|
+//
|
|
1536
|
+//#define MKS_MINI_12864
|
|
1537
|
+
|
|
1538
|
+//
|
|
1539
|
+// Factory display for Creality CR-10
|
|
1540
|
+// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html
|
|
1541
|
+//
|
|
1542
|
+// This is RAMPS-compatible using a single 10-pin connector.
|
|
1543
|
+// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
|
|
1544
|
+//
|
|
1545
|
+//#define CR10_STOCKDISPLAY
|
|
1546
|
+
|
|
1547
|
+//
|
|
1548
|
+// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
|
|
1549
|
+// http://reprap.org/wiki/MKS_12864OLED
|
|
1550
|
+//
|
|
1551
|
+// Tiny, but very sharp OLED display
|
|
1552
|
+//
|
|
1553
|
+//#define MKS_12864OLED
|
|
1554
|
+
|
|
1555
|
+//
|
1508
|
1556
|
// AZSMZ 12864 LCD with SD
|
1509
|
1557
|
// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html
|
1510
|
1558
|
//
|
|
@@ -1566,14 +1614,20 @@
|
1566
|
1614
|
* Adds the M150 command to set the LED (or LED strip) color.
|
1567
|
1615
|
* If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of
|
1568
|
1616
|
* luminance values can be set from 0 to 255.
|
|
1617
|
+ * For Neopixel LED an overall brightness parameter is also available.
|
1569
|
1618
|
*
|
1570
|
1619
|
* *** CAUTION ***
|
1571
|
1620
|
* LED Strips require a MOFSET Chip between PWM lines and LEDs,
|
1572
|
1621
|
* as the Arduino cannot handle the current the LEDs will require.
|
1573
|
1622
|
* Failure to follow this precaution can destroy your Arduino!
|
|
1623
|
+ * NOTE: A separate 5V power supply is required! The Neopixel LED needs
|
|
1624
|
+ * more current than the Arduino 5V linear regulator can produce.
|
1574
|
1625
|
* *** CAUTION ***
|
1575
|
1626
|
*
|
|
1627
|
+ * LED Type. Enable only one of the following two options.
|
|
1628
|
+ *
|
1576
|
1629
|
*/
|
|
1630
|
+
|
1577
|
1631
|
//#define RGB_LED
|
1578
|
1632
|
//#define RGBW_LED
|
1579
|
1633
|
#if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
|
|
@@ -1626,7 +1680,7 @@
|
1626
|
1680
|
// Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle.
|
1627
|
1681
|
// 300ms is a good value but you can try less delay.
|
1628
|
1682
|
// If the servo can't reach the requested position, increase it.
|
1629
|
|
-#define SERVO_DELAY 300
|
|
1683
|
+#define SERVO_DELAY { 300 }
|
1630
|
1684
|
|
1631
|
1685
|
// Servo deactivation
|
1632
|
1686
|
//
|