wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

- Lower max feedrate for Z on MEGA M and S

Browse Source 
- fully automatize PID tuning
- Bump Version to 1.1.3-BETA
This commit is contained in:
Knutwurst
2020-08-15 22:30:42 +02:00
parent 4d5d068a99
commit fe734e1152
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration.h
View File

@@ -915,11 +915,11 @@
* X, Y, Z, E0 [, E1[, E2...]] * X, Y, Z, E0 [, E1[, E2...]]
*/ */
#if ENABLED(KNUTWURST_MEGA) #if ENABLED(KNUTWURST_MEGA)
#define DEFAULT_MAX_FEEDRATE { 500, 500, 20, 60 } #define DEFAULT_MAX_FEEDRATE { 500, 500, 8, 60 }
#endif #endif
#if ENABLED(KNUTWURST_MEGA_S) #if ENABLED(KNUTWURST_MEGA_S)
#define DEFAULT_MAX_FEEDRATE { 500, 500, 20, 30 } #define DEFAULT_MAX_FEEDRATE { 500, 500, 8, 30 }
#endif #endif
#if ENABLED(KNUTWURST_MEGA_X) #if ENABLED(KNUTWURST_MEGA_X)
@@ -1676,7 +1676,7 @@
// Homing speeds (mm/m) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60) #define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_Z (6*60) #define HOMING_FEEDRATE_Z (5*60)
// Validate that endstops are triggered on homing moves // Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS #define VALIDATE_HOMING_ENDSTOPS

2
Marlin/src/inc/Version.h
View File

@@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release * here we define this default string as the date where the latest release
* version was tagged. * version was tagged.
*/ */
#define CUSTOM_BUILD_VERSION "1.1.2" #define CUSTOM_BUILD_VERSION "1.1.3-BETA"
#ifndef STRING_DISTRIBUTION_DATE #ifndef STRING_DISTRIBUTION_DATE
//#define STRING_DISTRIBUTION_DATE "2020-07-09" //#define STRING_DISTRIBUTION_DATE "2020-07-09"

11
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -447,14 +447,21 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
|| (strcasestr(currentTouchscreenSelection, SM_PID_HOTEND_S) != NULL)) || (strcasestr(currentTouchscreenSelection, SM_PID_HOTEND_S) != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: PID Tune Hotend"); SERIAL_ECHOLNPGM("Special Menu: PID Tune Hotend");
queue.inject_P(PSTR("M106 S204\nG4 P500\nM303 E0 S215 C15 U1")); queue.inject_P(PSTR("G28\nG1 Z20\nG1 X100 Y100 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10"));
buzzer.tone(200, 1108);
buzzer.tone(200, 1661);
buzzer.tone(200, 1108);
buzzer.tone(600, 1661);
} }
else if ((strcasestr(currentTouchscreenSelection, SM_PID_BED_L) != NULL) else if ((strcasestr(currentTouchscreenSelection, SM_PID_BED_L) != NULL)
|| (strcasestr(currentTouchscreenSelection, SM_PID_BED_S) != NULL)) || (strcasestr(currentTouchscreenSelection, SM_PID_BED_S) != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: PID Tune Ultrabase"); SERIAL_ECHOLNPGM("Special Menu: PID Tune Ultrabase");
queue.inject_P(PSTR("M303 E-1 S60 C6 U1")); queue.inject_P(PSTR("M303 E-1 S60 C6 U1"));
buzzer.tone(200, 1108);
buzzer.tone(200, 1661);
buzzer.tone(200, 1108);
buzzer.tone(600, 1661);
} }
else if ((strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_L) != NULL) else if ((strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_L) != NULL)
|| (strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_S) != NULL)) || (strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_S) != NULL))