Browse Source

Removed Delta from the default config file.

Changed EEPROM CHITCHAT behavior. M503 is always enabled.
Erik van der Zalm 10 years ago
parent
commit
3626b5ad8b
3 changed files with 5 additions and 43 deletions
  1. 0
    40
      Marlin/Configuration.h
  2. 4
    2
      Marlin/ConfigurationStore.cpp
  3. 1
    1
      Marlin/ConfigurationStore.h

+ 0
- 40
Marlin/Configuration.h View File

@@ -70,46 +70,6 @@
70 70
 
71 71
 #define POWER_SUPPLY 1
72 72
 
73
-
74
-//===========================================================================
75
-//============================== Delta Settings =============================
76
-//===========================================================================
77
-// Enable DELTA kinematics
78
-//#define DELTA
79
-
80
-// Make delta curves from many straight lines (linear interpolation).
81
-// This is a trade-off between visible corners (not enough segments)
82
-// and processor overload (too many expensive sqrt calls).
83
-#define DELTA_SEGMENTS_PER_SECOND 200
84
-
85
-// Center-to-center distance of the holes in the diagonal push rods.
86
-#define DELTA_DIAGONAL_ROD 250.0 // mm
87
-
88
-// Horizontal offset from middle of printer to smooth rod center.
89
-#define DELTA_SMOOTH_ROD_OFFSET 175.0 // mm
90
-
91
-// Horizontal offset of the universal joints on the end effector.
92
-#define DELTA_EFFECTOR_OFFSET 33.0 // mm
93
-
94
-// Horizontal offset of the universal joints on the carriages.
95
-#define DELTA_CARRIAGE_OFFSET 18.0 // mm
96
-
97
-// Effective horizontal distance bridged by diagonal push rods.
98
-#define DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)
99
-
100
-// Effective X/Y positions of the three vertical towers.
101
-#define SIN_60 0.8660254037844386
102
-#define COS_60 0.5
103
-#define DELTA_TOWER1_X -SIN_60*DELTA_RADIUS // front left tower
104
-#define DELTA_TOWER1_Y -COS_60*DELTA_RADIUS
105
-#define DELTA_TOWER2_X SIN_60*DELTA_RADIUS // front right tower
106
-#define DELTA_TOWER2_Y -COS_60*DELTA_RADIUS
107
-#define DELTA_TOWER3_X 0.0 // back middle tower
108
-#define DELTA_TOWER3_Y DELTA_RADIUS
109
-
110
-// Diagonal rod squared
111
-#define DELTA_DIAGONAL_ROD_2 pow(DELTA_DIAGONAL_ROD,2)
112
-
113 73
 //===========================================================================
114 74
 //=============================Thermal Settings  ============================
115 75
 //===========================================================================

+ 4
- 2
Marlin/ConfigurationStore.cpp View File

@@ -94,7 +94,7 @@ void Config_StoreSettings()
94 94
 #endif //EEPROM_SETTINGS
95 95
 
96 96
 
97
-#ifdef EEPROM_CHITCHAT
97
+#ifndef DISABLE_M503
98 98
 void Config_PrintSettings()
99 99
 {  // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown
100 100
     SERIAL_ECHO_START;
@@ -231,7 +231,9 @@ void Config_RetrieveSettings()
231 231
     {
232 232
         Config_ResetDefault();
233 233
     }
234
-    Config_PrintSettings();
234
+    #ifdef EEPROM_CHITCHAT
235
+      Config_PrintSettings();
236
+    #endif
235 237
 }
236 238
 #endif
237 239
 

+ 1
- 1
Marlin/ConfigurationStore.h View File

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

Loading…
Cancel
Save