From bfe2f72cf85ee2448b753eed5e21b1b895f6ab82 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 9 Jan 2017 14:58:05 +0100 Subject: [PATCH 01/16] added defines for max hotend and max bed temperature for xyz calibration --- Firmware/Configuration.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 629c377b5..f4277268a 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -724,6 +724,7 @@ enum CalibrationStatus #include "thermistortables.h" - +#define MAX_HOTEND_TEMP_CALIBRATION 50 +#define MAX_BED_TEMP_CALIBRATION 50 #endif //__CONFIGURATION_H From ea22febb42647e91961b7eb29a0278671afc2afb Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 9 Jan 2017 16:27:44 +0100 Subject: [PATCH 02/16] added defines for snmm and stack guard --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 15 ++++++++++++++- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 2c49e68a8..de09703a2 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -37,7 +37,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MANUAL_Z_HOME_POS 0.15 // 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 -2.2 @@ -93,7 +93,18 @@ EXTRUDER SETTINGS #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed +// 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 FIL_LOAD_LENGTH 102 //length for loading filament into the nozzle +#define FIL_RETURN_LENGTH 30.5 //for filament adjusting (PRUSAY code) +#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 /*------------------------------------ LOAD/UNLOAD FILAMENT SETTINGS @@ -312,5 +323,7 @@ THERMISTORS SETTINGS #define TEMP_SENSOR_2 0 #define TEMP_SENSOR_BED 1 +#define STACK_GUARD_TEST_VALUE 0xA2A2 + #endif //__CONFIGURATION_PRUSA_H diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index c7e3ecb8a..2cd815e19 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -37,7 +37,7 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o #define MANUAL_Z_HOME_POS 0.15 // 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 -2.2 @@ -93,7 +93,18 @@ EXTRUDER SETTINGS #define EXTRUDER_AUTO_FAN_TEMPERATURE 50 #define EXTRUDER_AUTO_FAN_SPEED 255 // == full speed +// 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 FIL_LOAD_LENGTH 102 //length for loading filament into the nozzle +#define FIL_RETURN_LENGTH 30.5 //for filament adjusting (PRUSAY code) +#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 /*------------------------------------ LOAD/UNLOAD FILAMENT SETTINGS @@ -312,5 +323,7 @@ THERMISTORS SETTINGS #define TEMP_SENSOR_2 0 #define TEMP_SENSOR_BED 1 +#define STACK_GUARD_TEST_VALUE 0xA2A2 + #endif //__CONFIGURATION_PRUSA_H From aad15877de0b1fa9a118fbf9ea9ad4d6a349ffd2 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 12 Jan 2017 16:42:25 +0100 Subject: [PATCH 03/16] added defines for min and max steps per unit for E calibration --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index de09703a2..21a968ae9 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -325,5 +325,7 @@ THERMISTORS SETTINGS #define STACK_GUARD_TEST_VALUE 0xA2A2 +#define MAX_E_STEPS_PER_UNIT 250 +#define MIN_E_STEPS_PER_UNIT 100 #endif //__CONFIGURATION_PRUSA_H From 872ca47795a6392d46fa32d24d70f0313da3a59b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Thu, 12 Jan 2017 16:43:46 +0100 Subject: [PATCH 04/16] added defines for min and max steps per unit for E calibration --- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 2cd815e19..fc319708b 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -325,5 +325,7 @@ THERMISTORS SETTINGS #define STACK_GUARD_TEST_VALUE 0xA2A2 +#define MAX_E_STEPS_PER_UNIT 250 +#define MIN_E_STEPS_PER_UNIT 100 #endif //__CONFIGURATION_PRUSA_H From b56c1669dbc72f2a3074ba3c27586019418695da Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 16 Jan 2017 18:33:37 +0100 Subject: [PATCH 05/16] defines for max bed and hotend temp added --- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index fc319708b..147c6d857 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -325,6 +325,9 @@ THERMISTORS SETTINGS #define STACK_GUARD_TEST_VALUE 0xA2A2 +#define MAX_BED_TEMP_CALIBRATION 50 +#define MAX_HOTEND_TEMP_CALIBRATION 50 + #define MAX_E_STEPS_PER_UNIT 250 #define MIN_E_STEPS_PER_UNIT 100 From aa2564fe9f19ad0635fe18014049356016b62f12 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 16 Jan 2017 18:34:17 +0100 Subject: [PATCH 06/16] Update 1_75mm_MK2-RAMBo10a-E3Dv6full.h --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 21a968ae9..defdadff2 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -325,6 +325,9 @@ THERMISTORS SETTINGS #define STACK_GUARD_TEST_VALUE 0xA2A2 +#define MAX_BED_TEMP_CALIBRATION 50 +#define MAX_HOTEND_TEMP_CALIBRATION 50 + #define MAX_E_STEPS_PER_UNIT 250 #define MIN_E_STEPS_PER_UNIT 100 From 649928e9945204be48716d3bcfe017f550bf7cc1 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 16 Jan 2017 18:36:12 +0100 Subject: [PATCH 07/16] defines for max hotend and bed temperatures removed --- Firmware/Configuration.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index f4277268a..2a2b6f659 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -723,8 +723,4 @@ enum CalibrationStatus #include "Configuration_adv.h" #include "thermistortables.h" - -#define MAX_HOTEND_TEMP_CALIBRATION 50 -#define MAX_BED_TEMP_CALIBRATION 50 - #endif //__CONFIGURATION_H From e5c39f8d6dc3c4a734398400010b0f62cd26941e Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 25 Jan 2017 19:22:52 +0100 Subject: [PATCH 08/16] Update 1_75mm_MK2-RAMBo13a-E3Dv6full.h --- .../variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 147c6d857..06440bc94 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -106,19 +106,6 @@ EXTRUDER SETTINGS #endif -/*------------------------------------ -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 *------------------------------------*/ @@ -331,4 +318,7 @@ THERMISTORS SETTINGS #define MAX_E_STEPS_PER_UNIT 250 #define MIN_E_STEPS_PER_UNIT 100 +#define PRINT_STARTED 0xFE +#define PRINT_FINISHED 0xFF + #endif //__CONFIGURATION_PRUSA_H From bc3ab0b69aeab9db39fbde2aa1255e59e1dbd246 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 25 Jan 2017 19:25:04 +0100 Subject: [PATCH 09/16] PRINT_STARTED and PRINT_FINISHED added --- .../variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index defdadff2..5f80bff4e 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -106,19 +106,6 @@ EXTRUDER SETTINGS #endif -/*------------------------------------ -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 *------------------------------------*/ @@ -331,4 +318,7 @@ THERMISTORS SETTINGS #define MAX_E_STEPS_PER_UNIT 250 #define MIN_E_STEPS_PER_UNIT 100 +#define PRINT_STARTED 0xFE +#define PRINT_FINISHED 0xFF + #endif //__CONFIGURATION_PRUSA_H From 57b9025415edcb07b8181b9c628d2c4a6294dafa Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 14 Feb 2017 11:56:48 +0100 Subject: [PATCH 10/16] added babystep min and max defines --- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 06440bc94..a6a1e9af5 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -321,4 +321,7 @@ THERMISTORS SETTINGS #define PRINT_STARTED 0xFE #define PRINT_FINISHED 0xFF +#define Z_BABYSTEP_MIN -3999 +#define Z_BABYSTEP_MAX 0 + #endif //__CONFIGURATION_PRUSA_H From b8fc05512d07a2a904f958842736917c6671d28d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 14 Feb 2017 11:57:30 +0100 Subject: [PATCH 11/16] added babystep min and max defines --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 5f80bff4e..70035efb7 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -321,4 +321,7 @@ THERMISTORS SETTINGS #define PRINT_STARTED 0xFE #define PRINT_FINISHED 0xFF +#define Z_BABYSTEP_MIN -3999 +#define Z_BABYSTEP_MAX 0 + #endif //__CONFIGURATION_PRUSA_H From 7b86fa60163a9ed3a3e00390a4e186b95e635702 Mon Sep 17 00:00:00 2001 From: Alfredo Date: Tue, 7 Mar 2017 09:37:15 -0500 Subject: [PATCH 12/16] Bug: M20 - List SD card When the SD card is inserted in a Mac computer some special directory are written. The purse firmware is unable to navigate those directory and generates an error sent showed on the serial line. the BUG is the instruction SERIAL_ECHOLN does not work with string pointers and there fore garbage is sent on the serial line. The proposed correction is to use the right instruction: SERIAL_ECHORPGM that works with string pointers. Therefore the correct message is MSG_SD_CANT_ENTER_SUBDIR and not the original listed. --- Firmware/cardreader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index a9ee7e574..f41f20ac7 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -81,7 +81,7 @@ void CardReader::lsDive(const char *prepend, SdFile parent, const char * const m if(lsAction==LS_SerialPrint) { SERIAL_ECHO_START; - SERIAL_ECHOLN(MSG_SD_CANT_OPEN_SUBDIR); + SERIAL_ECHORPGM(MSG_SD_CANT_ENTER_SUBDIR); SERIAL_ECHOLN(lfilename); } } From 7883d4eb4d5be7e0ef9067699c796cf4b66c6a07 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 7 Mar 2017 19:20:49 +0100 Subject: [PATCH 13/16] ping for farm mode added --- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index a6a1e9af5..28beed23d 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -324,4 +324,8 @@ THERMISTORS SETTINGS #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 +#define PING_TIME 25 //time in s +#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 + #endif //__CONFIGURATION_PRUSA_H From a821f8d488c8696a4aeabf20c7c7c50039acbdc3 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 7 Mar 2017 19:21:14 +0100 Subject: [PATCH 14/16] ping for farm mode added --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index 70035efb7..bb0a28618 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -324,4 +324,8 @@ THERMISTORS SETTINGS #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 +#define PING_TIME 25 //time in s +#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 + #endif //__CONFIGURATION_PRUSA_H From 716b0bd1c74f190e32335eb1feee3a025916a39f Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 13 Mar 2017 14:49:01 +0100 Subject: [PATCH 15/16] ping time prolonged to 60s --- Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h index 28beed23d..a36f3c9a3 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h @@ -324,7 +324,7 @@ THERMISTORS SETTINGS #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 -#define PING_TIME 25 //time in s +#define PING_TIME 60 //time in s #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 From 2d05ae6be52c730d356391ee3f7949ece87cd9c5 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 13 Mar 2017 14:49:29 +0100 Subject: [PATCH 16/16] ping time prolonged to 60s --- Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h index bb0a28618..3e89889aa 100644 --- a/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h +++ b/Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h @@ -324,7 +324,7 @@ THERMISTORS SETTINGS #define Z_BABYSTEP_MIN -3999 #define Z_BABYSTEP_MAX 0 -#define PING_TIME 25 //time in s +#define PING_TIME 60 //time in s #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