From fd245e7f3e9a6989104acc2ba77dbc7bb0c793c8 Mon Sep 17 00:00:00 2001 From: Ryan V1 <55478432+V1EngineeringInc@users.noreply.github.com> Date: Sat, 27 Feb 2021 19:46:52 -0800 Subject: [PATCH 1/8] SD init fail issue fix Not sure I did that right, do I need to specify the value that is already there? --- src/configs/accessories/reprap_discount_smart_controller | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/configs/accessories/reprap_discount_smart_controller b/src/configs/accessories/reprap_discount_smart_controller index 7257d190..adf36ba1 100755 --- a/src/configs/accessories/reprap_discount_smart_controller +++ b/src/configs/accessories/reprap_discount_smart_controller @@ -1,7 +1,8 @@ opt_enable \ REVERSE_ENCODER_DIRECTION \ SDSUPPORT \ - REPRAP_DISCOUNT_SMART_CONTROLLER + REPRAP_DISCOUNT_SMART_CONTROLLER\ + SD_SPI_SPEED opt_disable \ SHOW_CUSTOM_BOOTSCREEN \ From 7fb5f4a8d457b486f251451681d86f979c4aee9d Mon Sep 17 00:00:00 2001 From: Ryan V1 <55478432+V1EngineeringInc@users.noreply.github.com> Date: Sat, 27 Feb 2021 20:10:34 -0800 Subject: [PATCH 2/8] Update reprap_discount_smart_controller It has actually just changed between the versions dang it. The current release and the bugfix are differnt. --- src/configs/accessories/reprap_discount_smart_controller | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configs/accessories/reprap_discount_smart_controller b/src/configs/accessories/reprap_discount_smart_controller index adf36ba1..858274be 100755 --- a/src/configs/accessories/reprap_discount_smart_controller +++ b/src/configs/accessories/reprap_discount_smart_controller @@ -2,7 +2,7 @@ opt_enable \ REVERSE_ENCODER_DIRECTION \ SDSUPPORT \ REPRAP_DISCOUNT_SMART_CONTROLLER\ - SD_SPI_SPEED + SPI_SPEED SPI_HALF_SPEED opt_disable \ SHOW_CUSTOM_BOOTSCREEN \ From 9d4e8fa639c1c1c6372bce5e279f1071dfd19982 Mon Sep 17 00:00:00 2001 From: Jeff Eberl Date: Sat, 27 Feb 2021 22:23:28 -0700 Subject: [PATCH 3/8] opt_set in full discount display instead. --- src/configs/accessories/reprap_discount_full_graphic_lcd | 1 + 1 file changed, 1 insertion(+) diff --git a/src/configs/accessories/reprap_discount_full_graphic_lcd b/src/configs/accessories/reprap_discount_full_graphic_lcd index 712c41be..691e1ec8 100755 --- a/src/configs/accessories/reprap_discount_full_graphic_lcd +++ b/src/configs/accessories/reprap_discount_full_graphic_lcd @@ -6,5 +6,6 @@ opt_set LCD_TIMEOUT_TO_STATUS "180000" opt_add ST7920_DELAY_2 "DELAY_NS(250)" opt_add ST7920_DELAY_3 "DELAY_NS(250)" +opt_ser SD_SPI_SPEED SPI_HALF_SPEED echo "- Configured for REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER" >> README.md From efa2fcdc6f5ae404395403641708eeb8c3ed19f3 Mon Sep 17 00:00:00 2001 From: Jeff Eberl Date: Sat, 27 Feb 2021 22:24:27 -0700 Subject: [PATCH 4/8] Removed from "smart screenscreen" config. --- src/configs/accessories/reprap_discount_smart_controller | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/configs/accessories/reprap_discount_smart_controller b/src/configs/accessories/reprap_discount_smart_controller index 858274be..0113b143 100755 --- a/src/configs/accessories/reprap_discount_smart_controller +++ b/src/configs/accessories/reprap_discount_smart_controller @@ -1,8 +1,8 @@ opt_enable \ REVERSE_ENCODER_DIRECTION \ SDSUPPORT \ - REPRAP_DISCOUNT_SMART_CONTROLLER\ - SPI_SPEED SPI_HALF_SPEED + REPRAP_DISCOUNT_SMART_CONTROLLER + opt_disable \ SHOW_CUSTOM_BOOTSCREEN \ From cdd58c958fdf92015c7694012b7503aecd2d3558 Mon Sep 17 00:00:00 2001 From: Ryan V1 <55478432+V1EngineeringInc@users.noreply.github.com> Date: Sun, 28 Feb 2021 18:14:54 -0800 Subject: [PATCH 5/8] Update reprap_discount_full_graphic_lcd just to rebuild --- src/configs/accessories/reprap_discount_full_graphic_lcd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configs/accessories/reprap_discount_full_graphic_lcd b/src/configs/accessories/reprap_discount_full_graphic_lcd index 691e1ec8..7dc9b25e 100755 --- a/src/configs/accessories/reprap_discount_full_graphic_lcd +++ b/src/configs/accessories/reprap_discount_full_graphic_lcd @@ -2,7 +2,7 @@ opt_enable \ SDSUPPORT \ REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER -opt_set LCD_TIMEOUT_TO_STATUS "180000" +opt_set LCD_TIMEOUT_TO_STATUS "180001" opt_add ST7920_DELAY_2 "DELAY_NS(250)" opt_add ST7920_DELAY_3 "DELAY_NS(250)" From c4e147816bc49c1fad8778d96736f972d8d49865 Mon Sep 17 00:00:00 2001 From: Ryan V1 <55478432+V1EngineeringInc@users.noreply.github.com> Date: Mon, 1 Mar 2021 08:20:07 -0800 Subject: [PATCH 6/8] Update reprap_discount_full_graphic_lcd I think this was just fixed. Fingers crossed. Changed to rebuild. --- src/configs/accessories/reprap_discount_full_graphic_lcd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configs/accessories/reprap_discount_full_graphic_lcd b/src/configs/accessories/reprap_discount_full_graphic_lcd index 7dc9b25e..691e1ec8 100755 --- a/src/configs/accessories/reprap_discount_full_graphic_lcd +++ b/src/configs/accessories/reprap_discount_full_graphic_lcd @@ -2,7 +2,7 @@ opt_enable \ SDSUPPORT \ REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER -opt_set LCD_TIMEOUT_TO_STATUS "180001" +opt_set LCD_TIMEOUT_TO_STATUS "180000" opt_add ST7920_DELAY_2 "DELAY_NS(250)" opt_add ST7920_DELAY_3 "DELAY_NS(250)" From 3441d204525427aef1a935ba5941c8840a3ab59d Mon Sep 17 00:00:00 2001 From: Jeff Eberl Date: Mon, 1 Mar 2021 14:47:57 -0700 Subject: [PATCH 7/8] Fix typo, and handle different strings in different versions. --- .../accessories/reprap_discount_full_graphic_lcd | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/configs/accessories/reprap_discount_full_graphic_lcd b/src/configs/accessories/reprap_discount_full_graphic_lcd index 691e1ec8..6291a614 100755 --- a/src/configs/accessories/reprap_discount_full_graphic_lcd +++ b/src/configs/accessories/reprap_discount_full_graphic_lcd @@ -1,11 +1,18 @@ opt_enable \ SDSUPPORT \ REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER - + opt_set LCD_TIMEOUT_TO_STATUS "180000" opt_add ST7920_DELAY_2 "DELAY_NS(250)" opt_add ST7920_DELAY_3 "DELAY_NS(250)" -opt_ser SD_SPI_SPEED SPI_HALF_SPEED +if [ "$MARLIN_VERSION" = "2.0.7.2" ] +then + opt_set SPI_SPEED SPI_HALF_SPEED +else + opt_set SD_SPI_SPEED SPI_HALF_SPEED +fi + + echo "- Configured for REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER" >> README.md From 73ce85ad4cfb4f1e659fff5e46fbeee4b43d15c1 Mon Sep 17 00:00:00 2001 From: Jeff Eberl Date: Mon, 1 Mar 2021 14:48:27 -0700 Subject: [PATCH 8/8] Change XY_PROBE_SPEED to XY_PROBE_FEEDRATE in versions that are not 2.0.7.2. --- src/configs/common/3dp-config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/configs/common/3dp-config b/src/configs/common/3dp-config index b294b2af..bce17c12 100755 --- a/src/configs/common/3dp-config +++ b/src/configs/common/3dp-config @@ -11,7 +11,12 @@ opt_set DEFAULT_MAX_FEEDRATE "{ 150, 150, 15, 24 }" opt_set DEFAULT_MAX_ACCELERATION "{ 2000, 2000, 100, 3000 }" opt_set DEFAULT_ACCELERATION "2000" opt_set DEFAULT_TRAVEL_ACCELERATION "2000" -opt_set XY_PROBE_SPEED "6000" +if [ "$MARLIN_VERSION" = "2.0.7.2" ] +then + opt_set XY_PROBE_SPEED "6000" +else + opt_set XY_PROBE_FEEDRATE "6000" +fi opt_set HOMING_FEEDRATE_MM_M "{ (40*60), (40*60), (3*60) }" opt_set PREHEAT_1_TEMP_HOTEND "196" opt_set PREHEAT_1_TEMP_BED "62"