From 41ccd4a81b21f19690cec4d7978c8e2f7b00a171 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sat, 12 Dec 2020 16:36:42 -0500 Subject: [PATCH] Fix a partial overwrite of a merge, a few tweaks and version info --- Marlin/Configuration.h | 28 ++++++++----------- Marlin/Version.h | 10 +++---- Marlin/src/lcd/extui/dgus_creality_lcd.cpp | 2 +- .../lib/dgus_creality/DGUSScreenHandler.cpp | 6 ++++ .../creality_touch/DGUSDisplayDef.cpp | 2 +- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index dd16ab5409..43137f280f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -70,13 +70,8 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "CR-6 SE" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "Tinymachines" // Who made the changes. #define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) -#define MACVERSION STRING_CONFIG_H_AUTHOR -#define SOFTVERSION SHORT_BUILD_VERSION -#define MAC_LENGTH 235 -#define MAC_WIDTH 235 -#define MAC_HEIGHT 250 /** * *** VENDORS PLEASE READ *** @@ -885,16 +880,6 @@ */ #define NOZZLE_AS_PROBE -/** - * Auto-leveling needs preheating - */ -#define AUTOLEVEL_NEEDS_PREHEATING - -#if ENABLED(AUTOLEVEL_NEEDS_PREHEATING) - #define AUTOLEVEL_PREHEAT_NOZZLE_TEMP 120 - #define AUTOLEVEL_PREHEAT_BED_TEMP 50 -#endif - /** * Z Servo Probe, such as an endstop switch on a rotating arm. */ @@ -1071,6 +1056,10 @@ //#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing //#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors +// Require minimum nozzle or bed temperature for probing. Currently applies only to the first extruder. +#define PROBE_REQUIRES_MINTEMP_NOZZLE 170 +#define PROBE_REQUIRES_MINTEMP_BED 50 + // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 // :{ 0:'Low', 1:'High' } #define X_ENABLE_ON 0 @@ -1611,6 +1600,13 @@ // For a purge/clean station mounted on the X axis //#define NOZZLE_CLEAN_NO_Y + //#define NOZZLE_CLEAN_MIN_TEMP + #if ENABLED(NOZZLE_CLEAN_MIN_TEMP) + #define NOZZLE_CLEAN_TEMP 170 + // Heat nozzle if temperature is too low. Default behavior is to skip cleaning. + //#define NOZZLE_CLEAN_HEAT_LOWTEMP + #endif + // Explicit wipe G-code script applies to a G12 with no arguments. //#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0" diff --git a/Marlin/Version.h b/Marlin/Version.h index fe0724fbfc..348b06759c 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,25 +28,25 @@ /** * Marlin release version identifier */ -//#define SHORT_BUILD_VERSION "bugfix-2.0.x" +#define SHORT_BUILD_VERSION "TM3DMarlin2.0.7.2-CR6-A" /** * Verbose version identifier which should contain a reference to the location * from where the binary was downloaded or the source code was compiled. */ -//#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION +#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION /** * The STRING_DISTRIBUTION_DATE represents when the binary file was built, * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2019-07-10" +#define STRING_DISTRIBUTION_DATE "2020-12-12" /** * Defines a generic printer name to be output to the LCD after booting Marlin. */ -//#define MACHINE_NAME "3D Printer" +#define MACHINE_NAME "TM3D CR-6" /** * The SOURCE_CODE_URL is the location where users will find the Marlin Source @@ -54,7 +54,7 @@ * has a distinct Github fork— the Source Code URL should just be the main * Marlin repository. */ -//#define SOURCE_CODE_URL "https://github.com/MarlinFirmware/Marlin" +#define SOURCE_CODE_URL "https://github.com/InsanityAutomation/Marlin/tree/CR-6Devel" /** * Default generic printer UUID. diff --git a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp index 57483a762d..31b50939ef 100644 --- a/Marlin/src/lcd/extui/dgus_creality_lcd.cpp +++ b/Marlin/src/lcd/extui/dgus_creality_lcd.cpp @@ -145,7 +145,7 @@ bool hasPrintTimer = false; void onPrintFinished() { ScreenHandler.OnPrintFinished(); } - + void onStoreSettings(char *buff) { // Called when saving to EEPROM (i.e. M500). If the ExtUI needs // permanent data to be stored, it can write up to eeprom_data_size bytes diff --git a/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp index 14a1c62c79..48266de4d3 100644 --- a/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/lib/dgus_creality/DGUSScreenHandler.cpp @@ -43,6 +43,12 @@ #include "../../../../module/printcounter.h" #include "../../../../feature/caselight.h" +#define MACVERSION STRING_CONFIG_H_AUTHOR +#define SOFTVERSION SHORT_BUILD_VERSION +#define MAC_LENGTH X_BED_SIZE +#define MAC_WIDTH Y_BED_SIZE +#define MAC_HEIGHT Z_MAX_POS + #if ENABLED(POWER_LOSS_RECOVERY) #include "../../../../feature/powerloss.h" #endif diff --git a/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.cpp b/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.cpp index 8ff9355c1a..c37056b156 100644 --- a/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.cpp +++ b/Marlin/src/lcd/extui/lib/dgus_creality/creality_touch/DGUSDisplayDef.cpp @@ -361,7 +361,7 @@ const struct VPMapping VPMap[] PROGMEM = { { DGUSLCD_SCREEN_TEMP_PLA, VPList_PreheatPLASettings }, { DGUSLCD_SCREEN_TEMP_ABS, VPList_PreheatABSSettings }, - { DGUSLCD_SCREEN_INFO, VPList_PrintScreen }, + { DGUSLCD_SCREEN_INFO, VPList_Info }, { DGUSLCD_SCREEN_ZOFFSET_LEVEL, VPList_ZOffsetLevel }, { DGUSLCD_SCREEN_LEVELING, VPList_Leveling },