Skip to content

Commit 3e816e0

Browse files
committed
*sync with upstream repo
1 parent bb44880 commit 3e816e0

File tree

798 files changed

+101192
-23776
lines changed

Some content is hidden

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

798 files changed

+101192
-23776
lines changed

Marlin/.github/workflows/test-builds.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
- REMRAM_V1
9898
- BTT_SKR_SE_BX
9999
- chitu_f103
100+
- Index_Mobo_Rev03
100101

101102
# Put lengthy tests last
102103

Marlin/Marlin/Configuration.h

Lines changed: 67 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
*
7171
* Advanced settings can be found in Configuration_adv.h
7272
*/
73-
#define CONFIGURATION_H_VERSION 02000901
73+
#define CONFIGURATION_H_VERSION 02000902
7474

7575
//===========================================================================
7676
//============================= Getting Started =============================
@@ -385,6 +385,7 @@
385385
#define MIXING_VIRTUAL_TOOLS 16 // Use the Virtual Tool method with M163 and M164
386386
//#define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands
387387
//#define GRADIENT_MIX // Support for gradient mixing with M166 and LCD
388+
//#define MIXING_PRESETS // Assign 8 default V-tool presets for 2 or 3 MIXING_STEPPERS
388389
#if ENABLED(GRADIENT_MIX)
389390
//#define GRADIENT_VTOOL // Add M166 T to use a V-tool index as a Gradient alias
390391
#endif
@@ -411,6 +412,9 @@
411412
//#define PSU_NAME "Power Supply"
412413

413414
#if ENABLED(PSU_CONTROL)
415+
//#define MKS_PWC // Using the MKS PWC add-on
416+
//#define PS_OFF_CONFIRM // Confirm dialog when power off
417+
//#define PS_OFF_SOUND // Beep 1s when power off
414418
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
415419

416420
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
@@ -494,6 +498,7 @@
494498
* 67 : 500kΩ SliceEngineering 450°C Thermistor
495499
* 70 : 100kΩ bq Hephestos 2
496500
* 75 : 100kΩ Generic Silicon Heat Pad with NTC100K MGB18-104F39050L32
501+
* 2000 : 100kΩ Ultimachine Rambo TDK NTCG104LH104KT1 NTC100K motherboard Thermistor
497502
*
498503
* Analog Thermistors - 1kΩ pullup - Atypical, and requires changing out the 4.7kΩ pullup for 1kΩ.
499504
* ------- (but gives greater accuracy and more stable PID)
@@ -517,7 +522,7 @@
517522
* NOTE: ADC pins are not 5V tolerant. Not recommended because it's possible to damage the CPU by going over 500°C.
518523
* 201 : Pt100 with circuit in Overlord, similar to Ultimainboard V2.x
519524
*
520-
* Custom/Dummy/Other Thermos
525+
* Custom/Dummy/Other Thermal Sensors
521526
* ------
522527
* 0 : not used
523528
* 1000 : Custom - Specify parameters in Configuration_adv.h
@@ -549,6 +554,7 @@
549554
#define TEMP_SENSOR_CHAMBER 1
550555
#endif
551556
#define TEMP_SENSOR_COOLER 0
557+
#define TEMP_SENSOR_BOARD 0
552558
#define TEMP_SENSOR_REDUNDANT 0
553559

554560
// Dummy thermistor constant temperature readings, for use with 998 and 999
@@ -581,17 +587,11 @@
581587
* the print will be aborted. Whichever sensor is selected will have its normal functions disabled; i.e. selecting
582588
* the Bed sensor (-1) will disable bed heating/monitoring.
583589
*
584-
* Use the following to select temp sensors:
585-
* -5 : Cooler
586-
* -4 : Probe
587-
* -3 : not used
588-
* -2 : Chamber
589-
* -1 : Bed
590-
* 0-7 : E0 through E7
590+
* For selecting source/target use: COOLER, PROBE, BOARD, CHAMBER, BED, E0, E1, E2, E3, E4, E5, E6, E7
591591
*/
592592
#if TEMP_SENSOR_REDUNDANT
593-
#define TEMP_SENSOR_REDUNDANT_SOURCE 1 // The sensor that will provide the redundant reading.
594-
#define TEMP_SENSOR_REDUNDANT_TARGET 0 // The sensor that we are providing a redundant reading for.
593+
#define TEMP_SENSOR_REDUNDANT_SOURCE E1 // The sensor that will provide the redundant reading.
594+
#define TEMP_SENSOR_REDUNDANT_TARGET E0 // The sensor that we are providing a redundant reading for.
595595
#define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10 // (°C) Temperature difference that will trigger a print abort.
596596
#endif
597597

@@ -652,8 +652,8 @@
652652
#endif
653653

654654
#if ENABLED(PID_PARAMS_PER_HOTEND)
655-
// Specify between 1 and HOTENDS values per array.
656-
// If fewer than EXTRUDER values are provided, the last element will be repeated.
655+
// Specify up to one value per hotend here, according to your setup.
656+
// If there are fewer values, the last one applies to the remaining hotends.
657657
#define DEFAULT_Kp_LIST { 33.00, 33.00 }
658658
#define DEFAULT_Ki_LIST { 2.25, 2.25 }
659659
#define DEFAULT_Kd_LIST { 106.70, 106.70 }
@@ -817,6 +817,16 @@
817817
//#define COREZY
818818
//#define MARKFORGED_XY // MarkForged. See https://reprap.org/forum/read.php?152,504042
819819

820+
// Enable for a belt style printer with endless "Z" motion
821+
//#define BELTPRINTER
822+
823+
// Enable for Polargraph Kinematics
824+
//#define POLARGRAPH
825+
#if ENABLED(POLARGRAPH)
826+
#define POLARGRAPH_MAX_BELT_LEN 1035.0
827+
#define POLAR_SEGMENTS_PER_SECOND 5
828+
#endif
829+
820830
//===========================================================================
821831
//============================== Endstop Settings ===========================
822832
//===========================================================================
@@ -847,37 +857,37 @@
847857
#define ENDSTOPPULLUPS
848858
#if DISABLED(ENDSTOPPULLUPS)
849859
// Disable ENDSTOPPULLUPS to set pullups individually
850-
//#define ENDSTOPPULLUP_XMAX
851-
//#define ENDSTOPPULLUP_YMAX
852-
//#define ENDSTOPPULLUP_ZMAX
853-
//#define ENDSTOPPULLUP_IMAX
854-
//#define ENDSTOPPULLUP_JMAX
855-
//#define ENDSTOPPULLUP_KMAX
856860
//#define ENDSTOPPULLUP_XMIN
857861
//#define ENDSTOPPULLUP_YMIN
858862
//#define ENDSTOPPULLUP_ZMIN
859863
//#define ENDSTOPPULLUP_IMIN
860864
//#define ENDSTOPPULLUP_JMIN
861865
//#define ENDSTOPPULLUP_KMIN
866+
//#define ENDSTOPPULLUP_XMAX
867+
//#define ENDSTOPPULLUP_YMAX
868+
//#define ENDSTOPPULLUP_ZMAX
869+
//#define ENDSTOPPULLUP_IMAX
870+
//#define ENDSTOPPULLUP_JMAX
871+
//#define ENDSTOPPULLUP_KMAX
862872
//#define ENDSTOPPULLUP_ZMIN_PROBE
863873
#endif
864874

865875
// Enable pulldown for all endstops to prevent a floating state
866876
//#define ENDSTOPPULLDOWNS
867877
#if DISABLED(ENDSTOPPULLDOWNS)
868878
// Disable ENDSTOPPULLDOWNS to set pulldowns individually
869-
//#define ENDSTOPPULLDOWN_XMAX
870-
//#define ENDSTOPPULLDOWN_YMAX
871-
//#define ENDSTOPPULLDOWN_ZMAX
872-
//#define ENDSTOPPULLDOWN_IMAX
873-
//#define ENDSTOPPULLDOWN_JMAX
874-
//#define ENDSTOPPULLDOWN_KMAX
875879
//#define ENDSTOPPULLDOWN_XMIN
876880
//#define ENDSTOPPULLDOWN_YMIN
877881
//#define ENDSTOPPULLDOWN_ZMIN
878882
//#define ENDSTOPPULLDOWN_IMIN
879883
//#define ENDSTOPPULLDOWN_JMIN
880884
//#define ENDSTOPPULLDOWN_KMIN
885+
//#define ENDSTOPPULLDOWN_XMAX
886+
//#define ENDSTOPPULLDOWN_YMAX
887+
//#define ENDSTOPPULLDOWN_ZMAX
888+
//#define ENDSTOPPULLDOWN_IMAX
889+
//#define ENDSTOPPULLDOWN_JMAX
890+
//#define ENDSTOPPULLDOWN_KMAX
881891
//#define ENDSTOPPULLDOWN_ZMIN_PROBE
882892
#endif
883893

@@ -2159,10 +2169,10 @@
21592169
*
21602170
* Select the language to display on the LCD. These languages are available:
21612171
*
2162-
* en, an, bg, ca, cz, da, de, el, el_gr, es, eu, fi, fr, gl, hr, hu, it,
2172+
* en, an, bg, ca, cz, da, de, el, el_CY, es, eu, fi, fr, gl, hr, hu, it,
21632173
* jp_kana, ko_KR, nl, pl, pt, pt_br, ro, ru, sk, sv, tr, uk, vi, zh_CN, zh_TW
21642174
*
2165-
* :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el_gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
2175+
* :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek (Greece)', 'el_CY':'Greek (Cyprus)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'hu':'Hungarian', 'it':'Italian', 'jp_kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt_br':'Portuguese (Brazilian)', 'ro':'Romanian', 'ru':'Russian', 'sk':'Slovak', 'sv':'Swedish', 'tr':'Turkish', 'uk':'Ukrainian', 'vi':'Vietnamese', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)' }
21662176
*/
21672177
#define LCD_LANGUAGE en
21682178

@@ -2274,6 +2284,7 @@
22742284
// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
22752285
//
22762286
#define INDIVIDUAL_AXIS_HOMING_MENU
2287+
//#define INDIVIDUAL_AXIS_HOMING_SUBMENU
22772288

22782289
//
22792290
// SPEAKER/BUZZER
@@ -2656,11 +2667,16 @@
26562667
// ORIGIN : https://www.aliexpress.com/item/32993409517.html
26572668
// FYSETC : https://www.aliexpress.com/item/32961471929.html
26582669
//
2670+
// RELOADED (T5UID1)
2671+
// - Download https://github.com/Desuuuu/DGUS-reloaded/releases
2672+
// - Copy the downloaded DWIN_SET folder to the SD card.
2673+
//
26592674
//#define DGUS_LCD_UI_ORIGIN
26602675
//#define DGUS_LCD_UI_FYSETC
26612676
//#define DGUS_LCD_UI_HIPRECY
26622677

26632678
//#define DGUS_LCD_UI_MKS
2679+
//#define DGUS_LCD_UI_RELOADED
26642680
#if ENABLED(DGUS_LCD_UI_MKS)
26652681
#define USE_MKS_GREEN_UI
26662682
#endif
@@ -2820,6 +2836,7 @@
28202836
//#define TFT_RES_320x240
28212837
//#define TFT_RES_480x272
28222838
//#define TFT_RES_480x320
2839+
//#define TFT_RES_1024x600
28232840
#endif
28242841

28252842
/**
@@ -2859,6 +2876,22 @@
28592876
//
28602877
//#define DWIN_CREALITY_LCD
28612878

2879+
//
2880+
// Ender-3 v2 OEM display, enhanced.
2881+
//
2882+
//#define DWIN_CREALITY_LCD_ENHANCED
2883+
2884+
//
2885+
// Ender-3 v2 OEM display with enhancements by Jacob Myers
2886+
//
2887+
//#define DWIN_CREALITY_LCD_JYERSUI
2888+
2889+
//
2890+
// MarlinUI for Creality's DWIN display (and others)
2891+
//
2892+
//#define DWIN_MARLINUI_PORTRAIT
2893+
//#define DWIN_MARLINUI_LANDSCAPE
2894+
28622895
//
28632896
// Touch Screen Settings
28642897
//
@@ -2867,6 +2900,8 @@
28672900
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens
28682901
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
28692902

2903+
//#define TOUCH_IDLE_SLEEP 300 // (secs) Turn off the TFT backlight if set (5mn)
2904+
28702905
#define TOUCH_SCREEN_CALIBRATION
28712906
#define XPT2046_X_CALIBRATION 17114
28722907
#define XPT2046_Y_CALIBRATION -12430
@@ -3020,9 +3055,9 @@
30203055
* Set this manually if there are extra servos needing manual control.
30213056
* Set to 0 to turn off servo support.
30223057
*/
3023-
//#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
3058+
//#define NUM_SERVOS 3 // Note: Servo index starts with 0 for M280-M282 commands
30243059

3025-
// (ms) Delay before the next move will start, to give the servo time to reach its target angle.
3060+
// (ms) Delay before the next move will start, to give the servo time to reach its target angle.
30263061
// 300ms is a good value but you can try less delay.
30273062
// If the servo can't reach the requested position, increase it.
30283063
#define SERVO_DELAY { 300 }
@@ -3032,3 +3067,6 @@
30323067

30333068
// Edit servo angles with M281 and save to EEPROM with M500
30343069
//#define EDITABLE_SERVO_ANGLES
3070+
3071+
// Disable servo with M282 to reduce power consumption, noise, and heat when not in use
3072+
//#define SERVO_DETACH_GCODE

0 commit comments

Comments
 (0)