diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9ff27f5b0..ef7a359e4 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -70,46 +70,6 @@ #define POWER_SUPPLY 1 - -//=========================================================================== -//============================== Delta Settings ============================= -//=========================================================================== -// Enable DELTA kinematics -//#define DELTA - -// Make delta curves from many straight lines (linear interpolation). -// This is a trade-off between visible corners (not enough segments) -// and processor overload (too many expensive sqrt calls). -#define DELTA_SEGMENTS_PER_SECOND 200 - -// Center-to-center distance of the holes in the diagonal push rods. -#define DELTA_DIAGONAL_ROD 250.0 // mm - -// Horizontal offset from middle of printer to smooth rod center. -#define DELTA_SMOOTH_ROD_OFFSET 175.0 // mm - -// Horizontal offset of the universal joints on the end effector. -#define DELTA_EFFECTOR_OFFSET 33.0 // mm - -// Horizontal offset of the universal joints on the carriages. -#define DELTA_CARRIAGE_OFFSET 18.0 // mm - -// Effective horizontal distance bridged by diagonal push rods. -#define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET) - -// Effective X/Y positions of the three vertical towers. -#define SIN_60 0.8660254037844386 -#define COS_60 0.5 -#define DELTA_TOWER1_X -SIN_60*DELTA_RADIUS // front left tower -#define DELTA_TOWER1_Y -COS_60*DELTA_RADIUS -#define DELTA_TOWER2_X SIN_60*DELTA_RADIUS // front right tower -#define DELTA_TOWER2_Y -COS_60*DELTA_RADIUS -#define DELTA_TOWER3_X 0.0 // back middle tower -#define DELTA_TOWER3_Y DELTA_RADIUS - -// Diagonal rod squared -#define DELTA_DIAGONAL_ROD_2 pow(DELTA_DIAGONAL_ROD,2) - //=========================================================================== //=============================Thermal Settings ============================ //=========================================================================== diff --git a/Marlin/ConfigurationStore.cpp b/Marlin/ConfigurationStore.cpp index 5d47d3d54..1fb72450c 100644 --- a/Marlin/ConfigurationStore.cpp +++ b/Marlin/ConfigurationStore.cpp @@ -94,7 +94,7 @@ void Config_StoreSettings() #endif //EEPROM_SETTINGS -#ifdef EEPROM_CHITCHAT +#ifndef DISABLE_M503 void Config_PrintSettings() { // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown SERIAL_ECHO_START; @@ -231,7 +231,9 @@ void Config_RetrieveSettings() { Config_ResetDefault(); } - Config_PrintSettings(); + #ifdef EEPROM_CHITCHAT + Config_PrintSettings(); + #endif } #endif diff --git a/Marlin/ConfigurationStore.h b/Marlin/ConfigurationStore.h index 2bbf4808c..4f68b13a6 100644 --- a/Marlin/ConfigurationStore.h +++ b/Marlin/ConfigurationStore.h @@ -5,7 +5,7 @@ void Config_ResetDefault(); -#ifdef EEPROM_CHITCHAT +#ifndef DISABLE_M503 void Config_PrintSettings(); #else FORCE_INLINE void Config_PrintSettings() {}