diff --git a/Configuration.h b/Configuration.h index 596e3ed..37558f4 100644 --- a/Configuration.h +++ b/Configuration.h @@ -20,8 +20,8 @@ * */ #pragma once - -#define CONFIG_EXAMPLES_DIR "Kingroon/KP3S" +//#error "Don't build with import-2.1.x configurations!" +//#error "Use the 'bugfix...' or 'release...' configurations matching your Marlin version." /** * Configuration.h @@ -63,7 +63,7 @@ // @section info // Author info of this build printed to the host during boot and M115 -#define STRING_CONFIG_H_AUTHOR "Mechano" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(kubik369)" // Who made the changes. //#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes) // @section machine @@ -94,7 +94,7 @@ * * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] */ -#define BAUDRATE 115200 // GR lower speed serial was 250000 +#define BAUDRATE 250000 //#define BAUD_RATE_GCODE // Enable G-code M575 to set the baud rate @@ -150,9 +150,9 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -#define X_DRIVER_TYPE A4988 -#define Y_DRIVER_TYPE A4988 -#define Z_DRIVER_TYPE A4988 +#define X_DRIVER_TYPE TMC2208_STANDALONE +#define Y_DRIVER_TYPE TMC2208_STANDALONE +#define Z_DRIVER_TYPE TMC2208_STANDALONE //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 @@ -164,7 +164,7 @@ //#define U_DRIVER_TYPE A4988 //#define V_DRIVER_TYPE A4988 //#define W_DRIVER_TYPE A4988 -#define E0_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE TMC2208_STANDALONE //#define E1_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988 @@ -639,7 +639,7 @@ // Above this temperature the heater will be switched off. // This can protect components from overheating, but NOT from shorts and failures. // (Use MINTEMP for thermistor short/failure protection.) -#define HEATER_0_MAXTEMP 305 // GR reaching 300°C +#define HEATER_0_MAXTEMP 305 // GR raggiungiamo i 300 gradi #define HEATER_1_MAXTEMP 275 #define HEATER_2_MAXTEMP 275 #define HEATER_3_MAXTEMP 275 @@ -647,7 +647,7 @@ #define HEATER_5_MAXTEMP 275 #define HEATER_6_MAXTEMP 275 #define HEATER_7_MAXTEMP 275 -#define BED_MAXTEMP 120 // GR bed at 110°C see overshot +#define BED_MAXTEMP 120 // GR raggiungiamo i 300 gradi #define CHAMBER_MAXTEMP 60 /** @@ -656,8 +656,8 @@ * (especially before PID tuning). Setting the target temperature too close to MAXTEMP guarantees * a MAXTEMP shutdown! Use these values to forbid temperatures being set too close to MAXTEMP. */ -#define HOTEND_OVERSHOOT 5 // (°C) Forbid temperatures over MAXTEMP - OVERSHOOT // Necessary for 300°C was 15 -#define BED_OVERSHOOT 10 // (°C) Forbid temperatures over MAXTEMP - OVERSHOOT +#define HOTEND_OVERSHOOT 5 // (°C) Forbid temperatures over MAXTEMP - OVERSHOOT // GR necessario per i 300 gradi +#define BED_OVERSHOOT 10 // (°C) Forbid temperatures over MAXTEMP - OVERSHOOT // GR necessario per i 110 gradi #define COOLER_OVERSHOOT 2 // (°C) Forbid temperatures closer than OVERSHOOT //=========================================================================== @@ -691,9 +691,9 @@ #define DEFAULT_Ki_LIST { 1.08, 1.08 } #define DEFAULT_Kd_LIST { 114.00, 114.00 } #else - #define DEFAULT_Kp 22.20 - #define DEFAULT_Ki 1.08 - #define DEFAULT_Kd 114.00 + #define DEFAULT_Kp 12.93 // GR rilevati con Pronterface sulla mia stampante + #define DEFAULT_Ki 0.78 // GR rilevati con Pronterface sulla mia stampante + #define DEFAULT_Kd 53.51 // GR rilevati con Pronterface sulla mia stampante #endif #else #define BANG_MAX 255 // Limit hotend current while in bang-bang mode; 255=full current @@ -844,8 +844,8 @@ #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. - #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) // GR edit menu for PID - #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) // GR PID autotune menu + #define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of flash) // GR Un menu per editare PID a mano + #define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of flash) // GR Un menu per PID autotune #endif // @section safety @@ -1175,8 +1175,13 @@ #define X_MAX_ENDSTOP_HIT_STATE HIGH #define Y_MIN_ENDSTOP_HIT_STATE LOW #define Y_MAX_ENDSTOP_HIT_STATE HIGH -#define Z_MIN_ENDSTOP_HIT_STATE LOW -#define Z_MAX_ENDSTOP_HIT_STATE HIGH +#ifdef USE_BLTOUCH + #define Z_MIN_ENDSTOP_HIT_STATE HIGH + #define Z_MAX_ENDSTOP_HIT_STATE LOW +#else + #define Z_MIN_ENDSTOP_HIT_STATE LOW + #define Z_MAX_ENDSTOP_HIT_STATE HIGH +#endif #define I_MIN_ENDSTOP_HIT_STATE HIGH #define I_MAX_ENDSTOP_HIT_STATE HIGH #define J_MIN_ENDSTOP_HIT_STATE HIGH @@ -1310,7 +1315,7 @@ #endif #endif -#define DEFAULT_EJERK 15.0 // May be used by Linear Advance +#define DEFAULT_EJERK 15.0 // May be used by Linear Advance // GR era 5 Linear Advance vuole almeno 10 /** * Junction Deviation Factor @@ -1349,10 +1354,11 @@ * The probe replaces the Z-MIN endstop and is used for Z homing. * (Automatically enables USE_PROBE_FOR_Z_HOMING.) */ -#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - -// Force the use of the probe for Z-axis homing -//#define USE_PROBE_FOR_Z_HOMING +#ifdef USE_BLTOUCH + #define USE_PROBE_FOR_Z_HOMING +#else + #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +#endif /** * Z_MIN_PROBE_PIN @@ -1367,7 +1373,9 @@ * - Normally-closed (NC) also connect to GND. * - Normally-open (NO) also connect to 5V. */ -//#define Z_MIN_PROBE_PIN -1 +#ifdef USE_BLTOUCH + #define Z_MIN_PROBE_PIN Z_MAX_PIN +#endif /** * Probe Type @@ -1409,7 +1417,9 @@ /** * The BLTouch probe uses a Hall effect sensor and emulates a servo. */ -//#define BLTOUCH +#ifdef USE_BLTOUCH + #define BLTOUCH +#endif /** * MagLev V4 probe by MDD @@ -1570,7 +1580,7 @@ * | [-] | * O-- FRONT --+ */ -#define NOZZLE_TO_PROBE_OFFSET { 30.0, -1.0, -2.605 } +#define NOZZLE_TO_PROBE_OFFSET { X_PROBE_OFFSET, Y_PROBE_OFFSET, Z_PROBE_OFFSET } // Enable and set to use a specific tool for probing. Disable to allow any tool. #define PROBING_TOOL 0 @@ -1807,8 +1817,8 @@ // @section geometry // The size of the printable area -#define X_BED_SIZE 180 // GR was 165 -#define Y_BED_SIZE 180 // GR was 170 +#define X_BED_SIZE 172 +#define Y_BED_SIZE 172 // Travel limits (linear=mm, rotational=°) after homing, corresponding to endstop positions. #define X_MIN_POS -10 @@ -1884,9 +1894,9 @@ * RAMPS-based boards use SERVO3_PIN for the first runout sensor. * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc. */ -//#define FILAMENT_RUNOUT_SENSOR +#define FILAMENT_RUNOUT_SENSOR #if ENABLED(FILAMENT_RUNOUT_SENSOR) - #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500. + #define FIL_RUNOUT_ENABLED_DEFAULT false // 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_STATE LOW // Pin state indicating that filament is NOT present. @@ -2027,9 +2037,12 @@ */ //#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_LINEAR -//#define AUTO_BED_LEVELING_BILINEAR +#ifdef USE_BLTOUCH + #define AUTO_BED_LEVELING_BILINEAR +#else + #define MESH_BED_LEVELING +#endif //#define AUTO_BED_LEVELING_UBL -#define MESH_BED_LEVELING /** * Commands to execute at the end of G29 probing. @@ -2048,10 +2061,10 @@ /** * Auto-leveling needs preheating */ -#define PREHEAT_BEFORE_LEVELING +// #define PREHEAT_BEFORE_LEVELING // GR commento nessun preriscaldamento prima del livellamento #if ENABLED(PREHEAT_BEFORE_LEVELING) - #define LEVELING_NOZZLE_TEMP 120 // (°C) Only applies to E0 at this time - #define LEVELING_BED_TEMP 50 + #define LEVELING_NOZZLE_TEMP 210 // (°C) Only applies to E0 at this time // GR era 120 + #define LEVELING_BED_TEMP 60 // GR era 50 #endif /** @@ -2185,7 +2198,7 @@ //=========================================================================== #define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed - #define GRID_MAX_POINTS_X 4 // Don't use more than 7 points per axis, implementation limited. // GR 4x4 16 point manual leveling + #define GRID_MAX_POINTS_X 4 // Don't use more than 7 points per axis, implementation limited. // GR 4 punti di calibrazione manuale #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS @@ -2201,7 +2214,7 @@ #if ENABLED(LCD_BED_LEVELING) #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment - //#define MESH_EDIT_MENU // Add a menu to edit mesh points + #define MESH_EDIT_MENU // Add a menu to edit mesh points #endif // Add a menu item to move between bed corners for manual bed adjustment @@ -2263,11 +2276,13 @@ * - Allows Z homing only when XY positions are known and trusted. * - If stepper drivers sleep, XY homing may be required again before Z homing. */ -//#define Z_SAFE_HOMING +#ifdef USE_BLTOUCH + #define Z_SAFE_HOMING +#endif #if ENABLED(Z_SAFE_HOMING) - #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing - #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing + #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing + #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing //#define Z_SAFE_HOMING_POINT_ABSOLUTE // Ignore home offsets (M206) for Z homing position #endif @@ -2356,7 +2371,7 @@ #define EEPROM_BOOT_SILENT // Keep M503 quiet and only give errors during first load #if ENABLED(EEPROM_SETTINGS) //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. - #define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build. // GR init EEPROM on first boot of new firmware + #define EEPROM_INIT_NOW // Init EEPROM on first boot after a new build. #endif // @section host @@ -2389,14 +2404,14 @@ // Preheat Constants - Up to 10 are supported without changes // #define PREHEAT_1_LABEL "PLA" -#define PREHEAT_1_TEMP_HOTEND 210 // GR better value for PLA +#define PREHEAT_1_TEMP_HOTEND 210 #define PREHEAT_1_TEMP_BED 60 #define PREHEAT_1_TEMP_CHAMBER 35 #define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 #define PREHEAT_2_LABEL "PETG" -#define PREHEAT_2_TEMP_HOTEND 235 // GR better value for PETG -#define PREHEAT_2_TEMP_BED 75 +#define PREHEAT_2_TEMP_HOTEND 235 +#define PREHEAT_2_TEMP_BED 80 #define PREHEAT_2_TEMP_CHAMBER 35 #define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 @@ -3414,13 +3429,13 @@ //#define DISABLE_ENCODER // Disable the click encoder, if any //#define TOUCH_IDLE_SLEEP_MINS 5 // (minutes) Display Sleep after a period of inactivity. Set with M255 S. - #define TOUCH_SCREEN_CALIBRATION + #define TOUCH_SCREEN_CALIBRATION - //#define TOUCH_CALIBRATION_X -11758 // GR calibrate at first boot - //#define TOUCH_CALIBRATION_Y 8553 - //#define TOUCH_OFFSET_X 353 - //#define TOUCH_OFFSET_Y -16 - //#define TOUCH_ORIENTATION TOUCH_LANDSCAPE + //#define TOUCH_CALIBRATION_X -11758 // GR deve chiedere la calibrazione + //#define TOUCH_CALIBRATION_Y 8553 // GR deve chiedere la calibrazione + //#define TOUCH_OFFSET_X 353 // GR deve chiedere la calibrazione + //#define TOUCH_OFFSET_Y -16 // GR deve chiedere la calibrazione + //#define TOUCH_ORIENTATION TOUCH_LANDSCAPE // GR deve chiedere la calibrazione #if ALL(TOUCH_SCREEN_CALIBRATION, EEPROM_SETTINGS) #define TOUCH_CALIBRATION_AUTO_SAVE // Auto save successful calibration values to EEPROM diff --git a/Configuration_adv.h b/Configuration_adv.h index cb2ad06..3c9c919 100644 --- a/Configuration_adv.h +++ b/Configuration_adv.h @@ -21,8 +21,6 @@ */ #pragma once -#define CONFIG_EXAMPLES_DIR "Kingroon/KP3S" - /** * Configuration_adv.h * @@ -1084,7 +1082,7 @@ // // Add the G35 command to read bed corners to help adjust screws. Requires a bed probe. // -//#define ASSISTED_TRAMMING +// #define ASSISTED_TRAMMING #if ENABLED(ASSISTED_TRAMMING) // Define from 3 to 9 points to probe. @@ -1099,7 +1097,7 @@ #define RESTORE_LEVELING_AFTER_G35 // Enable to restore leveling setup after operation //#define REPORT_TRAMMING_MM // Report Z deviation (mm) for each point relative to the first - //#define ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu + #define ASSISTED_TRAMMING_WIZARD // Add a Tramming Wizard to the LCD menu // GR un wizard sul menu //#define ASSISTED_TRAMMING_WAIT_POSITION { X_CENTER, Y_CENTER, 30 } // Move the nozzle out of the way for adjustment @@ -1182,20 +1180,20 @@ * X<1> Set the given parameters only for the X axis. * Y<1> Set the given parameters only for the Y axis. */ -#define INPUT_SHAPING_X // GR activate input shaping +#define INPUT_SHAPING_X #define INPUT_SHAPING_Y #if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y) #if ENABLED(INPUT_SHAPING_X) - #define SHAPING_FREQ_X 40 // (Hz) The default dominant resonant frequency on the X axis. - #define SHAPING_ZETA_X 0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping). + #define SHAPING_FREQ_X 43.30 // (Hz) The default dominant resonant frequency on the X axis. // GR calcolato con tower + #define SHAPING_ZETA_X 0.0f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping). // GR calcolato con tower #endif #if ENABLED(INPUT_SHAPING_Y) - #define SHAPING_FREQ_Y 40 // (Hz) The default dominant resonant frequency on the Y axis. - #define SHAPING_ZETA_Y 0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping). + #define SHAPING_FREQ_Y 28.50 // (Hz) The default dominant resonant frequency on the Y axis. // GR calcolato con tower + #define SHAPING_ZETA_Y 0.0f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping). // GR calcolato con tower #endif //#define SHAPING_MIN_FREQ 20 // By default the minimum of the shaping frequencies. Override to affect SRAM usage. //#define SHAPING_MAX_STEPRATE 10000 // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage. - #define SHAPING_MENU // Add a menu to the LCD to set shaping parameters. // GR menu for values + #define SHAPING_MENU // Add a menu to the LCD to set shaping parameters. // GR un menu per l'input shaping #endif // @section motion @@ -1574,7 +1572,7 @@ //#define LCD_TIMEOUT_TO_STATUS 15000 // (ms) // Scroll a longer status message into view - #define STATUS_MESSAGE_SCROLLING // GR long messages scrolling + //#define STATUS_MESSAGE_SCROLLING // Apply a timeout to low-priority status messages //#define STATUS_MESSAGE_TIMEOUT_SEC 30 // (seconds) @@ -1685,7 +1683,7 @@ //#define NO_SD_AUTOSTART // Remove auto#.g file support completely to save some Flash, SRAM //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files - //#define ONE_CLICK_PRINT // Prompt to print the newest file on inserted media + //#define ONE_CLICK_PRINT // Prompt to print newest file on sdcard //#define BROWSE_MEDIA_ON_INSERT // Open the file browser when media is inserted //#define MEDIA_MENU_AT_TOP // Force the media menu to be listed on the top of the main menu @@ -1704,9 +1702,9 @@ * an option on the LCD screen to continue the print from the last-known * point in the file. */ - //#define POWER_LOSS_RECOVERY + #define POWER_LOSS_RECOVERY // GR recupera dopo interruzione corrente #if ENABLED(POWER_LOSS_RECOVERY) - #define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500) + #define PLR_ENABLED_DEFAULT true // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500) // GR attivo di default //#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss //#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS) //#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module. @@ -1774,7 +1772,7 @@ //#define LONG_FILENAME_WRITE_SUPPORT // Create / delete files with long filenames via M28, M30, and Binary Transfer Protocol //#define M20_TIMESTAMP_SUPPORT // Include timestamps by adding the 'T' flag to M20 commands - #define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu // GR long filename scrolling + #define SCROLL_LONG_FILENAMES // Scroll long filenames in the SD card menu // GR scrolling dei nomi dei file lunghi //#define SD_ABORT_NO_COOLDOWN // Leave the heaters on after Stop Print (not recommended!) @@ -2084,12 +2082,12 @@ // Specify additional languages for the UI. Default specified by LCD_LANGUAGE. // #if ANY(DOGLCD, TFT_COLOR_UI, TOUCH_UI_FTDI_EVE, IS_DWIN_MARLINUI, ANYCUBIC_LCD_VYPER) - #define LCD_LANGUAGE_2 fr // GR 5 languages - #define LCD_LANGUAGE_3 de - #define LCD_LANGUAGE_4 es - #define LCD_LANGUAGE_5 it + #define LCD_LANGUAGE_2 fr // GR abilito tutte 5 le lingue + #define LCD_LANGUAGE_3 de // GR abilito tutte 5 le lingue + #define LCD_LANGUAGE_4 es // GR abilito tutte 5 le lingue + #define LCD_LANGUAGE_5 it // GR abilito tutte 5 le lingue #ifdef LCD_LANGUAGE_2 - #define LCD_LANGUAGE_AUTO_SAVE // Automatically save language to EEPROM on change // GR autosave on select + #define LCD_LANGUAGE_AUTO_SAVE // Automatically save language to EEPROM on change // GR salva automaticamente la lingua #endif #endif @@ -2276,12 +2274,12 @@ * * See https://marlinfw.org/docs/features/lin_advance.html for full instructions. */ -#define LIN_ADVANCE // GR activate linear advance +#define LIN_ADVANCE //GR linear advance #if ENABLED(LIN_ADVANCE) #if ENABLED(DISTINCT_E_FACTORS) #define ADVANCE_K { 0.22 } // (mm) Compression length per 1mm/s extruder speed, per extruder #else - #define ADVANCE_K 0.0 // (mm) Compression length applying to all extruders // GR value set to 0 + #define ADVANCE_K 0.04 // (mm) Compression length applying to all extruders // GR calcolato in precedenza #endif //#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L. //#define LA_DEBUG // Print debug information to serial during operation. Disable for production use. @@ -2840,7 +2838,7 @@ * * Enable PARK_HEAD_ON_PAUSE to add the G-code M125 Pause and Park. */ -//#define ADVANCED_PAUSE_FEATURE +#define ADVANCED_PAUSE_FEATURE #if ENABLED(ADVANCED_PAUSE_FEATURE) #define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate. #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract.