From c163d8a9f7c7c250471d556eb5cf8ddfe303eefe Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 13 Mar 2018 22:40:20 +0100 Subject: [PATCH 1/3] Variant file for MK3 --- .../variants/1_75mm_MK3-EINSy10a-E3Dv6full.h | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h index a00ca8f1..a74750b6 100644 --- a/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h @@ -6,6 +6,7 @@ *------------------------------------*/ // Printer revision +#define PRINTER_TYPE PRINTER_MK3 #define FILAMENT_SIZE "1_75mm_MK3" #define NOZZLE_TYPE "E3Dv6full" @@ -17,6 +18,7 @@ // Electronics #define MOTHERBOARD BOARD_EINSY_1_0a +#define HAS_SECOND_SERIAL_PORT // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) @@ -102,6 +104,25 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o // Automatic recovery after crash is detected #define AUTOMATIC_RECOVERY_AFTER_CRASH +// New XYZ calibration +#define NEW_XYZCAL + +// Watchdog support +#define WATCHDOG + +// Power panic +#define UVLO_SUPPORT + +// Fan check +#define FANCHECK + +// Safety timer +#define SAFETYTIMER + +// Filament sensor +#define PAT9125 + + // Disable some commands #define _DISABLE_M42_M226 @@ -143,6 +164,11 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. #endif /* DEBUG_BUILD */ +//#define EXPERIMENTAL_FEATURES +//#define TMC2130_LINEARITY_CORRECTION +//#define TMC2130_VARIABLE_RESOLUTION + + /*------------------------------------ TMC2130 default settings @@ -211,8 +237,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis //new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) -#define TMC2130_CURRENTS_H {13, 20, 25, 35} // default holding currents for all axes -#define TMC2130_CURRENTS_R {13, 20, 25, 35} // default running currents for all axes +#define TMC2130_CURRENTS_H {16, 20, 28, 36} // default holding currents for all axes +#define TMC2130_CURRENTS_R {16, 20, 28, 36} // default running currents for all axes #define TMC2130_UNLOAD_CURRENT_R 12 // lowe current for M600 to protect filament sensor //#define TMC2130_DEBUG @@ -266,9 +292,6 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -#define PAT9125 -#define FANCHECK - /*------------------------------------ LOAD/UNLOAD FILAMENT SETTINGS @@ -336,7 +359,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DIGIPOT_MOTOR_CURRENT_LOUD {135,135,135,135,135} // Motor Current settings for RAMBo mini PWM value = MotorCurrentSetting * 255 / range -#if MOTHERBOARD == 200 || MOTHERBOARD == 203 || MOTHERBOARD == 310 +#if MOTHERBOARD == 200 || MOTHERBOARD == 203 #define MOTOR_CURRENT_PWM_RANGE 2000 #define DEFAULT_PWM_MOTOR_CURRENT {400, 750, 750} // {XY,Z,E} #define DEFAULT_PWM_MOTOR_CURRENT_LOUD {400, 750, 750} // {XY,Z,E} From 81cd96b8fe900e454955cb7a97acae52b1e3f31a Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 13 Mar 2018 23:02:46 +0100 Subject: [PATCH 2/3] Variant file for MK25 + cond. translation --- Firmware/Configuration_prusa.h | 193 +++--------------- Firmware/Marlin_main.cpp | 6 +- Firmware/ultralcd.cpp | 4 + .../variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h | 26 +-- 4 files changed, 54 insertions(+), 175 deletions(-) diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h index a74750b6..63ffa05c 100644 --- a/Firmware/Configuration_prusa.h +++ b/Firmware/Configuration_prusa.h @@ -6,20 +6,22 @@ *------------------------------------*/ // Printer revision -#define PRINTER_TYPE PRINTER_MK3 -#define FILAMENT_SIZE "1_75mm_MK3" +#define PRINTER_TYPE PRINTER_MK25 +#define FILAMENT_SIZE "1_75mm_MK25" #define NOZZLE_TYPE "E3Dv6full" // Developer flag #define DEVELOPER // Printer name -#define CUSTOM_MENDEL_NAME "Prusa i3 MK3" +#define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5" // Electronics -#define MOTHERBOARD BOARD_EINSY_1_0a -#define HAS_SECOND_SERIAL_PORT +#define MOTHERBOARD BOARD_RAMBO_MINI_1_3 +#define HEATBED_V2 +#define STEEL_SHEET +#define TACH0PULLUP // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) //#define E3D_PT100_EXTRUDER_WITH_AMP @@ -33,9 +35,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,280} -//#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,560} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,133} // Endstop inverting const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. @@ -43,12 +43,12 @@ const bool Y_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. // Direction inverting -#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true +#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true #define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false -#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true -#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true +#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false // Home position #define MANUAL_X_HOME_POS 0 @@ -56,10 +56,10 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MANUAL_Z_HOME_POS 0.2 // Travel limits after homing -#define X_MAX_POS 255 +#define X_MAX_POS 250 #define X_MIN_POS 0 #define Y_MAX_POS 210 -#define Y_MIN_POS -4 //orig -4 +#define Y_MIN_POS -4 #define Z_MAX_POS 210 #define Z_MIN_POS 0.15 @@ -84,54 +84,11 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) -//Silent mode limits -#define SILENT_MAX_ACCEL 960 // max axxeleration in silent mode in mm/s^2 -#define SILENT_MAX_ACCEL_ST (100*SILENT_MAX_ACCEL) // max accel in steps/s^2 -#define SILENT_MAX_FEEDRATE 172 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (172mm/s=9600mm/min>2700mm/min) - -//Normal mode limits -#define NORMAL_MAX_ACCEL 2500 // Y-axis max axxeleration in normal mode in mm/s^2 -#define NORMAL_MAX_ACCEL_ST (100*NORMAL_MAX_ACCEL) // max accel in steps/s^2 -#define NORMAL_MAX_FEEDRATE 200 //max feedrate in mm/s, because mode switched to normal for homming , this value limits also homing, it should be greater (172mm/s=9600mm/min>2700mm/min) - -//#define SIMPLE_ACCEL_LIMIT //new limitation method for normal/silent - //number of bytes from end of the file to start check #define END_FILE_SECTION 10000 #define Z_AXIS_ALWAYS_ON 1 -// Automatic recovery after crash is detected -#define AUTOMATIC_RECOVERY_AFTER_CRASH - -// New XYZ calibration -#define NEW_XYZCAL - -// Watchdog support -#define WATCHDOG - -// Power panic -#define UVLO_SUPPORT - -// Fan check -#define FANCHECK - -// Safety timer -#define SAFETYTIMER - -// Filament sensor -#define PAT9125 - - -// Disable some commands -#define _DISABLE_M42_M226 - -// Minimum ambient temperature limit to start triggering MINTEMP errors [C] -// this value is litlebit higher that real limit, because ambient termistor is on the board and is temperated from it, -// temperature inside the case is around 31C for ambient temperature 25C, when the printer is powered on long time and idle -// the real limit is 15C (same as MINTEMP limit), this is because 15C is end of scale for both used thermistors (bed, heater) -#define MINTEMP_MINAMBIENT 25 -#define MINTEMP_MINAMBIENT_RAW 978 //#define DEBUG_BUILD #ifdef DEBUG_BUILD @@ -148,7 +105,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o //#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored //#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored //#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored -#define DEBUG_DISABLE_STARTMSGS //no startup messages +//#define DEBUG_DISABLE_STARTMSGS //no startup messages //#define DEBUG_DISABLE_MINTEMP //mintemp error ignored //#define DEBUG_DISABLE_SWLIMITS //sw limits ignored //#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line @@ -159,92 +116,11 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o //#define DEBUG_BLINK_ACTIVE //#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled) //#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled) -#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line -#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. -#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. +//#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line +//#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. +//#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. #endif /* DEBUG_BUILD */ -//#define EXPERIMENTAL_FEATURES -//#define TMC2130_LINEARITY_CORRECTION -//#define TMC2130_VARIABLE_RESOLUTION - - - -/*------------------------------------ - TMC2130 default settings - *------------------------------------*/ - -#define TMC2130_FCLK 12000000 // fclk = 12MHz - -#define TMC2130_USTEPS_XY 16 // microstep resolution for XY axes -#define TMC2130_USTEPS_Z 16 // microstep resolution for Z axis -#define TMC2130_USTEPS_E 32 // microstep resolution for E axis -#define TMC2130_INTPOL_XY 1 // extrapolate 256 for XY axes -#define TMC2130_INTPOL_Z 1 // extrapolate 256 for Z axis -#define TMC2130_INTPOL_E 1 // extrapolate 256 for E axis - -#define TMC2130_PWM_GRAD_X 2 // PWMCONF -#define TMC2130_PWM_AMPL_X 230 // PWMCONF -#define TMC2130_PWM_AUTO_X 1 // PWMCONF -#define TMC2130_PWM_FREQ_X 2 // PWMCONF - -#define TMC2130_PWM_GRAD_Y 2 // PWMCONF -#define TMC2130_PWM_AMPL_Y 235 // PWMCONF -#define TMC2130_PWM_AUTO_Y 1 // PWMCONF -#define TMC2130_PWM_FREQ_Y 2 // PWMCONF - -#define TMC2130_PWM_GRAD_E 2 // PWMCONF -#define TMC2130_PWM_AMPL_E 235 // PWMCONF -#define TMC2130_PWM_AUTO_E 1 // PWMCONF -#define TMC2130_PWM_FREQ_E 2 // PWMCONF - -#define TMC2130_PWM_GRAD_Z 4 // PWMCONF -#define TMC2130_PWM_AMPL_Z 200 // PWMCONF -#define TMC2130_PWM_AUTO_Z 1 // PWMCONF -#define TMC2130_PWM_FREQ_Z 2 // PWMCONF - -#define TMC2130_PWM_GRAD_E 4 // PWMCONF -#define TMC2130_PWM_AMPL_E 240 // PWMCONF -#define TMC2130_PWM_AUTO_E 1 // PWMCONF -#define TMC2130_PWM_FREQ_E 2 // PWMCONF - -#define TMC2130_TOFF_XYZ 3 // CHOPCONF // fchop = 27.778kHz -#define TMC2130_TOFF_E 3 // CHOPCONF // fchop = 27.778kHz -//#define TMC2130_TOFF_E 4 // CHOPCONF // fchop = 21.429kHz -//#define TMC2130_TOFF_E 5 // CHOPCONF // fchop = 17.442kHz - -//#define TMC2130_STEALTH_E // Extruder stealthChop mode -//#define TMC2130_CNSTOFF_E // Extruder constant-off-time mode (similar to MK2) - -//#define TMC2130_PWM_DIV 683 // PWM frequency divider (1024, 683, 512, 410) -#define TMC2130_PWM_DIV 512 // PWM frequency divider (1024, 683, 512, 410) -#define TMC2130_PWM_CLK (2 * TMC2130_FCLK / TMC2130_PWM_DIV) // PWM frequency (23.4kHz, 35.1kHz, 46.9kHz, 58.5kHz for 12MHz fclk) - -#define TMC2130_TPWMTHRS 0 // TPWMTHRS - Sets the switching speed threshold based on TSTEP from stealthChop to spreadCycle mode -#define TMC2130_THIGH 0 // THIGH - unused - -//#define TMC2130_TCOOLTHRS_X 450 // TCOOLTHRS - coolstep treshold -//#define TMC2130_TCOOLTHRS_Y 450 // TCOOLTHRS - coolstep treshold -#define TMC2130_TCOOLTHRS_X 430 // TCOOLTHRS - coolstep treshold -#define TMC2130_TCOOLTHRS_Y 430 // TCOOLTHRS - coolstep treshold -#define TMC2130_TCOOLTHRS_Z 500 // TCOOLTHRS - coolstep treshold -#define TMC2130_TCOOLTHRS_E 500 // TCOOLTHRS - coolstep treshold - -#define TMC2130_SG_HOMING 1 // stallguard homing -#define TMC2130_SG_THRS_X 3 // stallguard sensitivity for X axis -#define TMC2130_SG_THRS_Y 3 // stallguard sensitivity for Y axis -#define TMC2130_SG_THRS_Z 3 // stallguard sensitivity for Z axis -#define TMC2130_SG_THRS_E 3 // stallguard sensitivity for E axis - -//new settings is possible for vsense = 1, running current value > 31 set vsense to zero and shift both currents by 1 bit right (Z axis only) -#define TMC2130_CURRENTS_H {16, 20, 28, 36} // default holding currents for all axes -#define TMC2130_CURRENTS_R {16, 20, 28, 36} // default running currents for all axes -#define TMC2130_UNLOAD_CURRENT_R 12 // lowe current for M600 to protect filament sensor - -//#define TMC2130_DEBUG -//#define TMC2130_DEBUG_WR -//#define TMC2130_DEBUG_RD - /*------------------------------------ EXTRUDER SETTINGS @@ -282,7 +158,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #endif // Extrude mintemp -#define EXTRUDE_MINTEMP 190 +#define EXTRUDE_MINTEMP 180 // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 @@ -292,6 +168,11 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed +#define PAT9125 //!< Filament sensor +#define FANCHECK +//#define WATCHDOG +#define SAFETYTIMER + /*------------------------------------ LOAD/UNLOAD FILAMENT SETTINGS @@ -359,10 +240,12 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DIGIPOT_MOTOR_CURRENT_LOUD {135,135,135,135,135} // Motor Current settings for RAMBo mini PWM value = MotorCurrentSetting * 255 / range -#if MOTHERBOARD == 200 || MOTHERBOARD == 203 +#if MOTHERBOARD == 203 || MOTHERBOARD == 200 #define MOTOR_CURRENT_PWM_RANGE 2000 -#define DEFAULT_PWM_MOTOR_CURRENT {400, 750, 750} // {XY,Z,E} -#define DEFAULT_PWM_MOTOR_CURRENT_LOUD {400, 750, 750} // {XY,Z,E} +#define DEFAULT_PWM_MOTOR_CURRENT {270, 830, 450} // {XY,Z,E} +#define DEFAULT_PWM_MOTOR_CURRENT_LOUD {540, 830, 500} // {XY,Z,E} +#define Z_SILENT 0 +#define Z_HIGH_POWER 200 #endif /*------------------------------------ @@ -543,7 +426,6 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define TEMP_SENSOR_BED 1 #endif #define TEMP_SENSOR_PINDA 1 -#define TEMP_SENSOR_AMBIENT 2000 #define STACK_GUARD_TEST_VALUE 0xA2A2 @@ -586,21 +468,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DEFAULT_RETRACTION 1 //used for PINDA temp calibration and pause print #endif -// How much shall the print head be lifted on power panic? -// Ideally the Z axis will reach a zero phase of the stepper driver on power outage. To simplify this, -// UVLO_Z_AXIS_SHIFT shall be an integer multiply of the stepper driver cycle, that is 4x full step. -// For example, the Prusa i3 MK2 with 16 microsteps per full step has Z stepping of 400 microsteps per mm. -// At 400 microsteps per mm, a full step lifts the Z axis by 0.04mm, and a stepper driver cycle is 0.16mm. -// The following example, 12 * (4 * 16 / 400) = 12 * 0.16mm = 1.92mm. -//#define UVLO_Z_AXIS_SHIFT 1.92 -#define UVLO_Z_AXIS_SHIFT 0.64 -// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically. -#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5 - -#define HEATBED_V2 - #define M600_TIMEOUT 600 //seconds -//#define SUPPORT_VERBOSITY +#define SUPPORT_VERBOSITY #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 0c34cf88..b9ef2d35 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -1346,6 +1346,7 @@ void setup() // so the next time the firmware gets updated, it will know from which version it has been updated. update_current_firmware_version_to_eeprom(); +#ifdef TMC2130 tmc2130_home_origin[X_AXIS] = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_HOME_X_ORIGIN); tmc2130_home_bsteps[X_AXIS] = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_HOME_X_BSTEPS); tmc2130_home_fsteps[X_AXIS] = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_HOME_X_FSTEPS); @@ -1362,6 +1363,7 @@ void setup() tmc2130_home_enabled = eeprom_read_byte((uint8_t*)EEPROM_TMC2130_HOME_ENABLED); if (tmc2130_home_enabled == 0xff) tmc2130_home_enabled = 0; +#endif //TMC2130 #ifdef UVLO_SUPPORT if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { //previous print was terminated by UVLO @@ -2985,7 +2987,7 @@ void process_commands() } #endif /* QUICK_HOME */ - +#ifdef TMC2130 if(home_x) { if (!calib) @@ -3001,6 +3003,8 @@ void process_commands() else tmc2130_home_calibrate(Y_AXIS); } +#endif //TMC2130 + if(code_seen(axis_codes[X_AXIS]) && code_value_long() != 0) current_position[X_AXIS]=code_value()+add_homing[X_AXIS]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 207a1bea..d5156fdd 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5986,6 +5986,7 @@ extern char conv[8]; // Convert tmc2130 wfac to string char *wfac_to_str5(const uint8_t &x) { +#ifdef TMC2130 if (x>=TMC2130_WAVE_FAC200_MIN) return ftostr43(((float)(x & 0xff))/200); conv[0] = ' '; conv[1] = ' '; @@ -5993,6 +5994,7 @@ char *wfac_to_str5(const uint8_t &x) conv[3] = 'f'; conv[4] = 'f'; conv[5] = 0; +#endif //TMC2130 return conv; } @@ -6121,6 +6123,7 @@ bool lcd_selftest() } } +#ifdef TMC2130 if (_result) { _progress = lcd_selftest_screen(13, 0, 2, true, 0); @@ -6132,6 +6135,7 @@ bool lcd_selftest() eeprom_update_byte((uint8_t*)EEPROM_TMC2130_HOME_ENABLED, 1); _result = bres; } +#endif //TMC2130 if (_result) { diff --git a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h index d7cc579d..63ffa05c 100644 --- a/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h @@ -6,6 +6,7 @@ *------------------------------------*/ // Printer revision +#define PRINTER_TYPE PRINTER_MK25 #define FILAMENT_SIZE "1_75mm_MK25" #define NOZZLE_TYPE "E3Dv6full" @@ -18,6 +19,9 @@ // Electronics #define MOTHERBOARD BOARD_RAMBO_MINI_1_3 +#define HEATBED_V2 +#define STEEL_SHEET +#define TACH0PULLUP // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) //#define E3D_PT100_EXTRUDER_WITH_AMP @@ -31,7 +35,7 @@ *------------------------------------*/ // Steps per unit {X,Y,Z,E} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,133} // Endstop inverting const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. @@ -52,11 +56,11 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MANUAL_Z_HOME_POS 0.2 // Travel limits after homing -#define X_MAX_POS 255 +#define X_MAX_POS 250 #define X_MIN_POS 0 #define Y_MAX_POS 210 -#define Y_MIN_POS -4 //orig -4 -#define Z_MAX_POS 200 +#define Y_MIN_POS -4 +#define Z_MAX_POS 210 #define Z_MIN_POS 0.15 // Canceled home position @@ -154,7 +158,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #endif // Extrude mintemp -#define EXTRUDE_MINTEMP 190 +#define EXTRUDE_MINTEMP 180 // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 @@ -164,8 +168,10 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -#define PAT9125 +#define PAT9125 //!< Filament sensor #define FANCHECK +//#define WATCHDOG +#define SAFETYTIMER /*------------------------------------ @@ -276,7 +282,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right -#define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind +#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind #define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4 // Z probe to nozzle Z offset: -below (always!) #endif @@ -462,12 +468,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DEFAULT_RETRACTION 1 //used for PINDA temp calibration and pause print #endif -#define HEATBED_V2 - #define M600_TIMEOUT 600 //seconds -#define TACH0PULLUP - -//#define SUPPORT_VERBOSITY +#define SUPPORT_VERBOSITY #endif //__CONFIGURATION_PRUSA_H From 2f98ac989a4fc909aa41a15377631057072d3c8e Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 13 Mar 2018 23:14:44 +0100 Subject: [PATCH 3/3] Variant file for MK2 + cond. translation --- Firmware/Configuration_prusa.h | 202 +++++++----------- Firmware/ultralcd.cpp | 2 + .../variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 1 + 3 files changed, 80 insertions(+), 125 deletions(-) diff --git a/Firmware/Configuration_prusa.h b/Firmware/Configuration_prusa.h index 63ffa05c..5f3e19c2 100644 --- a/Firmware/Configuration_prusa.h +++ b/Firmware/Configuration_prusa.h @@ -2,26 +2,25 @@ #define CONFIGURATION_PRUSA_H /*------------------------------------ - GENERAL SETTINGS - *------------------------------------*/ +GENERAL SETTINGS +*------------------------------------*/ // Printer revision -#define PRINTER_TYPE PRINTER_MK25 -#define FILAMENT_SIZE "1_75mm_MK25" +#define PRINTER_TYPE PRINTER_MK2 +#define FILAMENT_SIZE "1_75mm_MK2" #define NOZZLE_TYPE "E3Dv6full" // Developer flag #define DEVELOPER // Printer name -#define CUSTOM_MENDEL_NAME "Prusa i3 MK2.5" +#define CUSTOM_MENDEL_NAME "Prusa i3 MK2" // Electronics #define MOTHERBOARD BOARD_RAMBO_MINI_1_3 -#define HEATBED_V2 -#define STEEL_SHEET -#define TACH0PULLUP +// Prusa Single extruder multiple material suport +//#define SNMM // Uncomment the below for the E3D PT100 temperature sensor (with or without PT100 Amplifier) //#define E3D_PT100_EXTRUDER_WITH_AMP @@ -31,11 +30,16 @@ /*------------------------------------ - AXIS SETTINGS - *------------------------------------*/ +AXIS SETTINGS +*------------------------------------*/ // Steps per unit {X,Y,Z,E} -#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,133} +#ifdef SNMM +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,140} +#else +#define DEFAULT_AXIS_STEPS_PER_UNIT {100,100,3200/8,161.3} +#endif + // Endstop inverting const bool X_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop. @@ -50,16 +54,17 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false #define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false + // Home position #define MANUAL_X_HOME_POS 0 #define MANUAL_Y_HOME_POS -2.2 -#define MANUAL_Z_HOME_POS 0.2 +#define MANUAL_Z_HOME_POS 0.15 // Travel limits after homing #define X_MAX_POS 250 #define X_MIN_POS 0 #define Y_MAX_POS 210 -#define Y_MIN_POS -4 +#define Y_MIN_POS -2.2 #define Z_MAX_POS 210 #define Z_MIN_POS 0.15 @@ -73,58 +78,22 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define Z_PAUSE_LIFT 20 #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E -#define HOMING_FEEDRATE {3000, 3000, 800, 0} // set the homing speeds (mm/min) // 3000 is also valid for stallGuard homing. Valid range: 2200 - 3000 +#define HOMING_FEEDRATE {3000, 3000, 800, 0} // set the homing speeds (mm/min) -#define DEFAULT_MAX_FEEDRATE {200, 200, 12, 120} // (mm/sec) max feedrate (M203) -#define DEFAULT_MAX_ACCELERATION {1000, 1000, 200, 5000} // (mm/sec^2) max acceleration (M201) +#define DEFAULT_MAX_FEEDRATE {500, 500, 12, 120} // (mm/sec) +#define DEFAULT_MAX_ACCELERATION {9000,9000,500,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot. + +#define DEFAULT_ACCELERATION 1500 // X, Y, Z and E max acceleration in mm/s^2 for printing moves +#define DEFAULT_RETRACT_ACCELERATION 1500 // X, Y, Z and E max acceleration in mm/s^2 for retracts -#define DEFAULT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for printing moves (M204S) -#define DEFAULT_RETRACT_ACCELERATION 1250 // X, Y, Z and E max acceleration in mm/s^2 for retracts (M204T) - -#define MANUAL_FEEDRATE {2700, 2700, 1000, 100} // set the speeds for manual moves (mm/min) - -//number of bytes from end of the file to start check -#define END_FILE_SECTION 10000 +#define MANUAL_FEEDRATE {3000, 3000, 1000, 100} // set the speeds for manual moves (mm/min) #define Z_AXIS_ALWAYS_ON 1 - -//#define DEBUG_BUILD -#ifdef DEBUG_BUILD -//#define _NO_ASM -#define DEBUG_DCODES //D codes -#define DEBUG_STACK_MONITOR //Stack monitor in stepper ISR -//#define DEBUG_FSENSOR_LOG //Reports fsensor status to serial -//#define DEBUG_CRASHDET_COUNTERS //Display crash-detection counters on LCD -//#define DEBUG_RESUME_PRINT //Resume/save print debug enable -//#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output -//#define DEBUG_DISABLE_XMINLIMIT //x min limit ignored -//#define DEBUG_DISABLE_XMAXLIMIT //x max limit ignored -//#define DEBUG_DISABLE_YMINLIMIT //y min limit ignored -//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored -//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored -//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored -//#define DEBUG_DISABLE_STARTMSGS //no startup messages -//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored -//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored -//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line -//#define DEBUG_DISABLE_PREVENT_EXTRUDER //cold extrusion and long extrusion allowed -//#define DEBUG_DISABLE_PRUSA_STATISTICS //disable prusa_statistics() mesages -//#define DEBUG_XSTEP_DUP_PIN 21 //duplicate x-step output to pin 21 (SCL on P3) -//#define DEBUG_YSTEP_DUP_PIN 21 //duplicate y-step output to pin 21 (SCL on P3) -//#define DEBUG_BLINK_ACTIVE -//#define DEBUG_DISABLE_FANCHECK //disable fan check (no ISR INT7, check disabled) -//#define DEBUG_DISABLE_FSENSORCHECK //disable fsensor check (no ISR INT7, check disabled) -//#define DEBUG_DUMP_TO_2ND_SERIAL //dump received characters to 2nd serial line -//#define DEBUG_STEPPER_TIMER_MISSED // Stop on stepper timer overflow, beep and display a message. -//#define PLANNER_DIAGNOSTICS // Show the planner queue status on printer display. -#endif /* DEBUG_BUILD */ - - /*------------------------------------ - EXTRUDER SETTINGS - *------------------------------------*/ +EXTRUDER SETTINGS +*------------------------------------*/ // Mintemps #define HEATER_0_MINTEMP 15 @@ -140,7 +109,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #endif #define HEATER_1_MAXTEMP 305 #define HEATER_2_MAXTEMP 305 -#define BED_MAXTEMP 125 +#define BED_MAXTEMP 150 #if defined(E3D_PT100_EXTRUDER_WITH_AMP) || defined(E3D_PT100_EXTRUDER_NO_AMP) // Define PID constants for extruder with PT100 @@ -149,16 +118,13 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define DEFAULT_Kd 73.76 #else // Define PID constants for extruder -//#define DEFAULT_Kp 40.925 -//#define DEFAULT_Ki 4.875 -//#define DEFAULT_Kd 86.085 -#define DEFAULT_Kp 16.13 -#define DEFAULT_Ki 1.1625 -#define DEFAULT_Kd 56.23 +#define DEFAULT_Kp 40.925 +#define DEFAULT_Ki 4.875 +#define DEFAULT_Kd 86.085 #endif // Extrude mintemp -#define EXTRUDE_MINTEMP 180 +#define EXTRUDE_MINTEMP 130 // Extruder cooling fans #define EXTRUDER_0_AUTO_FAN_PIN 8 @@ -168,28 +134,21 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed -#define PAT9125 //!< Filament sensor -#define FANCHECK -//#define WATCHDOG -#define SAFETYTIMER +#ifdef SNMM +//#define BOWDEN_LENGTH 408 +#define BOWDEN_LENGTH 433 //default total length for filament fast loading part; max length for extrusion is 465 mm!; this length can be adjusted in service menu +#define FIL_LOAD_LENGTH 102 //length for loading filament into the nozzle +#define FIL_COOLING 10 //length for cooling moves +#define E_MOTOR_LOW_CURRENT 350 // current for PRUSAY code +#define E_MOTOR_HIGH_CURRENT 700 //current for unloading filament, stop print, PRUSAY ramming +#endif //SNMM + +//#define DIS //for measuring bed heigth and PINDa detection heigth relative to auto home point, experimental function /*------------------------------------ - LOAD/UNLOAD FILAMENT SETTINGS - *------------------------------------*/ - -// Load filament commands -#define LOAD_FILAMENT_0 "M83" -#define LOAD_FILAMENT_1 "G1 E70 F400" -#define LOAD_FILAMENT_2 "G1 E40 F100" - -// Unload filament commands -#define UNLOAD_FILAMENT_0 "M83" -#define UNLOAD_FILAMENT_1 "G1 E-80 F7000" - -/*------------------------------------ - CHANGE FILAMENT SETTINGS - *------------------------------------*/ +CHANGE FILAMENT SETTINGS +*------------------------------------*/ // Filament change configuration #define FILAMENTCHANGEENABLE @@ -206,22 +165,22 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define FILAMENTCHANGE_XYFEED 50 #define FILAMENTCHANGE_EFEED 20 -//#define FILAMENTCHANGE_RFEED 400 -#define FILAMENTCHANGE_RFEED 7000 / 60 +#define FILAMENTCHANGE_RFEED 400 #define FILAMENTCHANGE_EXFEED 2 #define FILAMENTCHANGE_ZFEED 15 #endif /*------------------------------------ - ADDITIONAL FEATURES SETTINGS - *------------------------------------*/ +ADDITIONAL FEATURES SETTINGS +*------------------------------------*/ // Define Prusa filament runout sensor //#define FILAMENT_RUNOUT_SUPPORT #ifdef FILAMENT_RUNOUT_SUPPORT #define FILAMENT_RUNOUT_SENSOR 1 +#define FILAMENT_RUNOUT_SCRIPT "M600" #endif // temperature runaway @@ -232,8 +191,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define TEMP_RUNAWAY_EXTRUDER_TIMEOUT 45 /*------------------------------------ - MOTOR CURRENT SETTINGS - *------------------------------------*/ +MOTOR CURRENT SETTINGS +*------------------------------------*/ // Motor Current setting for BIG RAMBo #define DIGIPOT_MOTOR_CURRENT {135,135,135,135,135} // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) @@ -249,15 +208,8 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #endif /*------------------------------------ - PAT9125 SETTINGS - *------------------------------------*/ - -#define PAT9125_XRES 0 -#define PAT9125_YRES 255 - -/*------------------------------------ - BED SETTINGS - *------------------------------------*/ +BED SETTINGS +*------------------------------------*/ // Define Mesh Bed Leveling system to enable it #define MESH_BED_LEVELING @@ -282,7 +234,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MESH_HOME_Z_SEARCH 5 //Z lift for homing, mesh bed leveling etc. #define X_PROBE_OFFSET_FROM_EXTRUDER 23 // Z probe to nozzle X offset: -left +right -#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Z probe to nozzle Y offset: -front +behind +#define Y_PROBE_OFFSET_FROM_EXTRUDER 9 // Z probe to nozzle Y offset: -front +behind #define Z_PROBE_OFFSET_FROM_EXTRUDER -0.4 // Z probe to nozzle Z offset: -below (always!) #endif @@ -337,40 +289,40 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o /*----------------------------------- - PREHEAT SETTINGS - *------------------------------------*/ +PREHEAT SETTINGS +*------------------------------------*/ #define FARM_PREHEAT_HOTEND_TEMP 250 #define FARM_PREHEAT_HPB_TEMP 40 #define FARM_PREHEAT_FAN_SPEED 0 #define PLA_PREHEAT_HOTEND_TEMP 215 -#define PLA_PREHEAT_HPB_TEMP 60 -#define PLA_PREHEAT_FAN_SPEED 0 +#define PLA_PREHEAT_HPB_TEMP 55 +#define PLA_PREHEAT_FAN_SPEED 0 #define ABS_PREHEAT_HOTEND_TEMP 255 #define ABS_PREHEAT_HPB_TEMP 100 -#define ABS_PREHEAT_FAN_SPEED 0 +#define ABS_PREHEAT_FAN_SPEED 0 #define HIPS_PREHEAT_HOTEND_TEMP 220 #define HIPS_PREHEAT_HPB_TEMP 100 -#define HIPS_PREHEAT_FAN_SPEED 0 +#define HIPS_PREHEAT_FAN_SPEED 0 #define PP_PREHEAT_HOTEND_TEMP 254 #define PP_PREHEAT_HPB_TEMP 100 -#define PP_PREHEAT_FAN_SPEED 0 +#define PP_PREHEAT_FAN_SPEED 0 -#define PET_PREHEAT_HOTEND_TEMP 230 -#define PET_PREHEAT_HPB_TEMP 85 -#define PET_PREHEAT_FAN_SPEED 0 +#define PET_PREHEAT_HOTEND_TEMP 240 +#define PET_PREHEAT_HPB_TEMP 90 +#define PET_PREHEAT_FAN_SPEED 0 -#define FLEX_PREHEAT_HOTEND_TEMP 240 +#define FLEX_PREHEAT_HOTEND_TEMP 230 #define FLEX_PREHEAT_HPB_TEMP 50 -#define FLEX_PREHEAT_FAN_SPEED 0 +#define FLEX_PREHEAT_FAN_SPEED 0 /*------------------------------------ - THERMISTORS SETTINGS - *------------------------------------*/ +THERMISTORS SETTINGS +*------------------------------------*/ // //--NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table @@ -392,7 +344,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o // 10 is 100k RS thermistor 198-961 (4.7k pullup) // 11 is 100k beta 3950 1% thermistor (4.7k pullup) // 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) -// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" +// 13 is 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" // 20 is the PT100 circuit found in the Ultimainboard V2.x // 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 // @@ -425,7 +377,6 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #else #define TEMP_SENSOR_BED 1 #endif -#define TEMP_SENSOR_PINDA 1 #define STACK_GUARD_TEST_VALUE 0xA2A2 @@ -438,13 +389,9 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 -#define PINDA_PREHEAT_X 20 -#define PINDA_PREHEAT_Y 60 -#define PINDA_PREHEAT_Z 0.15 -/* #define PINDA_PREHEAT_X 70 #define PINDA_PREHEAT_Y -3 -#define PINDA_PREHEAT_Z 1*/ +#define PINDA_PREHEAT_Z 1 #define PINDA_HEAT_T 120 //time in s #define PINDA_MIN_T 50 @@ -455,21 +402,26 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define PING_TIME_LONG 600 //10 min; used when length of commands buffer > 0 to avoid false triggering when dealing with long gcodes #define PING_ALLERT_PERIOD 60 //time in s -#define LONG_PRESS_TIME 1000 //time in ms for button long press +#define NC_TIME 10 //time in s for periodic important status messages sending which needs reponse from monitoring +#define NC_BUTTON_LONG_PRESS 15 //time in s + +#define LONG_PRESS_TIME 1000 //time in ms for button long press #define BUTTON_BLANKING_TIME 200 //time in ms for blanking after button release #define DEFAULT_PID_TEMP 210 -#define MIN_PRINT_FAN_SPEED 75 - #ifdef SNMM #define DEFAULT_RETRACTION 4 //used for PINDA temp calibration and pause print #else #define DEFAULT_RETRACTION 1 //used for PINDA temp calibration and pause print #endif +#define END_FILE_SECTION 10000 //number of bytes from end of file used for checking if file is complete + #define M600_TIMEOUT 600 //seconds +#ifndef SNMM #define SUPPORT_VERBOSITY +#endif #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d5156fdd..2fbf2a63 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5624,12 +5624,14 @@ static void lcd_tune_menu() #endif #ifndef DEBUG_DISABLE_FSENSORCHECK +#ifdef PAT9125 if (FSensorStateMenu == 0) { MENU_ITEM(function, MSG_FSENSOR_OFF, lcd_fsensor_state_set); } else { MENU_ITEM(function, MSG_FSENSOR_ON, lcd_fsensor_state_set); } +#endif //PAT9125 #endif //DEBUG_DISABLE_FSENSORCHECK #ifdef TMC2130 diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 2324daf6..5f3e19c2 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -6,6 +6,7 @@ GENERAL SETTINGS *------------------------------------*/ // Printer revision +#define PRINTER_TYPE PRINTER_MK2 #define FILAMENT_SIZE "1_75mm_MK2" #define NOZZLE_TYPE "E3Dv6full"