BorisLandoni 12 лет назад
Родитель
Сommit
8a5bd8a808
1 измененных файлов: 27 добавлений и 27 удалений
  1. 27
    27
      Marlin/Configuration.h

+ 27
- 27
Marlin/Configuration.h Просмотреть файл

@@ -9,7 +9,7 @@
9 9
 //Implementation of an idea by Prof Braino to inform user that any changes made
10 10
 //to this build by the user have been successfully uploaded into firmware.
11 11
 #define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
12
-#define STRING_CONFIG_H_AUTHOR "(Boris Landoni)" //Who made the changes.
12
+-#define STRING_CONFIG_H_AUTHOR "(none, default config)" //Who made the changes.
13 13
 
14 14
 // SERIAL_PORT selects which serial port should be used for communication with the host.
15 15
 // This allows the connection of wireless adapters (for instance) to non-default port pins.
@@ -90,7 +90,7 @@
90 90
 // 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)
91 91
 // 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan) (1k pullup)
92 92
 
93
-#define TEMP_SENSOR_0 5
93
+#define TEMP_SENSOR_0 -1
94 94
 #define TEMP_SENSOR_1 -1
95 95
 #define TEMP_SENSOR_2 0
96 96
 #define TEMP_SENSOR_BED 0
@@ -141,9 +141,9 @@
141 141
 
142 142
 // If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it
143 143
 // Ultimaker
144
-//    #define  DEFAULT_Kp 22.2
145
-//    #define  DEFAULT_Ki 1.08
146
-//    #define  DEFAULT_Kd 114
144
+    #define  DEFAULT_Kp 22.2
145
+    #define  DEFAULT_Ki 1.08
146
+    #define  DEFAULT_Kd 114
147 147
 
148 148
 // Makergear
149 149
 //    #define  DEFAULT_Kp 7.0
@@ -151,9 +151,9 @@
151 151
 //    #define  DEFAULT_Kd 12
152 152
 
153 153
 // Mendel Parts V9 on 12V
154
-    #define  DEFAULT_Kp 63.0
155
-    #define  DEFAULT_Ki 2.25
156
-    #define  DEFAULT_Kd 440
154
+//    #define  DEFAULT_Kp 63.0
155
+//    #define  DEFAULT_Ki 2.25
156
+//    #define  DEFAULT_Kd 440
157 157
 #endif // PIDTEMP
158 158
 
159 159
 // Bed Temperature Control
@@ -224,18 +224,18 @@
224 224
 #endif
225 225
 
226 226
 #ifdef ENDSTOPPULLUPS
227
-//  #define ENDSTOPPULLUP_XMAX
228
-//  #define ENDSTOPPULLUP_YMAX
229
-//  #define ENDSTOPPULLUP_ZMAX
227
+  #define ENDSTOPPULLUP_XMAX
228
+  #define ENDSTOPPULLUP_YMAX
229
+  #define ENDSTOPPULLUP_ZMAX
230 230
   #define ENDSTOPPULLUP_XMIN
231 231
   #define ENDSTOPPULLUP_YMIN
232 232
   #define ENDSTOPPULLUP_ZMIN
233 233
 #endif
234 234
 
235 235
 // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
236
-const bool X_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
237
-const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
238
-const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops.
236
+const bool X_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
237
+const bool Y_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
238
+const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops.
239 239
 //#define DISABLE_MAX_ENDSTOPS
240 240
 
241 241
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
@@ -247,15 +247,15 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
247 247
 // Disables axis when it's not being used.
248 248
 #define DISABLE_X false
249 249
 #define DISABLE_Y false
250
-#define DISABLE_Z true
250
+#define DISABLE_Z false
251 251
 #define DISABLE_E false // For all extruders
252 252
 
253
-#define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
253
+#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
254 254
 #define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
255
-#define INVERT_Z_DIR false     // for Mendel set to false, for Orca set to true
256
-#define INVERT_E0_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
257
-#define INVERT_E1_DIR true    // for direct drive extruder v9 set to true, for geared extruder set to false
258
-#define INVERT_E2_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false
255
+#define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
256
+#define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
257
+#define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
258
+#define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
259 259
 
260 260
 // ENDSTOP SETTINGS:
261 261
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
@@ -266,11 +266,11 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
266 266
 #define min_software_endstops true //If true, axis won't move to coordinates less than HOME_POS.
267 267
 #define max_software_endstops true  //If true, axis won't move to coordinates greater than the defined lengths below.
268 268
 // Travel limits after homing
269
-#define X_MAX_POS 200
269
+#define X_MAX_POS 205
270 270
 #define X_MIN_POS 0
271
-#define Y_MAX_POS 200
271
+#define Y_MAX_POS 205
272 272
 #define Y_MIN_POS 0
273
-#define Z_MAX_POS 220
273
+#define Z_MAX_POS 200
274 274
 #define Z_MIN_POS 0
275 275
 
276 276
 #define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS)
@@ -292,8 +292,8 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
292 292
 
293 293
 // default settings
294 294
 
295
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {64.25,64.25,2560,600}  // default steps per unit for ultimaker
296
-#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 500}    // (mm/sec)
295
+#define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200.0*8/3,760*1.1}  // default steps per unit for ultimaker
296
+#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 25}    // (mm/sec)
297 297
 #define DEFAULT_MAX_ACCELERATION      {9000,9000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot.
298 298
 
299 299
 #define DEFAULT_ACCELERATION          1000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
@@ -320,7 +320,7 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
320 320
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
321 321
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
322 322
 //define this to enable eeprom support
323
-#define EEPROM_SETTINGS
323
+//#define EEPROM_SETTINGS
324 324
 //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
325 325
 // please keep turned on if you can.
326 326
 //#define EEPROM_CHITCHAT
@@ -340,7 +340,7 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
340 340
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
341 341
 //#define SDSLOW // Use slower SD transfer mode (not normally needed - uncomment if you're getting volume init error)
342 342
 
343
-#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
343
+//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
344 344
 //#define ULTIPANEL  //the ultipanel as on thingiverse
345 345
 
346 346
 // The RepRapDiscount Smart Controller (white PCB)

Загрузка…
Отмена
Сохранить