瀏覽代碼

Update Configuration.h

BorisLandoni 12 年之前
父節點
當前提交
6588933c04
共有 1 個檔案被更改,包括 31 行新增30 行删除
  1. 31
    30
      Marlin/Configuration.h

+ 31
- 30
Marlin/Configuration.h 查看文件

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

Loading…
取消
儲存