From 8f8511d2e00589b961e8eb45945d00b4f776a691 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Thu, 22 Aug 2019 12:34:14 -0400 Subject: [PATCH] tweaks --- Marlin/Configuration.h | 10 ++++----- .../lcd/extensible_ui/lib/Creality_DWIN.cpp | 22 +++++++++---------- README.md | 8 +++++++ 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8dec57707e..30157fedc9 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -830,9 +830,9 @@ #if ENABLED(HotendStock) #if ANY(MachineCRX, MachineCR10SPro, MachineCR10Max) - #define DEFAULT_Kp 24.62 - #define DEFAULT_Ki 4.01 - #define DEFAULT_Kd 37.81 + #define DEFAULT_Kp 25.25 + #define DEFAULT_Ki 2.17 + #define DEFAULT_Kd 73.44 #elif ENABLED(MachineEnder5Plus) #define DEFAULT_Kp 14.72 #define DEFAULT_Ki 0.89 @@ -2269,9 +2269,9 @@ #if(ENABLED(MachineEnder2)) #define NOZZLE_PARK_POINT { (0), (0), 20 } #else -#define NOZZLE_PARK_POINT { (10), (10), 20 } +#define NOZZLE_PARK_POINT { (50), (10), 20 } #endif -#define NOZZLE_PARK_XY_FEEDRATE 100 // X and Y axes feedrate in mm/s (also used for delta printers Z axis) +#define NOZZLE_PARK_XY_FEEDRATE 70 // X and Y axes feedrate in mm/s (also used for delta printers Z axis) #define NOZZLE_PARK_Z_FEEDRATE 5 // Z axis feedrate in mm/s (not used for delta printers) #endif diff --git a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp index 44806fcf86..e3fbf8403b 100644 --- a/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp +++ b/Marlin/src/lcd/extensible_ui/lib/Creality_DWIN.cpp @@ -157,19 +157,21 @@ void onIdle() rtscheck.RTS_SndData(4 + CEIconGrap, IconPrintstatus); // 4 for Pause rtscheck.RTS_SndData(ExchangePageBase + 54, ExchangepageAddr); waitway = 0; - } + } else return; break; case 2: if (isPositionKnown() && !commandsInQueue()) waitway = 0; + else return; break; case 3: SERIAL_ECHOLN("==waitway 3=="); //if(isPositionKnown() && (getActualTemp_celsius(BED) >= (getTargetTemp_celsius(BED)-1))) { rtscheck.RTS_SndData(ExchangePageBase + 64, ExchangepageAddr); - waitway = 0; + waitway = 2; + return; //} break; @@ -180,7 +182,7 @@ void onIdle() rtscheck.RTS_SndData(ExchangePageBase + 71 + AxisPagenum, ExchangepageAddr); AutohomeKey = false; waitway = 0; - } + } else return; break; case 5: if(isPositionKnown() && !commandsInQueue()) { @@ -188,7 +190,7 @@ void onIdle() waitway = 0; SERIAL_ECHOLN("==waitway 5=="); rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr); //exchange to 78 page - } + } else return; break; case 6: setAxisPosition_mm(0.0, (axis_t)Z); @@ -1170,8 +1172,7 @@ SERIAL_ECHOLN(PSTR("BeginSwitch")); case centerData: // Assitant Level , Centre 1 { - SERIAL_ECHOLN("InCenter"); - setFeedrate_mm_s(100.0); + setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE); setAxisPosition_mm(3.0, (axis_t)Z); setAxisPosition_mm(X_CENTER, (axis_t)X); setAxisPosition_mm(Y_CENTER, (axis_t)Y); @@ -1180,8 +1181,7 @@ SERIAL_ECHOLN(PSTR("BeginSwitch")); } case topLeftData: // Assitant Level , Front Left 2 { - SERIAL_ECHOLN("InTopLeft"); - setFeedrate_mm_s(100.0); + setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE); setAxisPosition_mm(3.0, (axis_t)Z); setAxisPosition_mm((X_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)X); setAxisPosition_mm((Y_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)Y); @@ -1190,7 +1190,7 @@ SERIAL_ECHOLN(PSTR("BeginSwitch")); } case topRightData: // Assitant Level , Front Right 3 { - setFeedrate_mm_s(100.0); + setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE); setAxisPosition_mm(3.0, (axis_t)Z); setAxisPosition_mm((X_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)X); setAxisPosition_mm((Y_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)Y); @@ -1199,7 +1199,7 @@ SERIAL_ECHOLN(PSTR("BeginSwitch")); } case lowRightData: // Assitant Level , Back Right 4 { - setFeedrate_mm_s(100.0); + setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE); setAxisPosition_mm(3.0, (axis_t)Z); setAxisPosition_mm((X_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)X); setAxisPosition_mm((Y_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)Y); @@ -1208,7 +1208,7 @@ SERIAL_ECHOLN(PSTR("BeginSwitch")); } case lowLeftData: // Assitant Level , Back Left 5 { - setFeedrate_mm_s(100.0); + setFeedrate_mm_s(NOZZLE_PARK_XY_FEEDRATE); setAxisPosition_mm(3.0, (axis_t)Z); setAxisPosition_mm((X_MIN_BED + LEVEL_CORNERS_INSET), (axis_t)X); setAxisPosition_mm((Y_MAX_BED - LEVEL_CORNERS_INSET), (axis_t)Y); diff --git a/README.md b/README.md index 022f4db62c..7b7f14c6f9 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,14 @@ This firmware is provided to the public as-is with no warranty or guarantee. Its 3D Printing Discord - https://discord.gg/MZrsgVU Marlin Discord - https://discord.gg/n5NJ59y +## Future Goals + +For this branch, we still have some active goals open that we plan to continue working on provided there is continued interest in the project. +- SD Card sub directory traversal +- Volume and leveling state EEPROM storage +- LCD pause messages and responses taken from machine instead of static messages + + ## Creality Firmware Branches - 1.1.9 Firmware (Stable, EOL) [TM_CR10](https://github.com/InsanityAutomation/Marlin/tree/TM_CR10) - 2.0 Firmware (Beta, but well tested) [Creality_Marlin2.0.x](https://github.com/InsanityAutomation/Marlin/tree/Creality_Marlin2.0.x)