SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed Delta from the default config file.

Browse source 
Changed EEPROM CHITCHAT behavior. M503 is always enabled.
This commit is contained in:
Erik van der Zalm 2013-09-14 13:50:09 +02:00
parent 59e36f1d27
commit 3626b5ad8b
3 changed files with 5 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Marlin/Configuration.h
View file

@ -70,46 +70,6 @@
#define POWER_SUPPLY 1 #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 ============================ //=============================Thermal Settings ============================
//=========================================================================== //===========================================================================

4
Marlin/ConfigurationStore.cpp
View file

@ -94,7 +94,7 @@ void Config_StoreSettings()
#endif //EEPROM_SETTINGS #endif //EEPROM_SETTINGS
#ifdef EEPROM_CHITCHAT #ifndef DISABLE_M503
void Config_PrintSettings() void Config_PrintSettings()
{ // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown { // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown
SERIAL_ECHO_START; SERIAL_ECHO_START;
@ -231,7 +231,9 @@ void Config_RetrieveSettings()
{ {
Config_ResetDefault(); Config_ResetDefault();
} }
#ifdef EEPROM_CHITCHAT
Config_PrintSettings(); Config_PrintSettings();
#endif
} }
#endif #endif

2
Marlin/ConfigurationStore.h
View file

@ -5,7 +5,7 @@
void Config_ResetDefault(); void Config_ResetDefault();
#ifdef EEPROM_CHITCHAT #ifndef DISABLE_M503
void Config_PrintSettings(); void Config_PrintSettings();
#else #else
FORCE_INLINE void Config_PrintSettings() {} FORCE_INLINE void Config_PrintSettings() {}