Skip to content

Commit ac07cde

Browse files
committed
Merge branch 'Tornado-2130-Touch' of https://github.com/rwoelk/Marlin into Tornado-2130-Touch
2 parents 4978dd3 + 190e565 commit ac07cde

File tree

2 files changed

+57
-92
lines changed

2 files changed

+57
-92
lines changed

Marlin/Configuration.h

+54-91
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
*
3636
* Advanced settings can be found in Configuration_adv.h
3737
*/
38-
#define CONFIGURATION_H_VERSION 02000903
38+
#define CONFIGURATION_H_VERSION 02000902
3939

4040
//===========================================================================
4141
//============================= Getting Started =============================
@@ -94,11 +94,6 @@
9494

9595
// @section machine
9696

97-
// Choose the name from boards.h that matches your setup
98-
#ifndef MOTHERBOARD
99-
#define MOTHERBOARD BOARD_RAMPS_14_EFB
100-
#endif
101-
10297
/**
10398
* Select the serial port on the board to use for communication with the host.
10499
* This allows the connection of wireless adapters (for instance) to non-default port pins.
@@ -265,6 +260,7 @@
265260

266261
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
267262
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder
263+
//#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381
268264

269265
#if ENABLED(PARKING_EXTRUDER)
270266

@@ -376,12 +372,8 @@
376372
//#define PS_OFF_SOUND // Beep 1s when power off
377373
#define PSU_ACTIVE_STATE LOW // Set 'LOW' for ATX, 'HIGH' for X-Box
378374

379-
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
380-
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
381-
//#define LED_POWEROFF_TIMEOUT 10000 // (ms) Turn off LEDs after power-off, with this amount of delay
382-
383-
//#define POWER_OFF_TIMER // Enable M81 D<seconds> to power off after a delay
384-
//#define POWER_OFF_WAIT_FOR_COOLDOWN // Enable M81 S to power off only after cooldown
375+
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
376+
//#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
385377

386378
//#define PSU_POWERUP_GCODE "M355 S1" // G-code to run after power-on (e.g., case light on)
387379
//#define PSU_POWEROFF_GCODE "M355 S0" // G-code to run before power-off (e.g., case light off)
@@ -393,14 +385,12 @@
393385
#define AUTO_POWER_CONTROLLERFAN
394386
#define AUTO_POWER_CHAMBER_FAN
395387
#define AUTO_POWER_COOLER_FAN
388+
//#define AUTO_POWER_E_TEMP 50 // (°C) Turn on PSU if any extruder is over this temperature
389+
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) Turn on PSU if the chamber is over this temperature
390+
//#define AUTO_POWER_COOLER_TEMP 26 // (°C) Turn on PSU if the cooler is over this temperature
396391
#define POWER_TIMEOUT 30 // (s) Turn off power if the machine is idle for this duration
397392
//#define POWER_OFF_DELAY 60 // (s) Delay of poweroff after M81 command. Useful to let fans run for extra time.
398393
#endif
399-
#if EITHER(AUTO_POWER_CONTROL, POWER_OFF_WAIT_FOR_COOLDOWN)
400-
//#define AUTO_POWER_E_TEMP 50 // (°C) PSU on if any extruder is over this temperature
401-
//#define AUTO_POWER_CHAMBER_TEMP 30 // (°C) PSU on if the chamber is over this temperature
402-
//#define AUTO_POWER_COOLER_TEMP 26 // (°C) PSU on if the cooler is over this temperature
403-
#endif
404394
#endif
405395

406396
//===========================================================================
@@ -442,9 +432,6 @@
442432
* 5 : 100kΩ ATC Semitec 104GT-2/104NT-4-R025H42G - Used in ParCan, J-Head, and E3D, SliceEngineering 300°C
443433
* 501 : 100kΩ Zonestar - Tronxy X3A
444434
* 502 : 100kΩ Zonestar - used by hot bed in Zonestar Průša P802M
445-
* 503 : 100kΩ Zonestar (Z8XM2) Heated Bed thermistor
446-
* 504 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-B3950) Hotend Thermistor
447-
* 505 : 100kΩ Zonestar P802QR2 (Part# QWG-104F-3950) Bed Thermistor
448435
* 512 : 100kΩ RPW-Ultra hotend
449436
* 6 : 100kΩ EPCOS - Not as accurate as table #1 (created using a fluke thermocouple)
450437
* 7 : 100kΩ Honeywell 135-104LAG-J01
@@ -525,12 +512,7 @@
525512
//#define MAX31865_SENSOR_OHMS_1 100
526513
//#define MAX31865_CALIBRATION_OHMS_1 430
527514

528-
// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings
529-
// from the two sensors differ too much the print will be aborted.
530-
//#define TEMP_SENSOR_1_AS_REDUNDANT
531-
#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
532-
533-
#define TEMP_RESIDENCY_TIME 5 // (seconds) Time to wait for hotend to "settle" in M109
515+
#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109
534516
#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
535517
#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
536518

@@ -776,7 +758,6 @@
776758
//#define COREZX
777759
//#define COREZY
778760
//#define MARKFORGED_XY // MarkForged. See https://reprap.org/forum/read.php?152,504042
779-
//#define MARKFORGED_YX
780761

781762
// Enable for a belt style printer with endless "Z" motion
782763
//#define BELTPRINTER
@@ -806,6 +787,9 @@
806787
//#define USE_XMAX_PLUG
807788
//#define USE_YMAX_PLUG
808789
#define USE_ZMAX_PLUG
790+
//#define USE_IMAX_PLUG
791+
//#define USE_JMAX_PLUG
792+
//#define USE_KMAX_PLUG
809793

810794
// Enable pullup for all endstops to prevent a floating state
811795
#define ENDSTOPPULLUPS
@@ -846,22 +830,18 @@
846830
#endif
847831

848832
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
849-
#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
850-
#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
851-
#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
852-
833+
#define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
834+
#define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
835+
#define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
836+
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
837+
#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
838+
#define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
853839
#define I_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
854840
#define J_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
855841
#define K_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
856-
857-
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
858-
#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
859-
#define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
860-
861842
#define I_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
862843
#define J_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
863844
#define K_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop.
864-
865845
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe.
866846

867847
/**
@@ -1110,17 +1090,6 @@
11101090
*/
11111091
//#define BLTOUCH
11121092

1113-
/**
1114-
* MagLev V4 probe by MDD
1115-
*
1116-
* This probe is deployed and activated by powering a built-in electromagnet.
1117-
*/
1118-
//#define MAGLEV4
1119-
#if ENABLED(MAGLEV4)
1120-
//#define MAGLEV_TRIGGER_PIN 11 // Set to the connected digital output
1121-
#define MAGLEV_TRIGGER_DELAY 15 // Changing this risks overheating the coil
1122-
#endif
1123-
11241093
/**
11251094
* Touch-MI Probe by hotends.fr
11261095
*
@@ -1253,15 +1222,6 @@
12531222
#endif
12541223
#endif
12551224

1256-
/**
1257-
* Probe Enable / Disable
1258-
* The probe only provides a triggered signal when enabled.
1259-
*/
1260-
//#define PROBE_ENABLE_DISABLE
1261-
#if ENABLED(PROBE_ENABLE_DISABLE)
1262-
//#define PROBE_ENABLE_PIN -1 // Override the default pin here
1263-
#endif
1264-
12651225
/**
12661226
* Multiple Probing
12671227
*
@@ -1409,14 +1369,15 @@
14091369

14101370
// @section machine
14111371

1412-
// The size of the printable area
1413-
#define X_BED_SIZE 200
1414-
#define Y_BED_SIZE 200
1372+
// The size of the print bed
1373+
#define X_BED_SIZE 300
1374+
#define Y_BED_SIZE 300
14151375

14161376
// Travel limits (mm) after homing, corresponding to endstop positions.
14171377
#define X_MIN_POS 0
14181378
#define Y_MIN_POS 0
14191379
#define Z_MIN_POS 0
1380+
14201381
#define X_MAX_POS 315
14211382
#define Y_MAX_POS 305
14221383
#define Z_MAX_POS 400
@@ -1427,7 +1388,6 @@
14271388
//#define K_MIN_POS 0
14281389
//#define K_MAX_POS 50
14291390

1430-
14311391
/**
14321392
* Software Endstops
14331393
*
@@ -1872,7 +1832,6 @@
18721832
#define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load
18731833
#if ENABLED(EEPROM_SETTINGS)
18741834
//#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors.
1875-
//#define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build.
18761835
#endif
18771836

18781837
//
@@ -2211,6 +2170,7 @@
22112170
// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu.
22122171
//
22132172
#define INDIVIDUAL_AXIS_HOMING_MENU
2173+
#define INDIVIDUAL_AXIS_HOMING_SUBMENU
22142174

22152175
//
22162176
// SPEAKER/BUZZER
@@ -2496,11 +2456,6 @@
24962456
//#define FYSETC_MINI_12864_2_1 // Type A/B. NeoPixel RGB Backlight
24972457
//#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
24982458

2499-
//
2500-
// BigTreeTech Mini 12864 V1.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
2501-
//
2502-
//#define BTT_MINI_12864_V1
2503-
25042459
//
25052460
// Factory display for Creality CR-10
25062461
// https://www.aliexpress.com/item/32833148327.html
@@ -2693,32 +2648,32 @@
26932648
*/
26942649

26952650
//
2696-
// 480x320, 3.5", SPI Display with Rotary Encoder from MKS
2697-
// Usually paired with MKS Robin Nano V2 & V3
2651+
// 480x320, 3.5", SPI Display From MKS
2652+
// Normally used in MKS Robin Nano V2
26982653
//
26992654
//#define MKS_TS35_V2_0
27002655

27012656
//
27022657
// 320x240, 2.4", FSMC Display From MKS
2703-
// Usually paired with MKS Robin Nano V1.2
2658+
// Normally used in MKS Robin Nano V1.2
27042659
//
27052660
//#define MKS_ROBIN_TFT24
27062661

27072662
//
27082663
// 320x240, 2.8", FSMC Display From MKS
2709-
// Usually paired with MKS Robin Nano V1.2
2664+
// Normally used in MKS Robin Nano V1.2
27102665
//
27112666
//#define MKS_ROBIN_TFT28
27122667

27132668
//
27142669
// 320x240, 3.2", FSMC Display From MKS
2715-
// Usually paired with MKS Robin Nano V1.2
2670+
// Normally used in MKS Robin Nano V1.2
27162671
//
27172672
//#define MKS_ROBIN_TFT32
27182673

27192674
//
27202675
// 480x320, 3.5", FSMC Display From MKS
2721-
// Usually paired with MKS Robin Nano V1.2
2676+
// Normally used in MKS Robin Nano V1.2
27222677
//
27232678
//#define MKS_ROBIN_TFT35
27242679

@@ -2729,7 +2684,7 @@
27292684

27302685
//
27312686
// 320x240, 3.2", FSMC Display From MKS
2732-
// Usually paired with MKS Robin
2687+
// Normally used in MKS Robin
27332688
//
27342689
//#define MKS_ROBIN_TFT_V1_1R
27352690

@@ -2759,15 +2714,10 @@
27592714
//#define ANET_ET5_TFT35
27602715

27612716
//
2762-
// 1024x600, 7", RGB Stock Display with Rotary Encoder from BIQU-BX
2717+
// 1024x600, 7", RGB Stock Display from BIQU-BX
27632718
//
27642719
//#define BIQU_BX_TFT70
27652720

2766-
//
2767-
// 480x320, 3.5", SPI Stock Display with Rotary Encoder from BIQU B1 SE Series
2768-
//
2769-
//#define BTT_TFT35_SPI_V1_0
2770-
27712721
//
27722722
// Generic TFT with detailed options
27732723
//
@@ -2822,11 +2772,23 @@
28222772
//
28232773
// Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
28242774
//
2825-
//#define DWIN_CREALITY_LCD // Creality UI
2826-
//#define DWIN_CREALITY_LCD_ENHANCED // Enhanced UI
2827-
//#define DWIN_CREALITY_LCD_JYERSUI // Jyers UI by Jacob Myers
2828-
//#define DWIN_MARLINUI_PORTRAIT // MarlinUI (portrait orientation)
2829-
//#define DWIN_MARLINUI_LANDSCAPE // MarlinUI (landscape orientation)
2775+
//#define DWIN_CREALITY_LCD
2776+
2777+
//
2778+
// Ender-3 v2 OEM display, enhanced.
2779+
//
2780+
//#define DWIN_CREALITY_LCD_ENHANCED
2781+
2782+
//
2783+
// Ender-3 v2 OEM display with enhancements by Jacob Myers
2784+
//
2785+
//#define DWIN_CREALITY_LCD_JYERSUI
2786+
2787+
//
2788+
// MarlinUI for Creality's DWIN display (and others)
2789+
//
2790+
//#define DWIN_MARLINUI_PORTRAIT
2791+
//#define DWIN_MARLINUI_LANDSCAPE
28302792

28312793
//
28322794
// Touch Screen Settings
@@ -2862,11 +2824,6 @@
28622824
//#define REPRAPWORLD_KEYPAD
28632825
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // (mm) Distance to move per key-press
28642826

2865-
//
2866-
// EasyThreeD ET-4000+ with button input and status LED
2867-
//
2868-
//#define EASYTHREED_UI
2869-
28702827
//=============================================================================
28712828
//=============================== Extra Features ==============================
28722829
//=============================================================================
@@ -2877,6 +2834,9 @@
28772834
// :[1,2,3,4,5,6,7,8]
28782835
//#define NUM_M106_FANS 1
28792836

2837+
// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
2838+
//#define FAST_PWM_FAN
2839+
28802840
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
28812841
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
28822842
// is too low, you should also increment SOFT_PWM_SCALE.
@@ -3005,4 +2965,7 @@
30052965
#define DEACTIVATE_SERVOS_AFTER_MOVE
30062966

30072967
// Edit servo angles with M281 and save to EEPROM with M500
3008-
#define EDITABLE_SERVO_ANGLES
2968+
//#define EDITABLE_SERVO_ANGLES
2969+
2970+
// Disable servo with M282 to reduce power consumption, noise, and heat when not in use
2971+
//#define SERVO_DETACH_GCODE

Marlin/Configuration_adv.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -1445,9 +1445,11 @@
14451445

14461446
//#define BROWSE_MEDIA_ON_INSERT // Open the file browser when media is inserted
14471447

1448+
1449+
14481450
//#define MEDIA_MENU_AT_TOP // Force the media menu to be listed on the top of the main menu
1451+
#define EVENT_GCODE_SD_ABORT "M118 A1 action:cancel" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
14491452

1450-
#define EVENT_GCODE_SD_ABORT "G28XY" // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
14511453

14521454
#if ENABLED(PRINTER_EVENT_LEDS)
14531455
#define PE_LEDS_COMPLETED_TIME (30 * 60) // (seconds) Time to keep the LED "done" color before restoring normal illumination

0 commit comments

Comments
 (0)