From 44a611a23e7a80dea209b5e5cf6d258eb8ed4067 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 5 May 2017 01:55:36 +0200 Subject: added defines for snmm, removed unused defines --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 18 +++++++++++------- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 21 ++++++++++++--------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 3fafc96df..2dc9f02ff 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -18,6 +18,9 @@ GENERAL SETTINGS // Electronics #define MOTHERBOARD BOARD_RAMBO_MINI_1_0 +// 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 //#define E3D_PT100_EXTRUDER_NO_AMP @@ -30,7 +33,12 @@ AXIS SETTINGS *------------------------------------*/ // Steps per unit {X,Y,Z,E} +#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. @@ -120,13 +128,12 @@ EXTRUDER SETTINGS #ifdef SNMM //#define BOWDEN_LENGTH 408 -#define BOWDEN_LENGTH 457 //total length for filament fast loading part; max length for extrusion is 465 mm! +#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_RETURN_LENGTH 30.5 //for filament adjusting (PRUSAY code) +#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 +#endif //SNMM //#define DIS //for measuring bed heigth and PINDa detection heigth relative to auto home point, experimental function @@ -364,9 +371,6 @@ THERMISTORS SETTINGS #define MAX_E_STEPS_PER_UNIT 250 #define MIN_E_STEPS_PER_UNIT 100 -#define PRINT_STARTED 0xFE -#define PRINT_FINISHED 0xFF - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 29c6b005d..d4529a70a 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -18,6 +18,9 @@ GENERAL SETTINGS // Electronics #define MOTHERBOARD BOARD_RAMBO_MINI_1_3 +// 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 //#define E3D_PT100_EXTRUDER_NO_AMP @@ -30,7 +33,12 @@ AXIS SETTINGS *------------------------------------*/ // Steps per unit {X,Y,Z,E} +#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. @@ -118,18 +126,16 @@ EXTRUDER SETTINGS -// Prusa Single extruder multiple material suport -//#define SNMM + #ifdef SNMM //#define BOWDEN_LENGTH 408 -#define BOWDEN_LENGTH 457 //total length for filament fast loading part; max length for extrusion is 465 mm! +#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_RETURN_LENGTH 30.5 //for filament adjusting (PRUSAY code) +#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 +#endif //SNMM //#define DIS //for measuring bed heigth and PINDa detection heigth relative to auto home point, experimental function @@ -367,9 +373,6 @@ THERMISTORS SETTINGS #define MAX_E_STEPS_PER_UNIT 250 #define MIN_E_STEPS_PER_UNIT 100 -#define PRINT_STARTED 0xFE -#define PRINT_FINISHED 0xFF - #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 -- cgit v1.2.3