Skip to content

Commit 7917533

Browse files
committed
Update to Marlin 2.0.2
Remove all other configurations (Sorry)
1 parent 1a3541b commit 7917533

File tree

732 files changed

+66259
-683846
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

732 files changed

+66259
-683846
lines changed

Marlin/Configuration.h

+42-24
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
// @section extruder
144144

145145
// This defines the number of extruders
146-
// :[1, 2, 3, 4, 5, 6]
146+
// :[1, 2, 3, 4, 5, 6, 7, 8]
147147
#define EXTRUDERS 1
148148

149149
// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
@@ -330,9 +330,9 @@
330330
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
331331
//#define PSU_POWERUP_DELAY 100 // (ms) Delay for the PSU to warm up to full power
332332

333-
//#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
333+
//#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
334334
#if ENABLED(AUTO_POWER_CONTROL)
335-
#define AUTO_POWER_FANS // Turn on PSU if fans need power
335+
#define AUTO_POWER_FANS // Turn on PSU if fans need power
336336
#define AUTO_POWER_E_FANS
337337
#define AUTO_POWER_CONTROLLERFAN
338338
#define AUTO_POWER_CHAMBER_FAN
@@ -360,7 +360,8 @@
360360
* -1 : thermocouple with AD595
361361
* 0 : not used
362362
* 1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup)
363-
* 331 : (3.3V scaled thermistor 1 table)
363+
* 331 : (3.3V scaled thermistor 1 table for MEGA)
364+
* 332 : (3.3V scaled thermistor 1 table for DUE)
364365
* 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)
365366
* 3 : Mendel-parts thermistor (4.7k pullup)
366367
* 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!
@@ -411,7 +412,10 @@
411412
#define TEMP_SENSOR_3 0
412413
#define TEMP_SENSOR_4 0
413414
#define TEMP_SENSOR_5 0
415+
#define TEMP_SENSOR_6 0
416+
#define TEMP_SENSOR_7 0
414417
#define TEMP_SENSOR_BED 1
418+
#define TEMP_SENSOR_PROBE 0
415419
#define TEMP_SENSOR_CHAMBER 0
416420

417421
// Dummy thermistor constant temperature readings, for use with 998 and 999
@@ -439,6 +443,8 @@
439443
#define HEATER_3_MINTEMP 5
440444
#define HEATER_4_MINTEMP 5
441445
#define HEATER_5_MINTEMP 5
446+
#define HEATER_6_MINTEMP 5
447+
#define HEATER_7_MINTEMP 5
442448
#define BED_MINTEMP 5
443449

444450
// Above this temperature the heater will be switched off.
@@ -450,6 +456,8 @@
450456
#define HEATER_3_MAXTEMP 275
451457
#define HEATER_4_MAXTEMP 275
452458
#define HEATER_5_MAXTEMP 275
459+
#define HEATER_6_MAXTEMP 275
460+
#define HEATER_7_MAXTEMP 275
453461
#define BED_MAXTEMP 125
454462

455463
//===========================================================================
@@ -498,7 +506,7 @@
498506
* heater. If your configuration is significantly different than this and you don't understand
499507
* the issues involved, don't use bed PID until someone else verifies that your hardware works.
500508
*/
501-
#define PIDTEMPBED
509+
//#define PIDTEMPBED
502510

503511
//#define BED_LIMIT_SWITCHING
504512

@@ -647,12 +655,13 @@
647655
*
648656
* A4988 is assumed for unspecified drivers.
649657
*
650-
* Options: A4988, A5984, DRV8825, LV8729, L6470, TB6560, TB6600, TMC2100,
658+
* Options: A4988, A5984, DRV8825, LV8729, L6470, L6474, POWERSTEP01,
659+
* TB6560, TB6600, TMC2100,
651660
* TMC2130, TMC2130_STANDALONE, TMC2160, TMC2160_STANDALONE,
652661
* TMC2208, TMC2208_STANDALONE, TMC2209, TMC2209_STANDALONE,
653662
* TMC26X, TMC26X_STANDALONE, TMC2660, TMC2660_STANDALONE,
654663
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
655-
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
664+
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
656665
*/
657666
#define X_DRIVER_TYPE TMC2209
658667
#define Y_DRIVER_TYPE TMC2209
@@ -667,6 +676,8 @@
667676
//#define E3_DRIVER_TYPE A4988
668677
//#define E4_DRIVER_TYPE A4988
669678
//#define E5_DRIVER_TYPE A4988
679+
//#define E6_DRIVER_TYPE A4988
680+
//#define E7_DRIVER_TYPE A4988
670681

671682
// Enable this feature if all enabled endstop pins are interrupt-capable.
672683
// This will remove the need to poll the interrupt pins, saving many CPU cycles.
@@ -711,7 +722,7 @@
711722
* Override with M92
712723
* X, Y, Z, E0 [, E1[, E2...]]
713724
*/
714-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 140.48}
725+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 139 }
715726

716727
/**
717728
* Default Max Feed Rate (mm/s)
@@ -922,7 +933,8 @@
922933
*/
923934
#define NOZZLE_TO_PROBE_OFFSET { -46.5, 7, -3.4 }
924935

925-
// Certain types of probes need to stay away from edges
936+
// Most probes should stay away from the edges of the bed, but
937+
// with NOZZLE_AS_PROBE this can be negative for a wider probing area.
926938
#define MIN_PROBE_EDGE 15
927939

928940
// X and Y axis travel speed (mm/m) between probes
@@ -1032,6 +1044,8 @@
10321044
#define INVERT_E3_DIR false
10331045
#define INVERT_E4_DIR false
10341046
#define INVERT_E5_DIR false
1047+
#define INVERT_E6_DIR false
1048+
#define INVERT_E7_DIR false
10351049

10361050
// @section homing
10371051

@@ -1417,11 +1431,6 @@
14171431
#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113.
14181432
#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating
14191433

1420-
//
1421-
// M100 Free Memory Watcher
1422-
//
1423-
//#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
1424-
14251434
//
14261435
// G20/G21 Inch mode support
14271436
//
@@ -1512,9 +1521,10 @@
15121521
// Default number of triangles
15131522
#define NOZZLE_CLEAN_TRIANGLES 3
15141523

1515-
// Specify positions as { X, Y, Z }
1516-
#define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1) }
1517-
#define NOZZLE_CLEAN_END_POINT { 100, 60, (Z_MIN_POS + 1) }
1524+
// Specify positions for each tool as { { X, Y, Z }, { X, Y, Z } }
1525+
// Dual hotend system may use { { -20, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }, { 420, (Y_BED_SIZE / 2), (Z_MIN_POS + 1) }}
1526+
#define NOZZLE_CLEAN_START_POINT { { 30, 30, (Z_MIN_POS + 1) } }
1527+
#define NOZZLE_CLEAN_END_POINT { { 100, 60, (Z_MIN_POS + 1) } }
15181528

15191529
// Circular pattern radius
15201530
#define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5
@@ -1935,10 +1945,11 @@
19351945
// FYSETC variant of the MINI12864 graphic controller with SD support
19361946
// https://wiki.fysetc.com/Mini12864_Panel/
19371947
//
1938-
//#define FYSETC_MINI_12864_X_X // Type C/D/E/F. No tunable RGB Backlight by default
1939-
//#define FYSETC_MINI_12864_1_2 // Type C/D/E/F. Simple RGB Backlight (always on)
1940-
//#define FYSETC_MINI_12864_2_0 // Type A/B. Discreet RGB Backlight
1941-
//#define FYSETC_MINI_12864_2_1 // Type A/B. Neopixel RGB Backlight
1948+
//#define FYSETC_MINI_12864_X_X // Type C/D/E/F. No tunable RGB Backlight by default
1949+
//#define FYSETC_MINI_12864_1_2 // Type C/D/E/F. Simple RGB Backlight (always on)
1950+
//#define FYSETC_MINI_12864_2_0 // Type A/B. Discreet RGB Backlight
1951+
//#define FYSETC_MINI_12864_2_1 // Type A/B. Neopixel RGB Backlight
1952+
//#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
19421953

19431954
//
19441955
// Factory display for Creality CR-10
@@ -1949,6 +1960,11 @@
19491960
//
19501961
#define CR10_STOCKDISPLAY
19511962

1963+
//
1964+
// Ender-2 OEM display, a variant of the MKS_MINI_12864
1965+
//
1966+
//#define ENDER2_STOCKDISPLAY
1967+
19521968
//
19531969
// ANET and Tronxy Graphical Controller
19541970
//
@@ -2017,9 +2033,11 @@
20172033
//=============================================================================
20182034

20192035
//
2020-
// DGUS Touch Display with DWIN OS
2036+
// DGUS Touch Display with DWIN OS. (Choose one.)
20212037
//
2022-
//#define DGUS_LCD
2038+
//#define DGUS_LCD_UI_ORIGIN
2039+
//#define DGUS_LCD_UI_FYSETC
2040+
//#define DGUS_LCD_UI_HIPRECY
20232041

20242042
//
20252043
// Touch-screen LCD for Malyan M200 printers
@@ -2207,4 +2225,4 @@
22072225
//#define DEACTIVATE_SERVOS_AFTER_MOVE
22082226

22092227
// Allow servo angle to be edited and saved to EEPROM
2210-
//#define EDITABLE_SERVO_ANGLES
2228+
//#define EDITABLE_SERVO_ANGLES

0 commit comments

Comments
 (0)