diff --git a/config/examples/Creality/CR-10 Mini/MEEB-3DP/Configuration.h b/config/examples/Creality/CR-10 Mini/MEEB-3DP/Configuration.h index 70934b9cfc..5a01501324 100644 --- a/config/examples/Creality/CR-10 Mini/MEEB-3DP/Configuration.h +++ b/config/examples/Creality/CR-10 Mini/MEEB-3DP/Configuration.h @@ -143,7 +143,7 @@ #endif // Name displayed in the LCD "Ready" message and Info menu -#define CUSTOM_MACHINE_NAME "CR10-mini" +#define CUSTOM_MACHINE_NAME "CR-10 Mini" // Printer's unique ID, used by some programs to differentiate between machines. // Choose your own or use a service like https://www.uuidgenerator.net/version4 diff --git a/config/examples/Creality/CR-10 S4/CrealityV1/Configuration.h b/config/examples/Creality/CR-10 S4/CrealityV1/Configuration.h index b65305d688..59fcd65e89 100644 --- a/config/examples/Creality/CR-10 S4/CrealityV1/Configuration.h +++ b/config/examples/Creality/CR-10 S4/CrealityV1/Configuration.h @@ -1440,7 +1440,7 @@ #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. - #define FIL_RUNOUT_PIN 2 // Creality CR10-S stock sensor + #define FIL_RUNOUT_PIN 2 // Creality CR-10 S4 stock sensor #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present. #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. diff --git a/config/examples/Creality/CR-10 S5/BigTreeTech SKR Mini E3 1.2 with TFT35 E3 V3.0/Configuration.h b/config/examples/Creality/CR-10 S5/BigTreeTech SKR Mini E3 1.2 with TFT35 E3 V3.0/Configuration.h index 0036e5fd98..93931ec587 100644 --- a/config/examples/Creality/CR-10 S5/BigTreeTech SKR Mini E3 1.2 with TFT35 E3 V3.0/Configuration.h +++ b/config/examples/Creality/CR-10 S5/BigTreeTech SKR Mini E3 1.2 with TFT35 E3 V3.0/Configuration.h @@ -1440,7 +1440,7 @@ #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. - #define FIL_RUNOUT_PIN 2 // Creality CR10-S stock sensor + #define FIL_RUNOUT_PIN 2 // Creality CR-10 S5 stock sensor #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present. #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. diff --git a/config/examples/Creality/CR-10 S5/CrealityV1/Configuration.h b/config/examples/Creality/CR-10 S5/CrealityV1/Configuration.h index 3388b975e1..2f8b5ce6a6 100644 --- a/config/examples/Creality/CR-10 S5/CrealityV1/Configuration.h +++ b/config/examples/Creality/CR-10 S5/CrealityV1/Configuration.h @@ -1440,7 +1440,7 @@ #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. - #define FIL_RUNOUT_PIN 2 // Creality CR10-S stock sensor + #define FIL_RUNOUT_PIN 2 // Creality CR-10 S5 stock sensor #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present. #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. diff --git a/config/examples/Creality/CR-10 V2/Configuration.h b/config/examples/Creality/CR-10 V2/Configuration.h index 25206eb60d..25e4c3a29f 100644 --- a/config/examples/Creality/CR-10 V2/Configuration.h +++ b/config/examples/Creality/CR-10 V2/Configuration.h @@ -76,7 +76,7 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "fran6p, CR10-V2)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "fran6p, CR-10 V2)" // Who made the changes. //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** @@ -150,7 +150,7 @@ #endif // Name displayed in the LCD "Ready" message and Info menu -#define CUSTOM_MACHINE_NAME "CR10-V2" +#define CUSTOM_MACHINE_NAME "CR-10 V2" // Printer's unique ID, used by some programs to differentiate between machines. // Choose your own or use a service like https://www.uuidgenerator.net/version4 @@ -601,7 +601,7 @@ //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders) // Set/get with gcode: M301 E[extruder number, 0-2] - // CR10-V2 + // CR-10 V2 #if ENABLED(PID_PARAMS_PER_HOTEND) // Specify up to one value per hotend here, according to your setup. // If there are fewer values, the last one applies to the remaining hotends. @@ -650,7 +650,7 @@ // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) - // CR10-V2 24V 240W + // CR-10 V2 24V 240W #define DEFAULT_bedKp 690.34 #define DEFAULT_bedKi 111.47 #define DEFAULT_bedKd 1068.83 @@ -1458,7 +1458,7 @@ #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. - #define FIL_RUNOUT_PIN 2 // Creality CR10-S stock sensor + #define FIL_RUNOUT_PIN 2 // Creality CR-10 V2 stock sensor #define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present. #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. diff --git a/config/examples/Creality/CR-10 V3/Configuration.h b/config/examples/Creality/CR-10 V3/Configuration.h index e4abf1deb9..3d34e4302b 100644 --- a/config/examples/Creality/CR-10 V3/Configuration.h +++ b/config/examples/Creality/CR-10 V3/Configuration.h @@ -26,7 +26,7 @@ */ // Is the BLTouch option installed? -#define CR10V3_BLTOUCH +//#define CR10V3_BLTOUCH /** * Configuration.h @@ -76,7 +76,7 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "Aaron Just, CR10-V3)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "Aaron Just, CR-10 V3)" // Who made the changes. //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) /** @@ -150,7 +150,7 @@ #endif // Name displayed in the LCD "Ready" message and Info menu -#define CUSTOM_MACHINE_NAME "CR10-V3" +#define CUSTOM_MACHINE_NAME "CR-10 V3" // Printer's unique ID, used by some programs to differentiate between machines. // Choose your own or use a service like https://www.uuidgenerator.net/version4 @@ -601,7 +601,7 @@ //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders) // Set/get with gcode: M301 E[extruder number, 0-2] - // CR10-V3 + // CR-10 V3 #if ENABLED(PID_PARAMS_PER_HOTEND) // Specify up to one value per hotend here, according to your setup. // If there are fewer values, the last one applies to the remaining hotends. @@ -650,7 +650,7 @@ // 120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) // from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) - // CR10-V3 24V 240W + // CR-10 V3 24V 240W #define DEFAULT_bedKp 690.34 #define DEFAULT_bedKi 111.47 #define DEFAULT_bedKd 1068.83 @@ -935,7 +935,7 @@ * Default Axis Steps Per Unit (steps/mm) * Override with M92 * X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]] - * Updated E Steps to 382.14 for CR10-V3 Direct Drive + * Updated E Steps to 382.14 for CR-10 V3 Direct Drive */ #define DEFAULT_AXIS_STEPS_PER_UNIT { 80.00, 80.00, 400.00, 407 } @@ -1353,7 +1353,7 @@ // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. -// Updated INVERT_E0_DIR for CR10-V3 Direct Drive +// Updated INVERT_E0_DIR for CR-10 V3 Direct Drive #define INVERT_E0_DIR true #define INVERT_E1_DIR false #define INVERT_E2_DIR false @@ -1461,7 +1461,7 @@ #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. - #define FIL_RUNOUT_PIN 2 // Creality CR10-S stock sensor + #define FIL_RUNOUT_PIN 2 // Creality CR-10 V3 stock sensor #define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present. //#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. @@ -1713,7 +1713,9 @@ #define LEVEL_CORNERS_HEIGHT 0.0 // (mm) Z height of nozzle at leveling points #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Z height of nozzle between leveling points #define LEVEL_CENTER_TOO // Move to the center after the last corner - #define LEVEL_CORNERS_USE_PROBE + #if ENABLED(CR10V3_BLTOUCH) + #define LEVEL_CORNERS_USE_PROBE + #endif #if ENABLED(LEVEL_CORNERS_USE_PROBE) #define LEVEL_CORNERS_PROBE_TOLERANCE 0.1 #define LEVEL_CORNERS_VERIFY_RAISED // After adjustment triggers the probe, re-probe to verify diff --git a/config/examples/Creality/CR-10 V3/Configuration_adv.h b/config/examples/Creality/CR-10 V3/Configuration_adv.h index cc6ec53b5a..3c6b23f48c 100644 --- a/config/examples/Creality/CR-10 V3/Configuration_adv.h +++ b/config/examples/Creality/CR-10 V3/Configuration_adv.h @@ -928,7 +928,9 @@ // // Add the G35 command to read bed corners to help adjust screws. Requires a bed probe. // -#define ASSISTED_TRAMMING +#if ENABLED(CR10V3_BLTOUCH) + #define ASSISTED_TRAMMING +#endif #if ENABLED(ASSISTED_TRAMMING) // Define positions for probe points. @@ -1976,7 +1978,9 @@ * Repeatedly attempt G29 leveling until it succeeds. * Stop after G29_MAX_RETRIES attempts. */ -#define G29_RETRY_AND_RECOVER +#if ENABLED(CR10V3_BLTOUCH) + #define G29_RETRY_AND_RECOVER +#endif #if ENABLED(G29_RETRY_AND_RECOVER) #define G29_MAX_RETRIES 3 #define G29_HALT_ON_FAILURE diff --git a/config/examples/Creality/CR-10S/CrealityV1/Configuration.h b/config/examples/Creality/CR-10S/CrealityV1/Configuration.h index c2cd2e096f..c6debe3979 100644 --- a/config/examples/Creality/CR-10S/CrealityV1/Configuration.h +++ b/config/examples/Creality/CR-10S/CrealityV1/Configuration.h @@ -1438,7 +1438,7 @@ #if ENABLED(FILAMENT_RUNOUT_SENSOR) #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. - #define FIL_RUNOUT_PIN 2 // Creality CR10-S stock sensor + #define FIL_RUNOUT_PIN 2 // Creality CR-10S stock sensor #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present. #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.