From fafc91bea137db0ad27b06f4bacd31a0c0a09e44 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Sat, 6 Jun 2020 01:03:30 +0200 Subject: [PATCH] Add config switch defines for automated releases. --- Marlin/Configuration.h | 54 +++++++++++++++++++++++++++++++++++++++- Marlin/src/inc/Version.h | 2 +- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d0d292de..09639616 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -38,6 +38,9 @@ */ #define CONFIGURATION_H_VERSION 020005 +#define KNUTWURST_MEGAS +#define KNUTWURST_TMC + //=========================================================================== //============================= Getting Started ============================= //=========================================================================== @@ -673,7 +676,7 @@ * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ - +#if ENABLED(KNUTWURST_TMC) #define X_DRIVER_TYPE TMC2208_STANDALONE #define Y_DRIVER_TYPE TMC2208_STANDALONE #define Z_DRIVER_TYPE TMC2208_STANDALONE @@ -690,6 +693,26 @@ //#define E5_DRIVER_TYPE A4988 //#define E6_DRIVER_TYPE A4988 //#define E7_DRIVER_TYPE A4988 +#endif + +#if DISABLED(KNUTWURST_TMC) +#define X_DRIVER_TYPE A4988 +#define Y_DRIVER_TYPE A4988 +#define Z_DRIVER_TYPE A4988 +#define X2_DRIVER_TYPE A4988 +#define Y2_DRIVER_TYPE A4988 +#define Z2_DRIVER_TYPE A4988 +#define Z3_DRIVER_TYPE A4988 +#define Z4_DRIVER_TYPE A4988 +#define E0_DRIVER_TYPE A4988 +#define E1_DRIVER_TYPE A4988 +#define E2_DRIVER_TYPE A4988 +#define E3_DRIVER_TYPE A4988 +#define E4_DRIVER_TYPE A4988 +//#define E5_DRIVER_TYPE A4988 +//#define E6_DRIVER_TYPE A4988 +//#define E7_DRIVER_TYPE A4988 +#endif // Enable this feature if all enabled endstop pins are interrupt-capable. // This will remove the need to poll the interrupt pins, saving many CPU cycles. @@ -734,7 +757,15 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ + +#if ENABLED(KNUTWURST_MEGAS) #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 384 } +#endif + +#if DISABLED(KNUTWURST_MEGAS) +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 96 } +#endif + /** * Default Max Feed Rate (mm/s) * Override with M203 @@ -1058,6 +1089,7 @@ // @section machine +#if ENABLED(KNUTWURST_TMC) // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. #define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors #define INVERT_Y_DIR true // set to false for stock drivers or TMC2208 with reversed connectors @@ -1074,6 +1106,26 @@ #define INVERT_E5_DIR false #define INVERT_E6_DIR false #define INVERT_E7_DIR false +#endif + +#if DISABLED(KNUTWURST_TMC) +// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. +#define INVERT_X_DIR true // set to true for stock drivers or TMC2208 with reversed connectors +#define INVERT_Y_DIR false // set to false for stock drivers or TMC2208 with reversed connectors +#define INVERT_Z_DIR false // set to false for stock drivers or TMC2208 with reversed connectors + +// @section extruder + +// For direct drive extruder v9 set to true, for geared extruder set to false. +#define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors +#define INVERT_E1_DIR false // set to false for stock drivers or TMC2208 with reversed connectors +#define INVERT_E2_DIR false +#define INVERT_E3_DIR false +#define INVERT_E4_DIR false +#define INVERT_E5_DIR false +#define INVERT_E6_DIR false +#define INVERT_E7_DIR false +#endif // @section homing diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 89bb37ff..3c738dbd 100755 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -38,7 +38,7 @@ * Defines the version of the Marlin build. Not to be confused with * Marlin's own build number, e.g. 2.0.x. */ - #define CUSTOM_BUILD_VERSION "1.0.0" + #define CUSTOM_BUILD_VERSION "1.0.1" #ifndef STRING_DISTRIBUTION_DATE #define STRING_DISTRIBUTION_DATE "2020-03-31"