From c6a30f7eefae3c1adfd38d89777f830d9173ac16 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Tue, 5 Mar 2019 23:06:29 -0500 Subject: [PATCH] Initial S109 driver support --- Marlin/Configuration.h | 18 ++++++++++++------ Marlin/Configuration_adv.h | 18 +++++++++--------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7d79b20a4d..9a6a16f4b3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -22,20 +22,22 @@ #pragma once // If you have a trex 3, stock is this option plus 2208 on all axis. None in spreadcycle. -//#define TREX3 +#define TREX3 //#define X_2208 //#define X_Spreadcycle +#define X_S109 //#define Y_2208 // Highly recommended as large prints with high mass can cause layer shifts with stealthchop at high speed //#define Y_Spreadcycle //#define Y_4988 // Some machines shipped with 4988 drivers across the board. Set this if you arent sure what you have and all the drivers look identical +#define Y_S109 //#define Z_2208 // NOT Recommended! Dual stepper current draw is above the recommended limit for this driver //#define Z_4988 // Some machines shipped with 4988 drivers across the board. Set this if you arent sure what you have and all the drivers look identical //#define Y_Spreadcycle //#define E_2208 // Not Recommended! Stealthchop mode faults with linear advance //#define E_Spreadcycle -//#define BedAC +#define BedAC #define tallVersion @@ -49,8 +51,12 @@ //////////////////////////////////DO not edit below here unless you know what youre doing! ////////////////////////////////// #if ENABLED(TREX3) - #define X_2208 - #define Y_2208 + #if DISABLED(X_S109) + #define X_2208 + #endif + #if DISABLED(Y_S109) + #define Y_2208 + #endif #define Z_2208 #define E_2208 #define FilamentSensor @@ -777,7 +783,7 @@ */ -#if(ENABLED(Y_2208) || ENABLED(Y_4988)) +#if(ENABLED(Y_2208) || ENABLED(Y_4988) || ENABLED(Y_S109)) #define Y_STEPSMM 80 #else #define Y_STEPSMM 160 @@ -828,7 +834,7 @@ // #define JUNCTION_DEVIATION #if ENABLED(JUNCTION_DEVIATION) - #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge + #define JUNCTION_DEVIATION_MM 0.12 // (mm) Distance from real junction edge #endif /** diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index d3fd4ee0a3..26425b0744 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2050,19 +2050,19 @@ #define COMMFANNSPEED "M106 S128 \n" #endif - #define USER_DESC_1 "UBL Commission 1" - #define USER_GCODE_1 "M502 \n M500 \n M501 \n T0 \n M190 S75 \n " COMMFANNSPEED " M104 S225 \n G28 \n G29 P1 \n G29 S1 \n M117 Run Step 2" + #define USER_DESC_1 "UBL Commission" + #define USER_GCODE_1 "M502 \n M500 \n M501 \n M190 S75 \n G28 \n G29 P1 \n G29 S1 \n G29 S0 \n G29 F 10.0 \n G29 A \n M500 \n G28 \n G29 L1 \n " COMMFANNSPEED " M109 S225 \n G1 X150 Y 150 \n G1 Z0 \n M77 \n M117 Set Z Offset" + + #define USER_DESC_4 "Fill Mesh Points" + #define USER_GCODE_4 "G29 P3 \n G29 P3 \n G29 P3 \n G29 T" - #define USER_DESC_2 "UBL Commission 2" - #define USER_GCODE_2 "G29 S1 \n G29 S0 \n G29 F 10.0 \n G29 A \n M500 \n G28 \n G29 L1 \n T0 \n" COMMFANNSPEED " M109 S225 \n G1 X150 Y 150 \n G1 Z0 \n M117 Set Z Offset" + #define USER_DESC_2 "PID Tune" + #define USER_GCODE_2 "M106 S128 \n M303 C8 S225 E1 U \n M500 \n M117 PID Tune Done" #define USER_DESC_3 "Prep for Z Adjust" - #define USER_GCODE_3 "M190 75 \n T0 \n " COMMFANNSPEED " M104 225 \n G28 \n G29 L1 \n G1 X150 Y 150 \n G1 Z0" + #define USER_GCODE_3 "M190 S75 \n " COMMFANNSPEED " M104 235 \n G28 \n G29 L1 \n G1 X100 Y 100 \n G1 Z0" - #define USER_DESC_4 "Fill Mesh Points" - #define USER_GCODE_4 "G29 P3 \n G29 P3 \n G29 P3 \n G29 T " - - #define USER_DESC_5 "Run Mesh Validation" + #define USER_DESC_5 "Run Mesh Validation" #define USER_GCODE_5 "G26" #endif