thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

my local configuration

Michael Moon 12 years ago
parent
5aadc2f5ca
commit
71dc82e0b4
2 changed files with 76 additions and 33 deletions
Split View Show Diff Stats
  1. 33
    33
      Marlin/Configuration.h
  2. 43
    0
      Marlin/pins.h

+ 33
- 33
Marlin/Configuration.h View File 

@@ -4,8 +4,8 @@
4 4
5 5
6 6 
 // This determines the communication speed of the printer
7 
-#define BAUDRATE 250000
8 
-//#define BAUDRATE 115200
7 
+//#define BAUDRATE 250000
8 
+#define BAUDRATE 115200
9 9 
 //#define BAUDRATE 230400
10 10
11 11 
 #define EXTRUDERS 1
 
@@ -29,7 +29,7 @@
29 29 
 // Sanguinololu 1.2 and above = 62
30 30 
 // Ultimaker = 7,
31 31 
 // Teensylu = 8
32 
-#define MOTHERBOARD 7
32 
+#define MOTHERBOARD 99
33 33
34 34 
 //===========================================================================
35 35 
 //=============================Thermal Settings  ============================
 
@@ -44,36 +44,36 @@
44 44 
 // 6 is EPCOS 100k
45 45 
 // 7 is 100k Honeywell thermistor 135-104LAG-J01
46 46
47 
-//#define THERMISTORHEATER_0 3
47 
+#define THERMISTORHEATER_0 1
48 48 
 //#define THERMISTORHEATER_1 1
49 49 
 //#define THERMISTORHEATER_2 1
50 50
51 
-//#define HEATER_0_USES_THERMISTOR
51 
+#define HEATER_0_USES_THERMISTOR
52 52 
 //#define HEATER_1_USES_THERMISTOR
53 53 
 //#define HEATER_2_USES_THERMISTOR
54 
-#define HEATER_0_USES_AD595
54 
+//#define HEATER_0_USES_AD595
55 55 
 //#define HEATER_1_USES_AD595
56 56 
 //#define HEATER_2_USES_AD595
57 57
58 58 
 // Select one of these only to define how the bed temp is read.
59 
-//#define THERMISTORBED 1
60 
-//#define BED_USES_THERMISTOR
59 
+#define THERMISTORBED 1
60 
+#define BED_USES_THERMISTOR
61 61 
 //#define BED_LIMIT_SWITCHING
62 62 
 #ifdef BED_LIMIT_SWITCHING
63 63 
   #define BED_HYSTERESIS 2 //only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
64 64 
 #endif
65 65 
 //#define BED_USES_AD595
66 66
67 
-#define BED_CHECK_INTERVAL 5000 //ms
67 
+#define BED_CHECK_INTERVAL 1000 //ms
68 68
69 69 
 //// Heating sanity check:
70 70 
 // This waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
71 71 
 // If the temperature has not increased at the end of that period, the target temperature is set to zero.
72 72 
 // It can be reset with another M104/M109
73 
-//#define WATCHPERIOD 20000 //20 seconds
73 
+#define WATCHPERIOD 20000 //20 seconds
74 74
75 75 
 // Actual temperature must be close to target for this long before M109 returns success
76 
-#define TEMP_RESIDENCY_TIME 30  // (seconds)
76 
+#define TEMP_RESIDENCY_TIME 50  // (seconds)
77 77 
 #define TEMP_HYSTERESIS 3       // (C°) range of +/- temperatures considered "close" to the target one
78 78
79 79 
 //// The minimal temperature defines the temperature below which the heater will not be enabled
 
@@ -86,10 +86,10 @@
86 86 
 // When temperature exceeds max temp, your heater will be switched off.
87 87 
 // This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure!
88 88 
 // You should use MINTEMP for thermistor short/failure protection.
89 
-#define HEATER_0_MAXTEMP 275
89 
+#define HEATER_0_MAXTEMP 325
90 90 
 //#define HEATER_1_MAXTEMP 275
91 91 
 //#define HEATER_2_MAXTEMP 275
92 
-//#define BED_MAXTEMP 150
92 
+#define BED_MAXTEMP 140
93 93
94 94
95 95 
 // Wait for Cooldown
 
@@ -103,7 +103,7 @@
103 103
104 104 
 // PID settings:
105 105 
 // Uncomment the following line to enable PID support.
106 
-#define PIDTEMP
106 
+//#define PIDTEMP
107 107 
 #define PID_MAX 255 // limits current to nozzle; 255=full current
108 108 
 #ifdef PIDTEMP
109 109 
   //#define PID_DEBUG // Sends debug data to the serial port. 
@@ -167,7 +167,7 @@
167 167 
 //  extruder run-out prevention.
168 168 
 //if the machine is idle, and the temperature over MINTEMP, every couple of SECONDS some filament is extruded
169 169 
 //#define EXTRUDER_RUNOUT_PREVENT
170 
-#define EXTRUDER_RUNOUT_MINTEMP 190
170 
+#define EXTRUDER_RUNOUT_MINTEMP 160
171 171 
 #define EXTRUDER_RUNOUT_SECONDS 30.
172 172 
 #define EXTRUDER_RUNOUT_ESTEPS 14. //mm filament
173 173 
 #define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
 
@@ -209,8 +209,8 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
209 209 
 //#define INVERT_E*_DIR true   // for direct drive extruder v9 set to true, for geared extruder set to false, used for all extruders
210 210
211 211 
 #define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
212 
-#define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
213 
-#define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
212 
+#define INVERT_Y_DIR true    // for Mendel set to true, for Orca set to false
213 
+#define INVERT_Z_DIR false     // for Mendel set to false, for Orca set to true
214 214 
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
215 215 
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
216 216 
 #define INVERT_E2_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
 
@@ -223,18 +223,18 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
223 223
224 224 
 #define min_software_endstops true //If true, axis won't move to coordinates less than zero.
225 225 
 #define max_software_endstops true  //If true, axis won't move to coordinates greater than the defined lengths below.
226 
-#define X_MAX_LENGTH 205
227 
-#define Y_MAX_LENGTH 205
228 
-#define Z_MAX_LENGTH 200
226 
+#define X_MAX_LENGTH 187
227 
+#define Y_MAX_LENGTH 188
228 
+#define Z_MAX_LENGTH 80
229 229
230 230 
 //// MOVEMENT SETTINGS
231 231 
 #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
232 
-#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0}  // set the homing speeds (mm/min)
232 
+#define HOMING_FEEDRATE {2400, 2400, 150, 0}  // set the homing speeds (mm/min)
233 233
234 234 
 //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
235 
-#define X_HOME_RETRACT_MM 5
236 
-#define Y_HOME_RETRACT_MM 5
237 
-#define Z_HOME_RETRACT_MM 1
235 
+#define X_HOME_RETRACT_MM 2
236 
+#define Y_HOME_RETRACT_MM 2
237 
+#define Z_HOME_RETRACT_MM 2
238 238 
 #define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
239 239
240 240 
 #define AXIS_RELATIVE_MODES {false, false, false, false}
 
@@ -243,11 +243,11 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
243 243
244 244 
 // default settings
245 245
246 
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200*8/3,760*1.1}                    // default steps per unit for ultimaker
246 
+#define DEFAULT_AXIS_STEPS_PER_UNIT   {64,64,3200,110}                    // default steps per unit for ultimaker
247 247 
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {40, 40, 3333.92, 360} //sells mendel with v9 extruder
248 248 
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {80.3232, 80.8900, 2284.7651, 757.2218} // SAE Prusa w/ Wade extruder
249 
-#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 45}    // (mm/sec)
250 
-#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.
249 
+#define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 1000}    // (mm/sec)
250 
+#define DEFAULT_MAX_ACCELERATION      {1200,1200,100,9000}    // 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.
251 251
252 252 
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
253 253 
 #define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for r retracts
 
@@ -257,7 +257,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
257 257
258 258 
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.   Increase this number if you see blobs while printing high speed & high detail.  It will slowdown on the detailed stuff.
259 259 
 #define DEFAULT_MINSEGMENTTIME        20000   // Obsolete delete this
260 
-#define DEFAULT_XYJERK                20.0    // (mm/sec)
260 
+#define DEFAULT_XYJERK                12.0    // (mm/sec)
261 261 
 #define DEFAULT_ZJERK                 0.4     // (mm/sec)
262 262
263 263 
 // If defined the movements slow down when the look ahead buffer is only half full
 
@@ -278,7 +278,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
278 278 
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
279 279 
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
280 280 
 //define this to enable eeprom support
281 
-#define EEPROM_SETTINGS
281 
+//#define EEPROM_SETTINGS
282 282 
 //to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
283 283 
 // please keep turned on if you can.
284 284 
 #define EEPROM_CHITCHAT
 
@@ -316,9 +316,9 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
316 316
317 317 
 //LCD and SD support
318 318 
 //#define ULTRA_LCD  //general lcd support, also 16x2
319 
-//#define SDSUPPORT // Enable SD Card Support in Hardware Console
320 
-#define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
321 
-#define SD_FINISHED_RELEASECOMMAND "M84 X Y E" // no z because of layer shift.
319 
+#define SDSUPPORT // Enable SD Card Support in Hardware Console
320 
+#define SD_FINISHED_STEPPERRELEASE false  //if sd support and the file is finished: disable steppers?
321 
+#define SD_FINISHED_RELEASECOMMAND "M81" // no z because of layer shift.
322 322
323 323 
 //#define ULTIPANEL
324 324 
 #ifdef ULTIPANEL
 
@@ -358,7 +358,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
358 358 
 //this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
359 359 
 //can be software-disabled for whatever purposes by
360 360 
 #define PREVENT_DANGEROUS_EXTRUDE
361 
-#define EXTRUDE_MINTEMP 190
361 
+#define EXTRUDE_MINTEMP 150
362 362 
 #define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
363 363
364 364 
 const int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement

+ 43
- 0
Marlin/pins.h View File 

@@ -1,6 +1,49 @@
1 1 
 #ifndef PINS_H
2 2 
 #define PINS_H
3 3
4 
+#if MOTHERBOARD == 99
5 
+#define	KNOWN_BOARD 1
6 
+
7 
+#define X_STEP_PIN          2
8 
+#define X_DIR_PIN           3
9 
+#define X_ENABLE_PIN        -1
10 
+#define X_MIN_PIN           16
11 
+#define X_MAX_PIN           -1
12 
+
13 
+#define Y_STEP_PIN          5
14 
+#define Y_DIR_PIN           6
15 
+#define Y_ENABLE_PIN       -1
16 
+#define Y_MIN_PIN           67
17 
+#define Y_MAX_PIN          -1
18 
+
19 
+#define Z_STEP_PIN          62
20 
+#define Z_DIR_PIN           63
21 
+#define Z_ENABLE_PIN       -1
22 
+#define Z_MIN_PIN           59
23 
+#define Z_MAX_PIN          -1
24 
+
25 
+#define E0_STEP_PIN         65
26 
+#define E0_DIR_PIN          66
27 
+#define E0_ENABLE_PIN      -1
28 
+
29 
+#define SDPOWER            -1
30 
+#define SDSS               53
31 
+#define LED_PIN            -1
32 
+#define FAN_PIN            -1
33 
+#define PS_ON_PIN           9
34 
+#define KILL_PIN           -1
35 
+
36 
+#define HEATER_0_PIN        13
37 
+#define HEATER_1_PIN       -1
38 
+#define HEATER_2_PIN       -1
39 
+#define TEMP_0_PIN          6   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
40 
+#define TEMP_1_PIN         -1   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
41 
+#define TEMP_2_PIN         -1   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
42 
+#define HEATER_BED_PIN      4
43 
+#define TEMP_BED_PIN       10
44 
+
45 
+#endif /* 99 */
46 
+
4 47 
 /****************************************************************************************
5 48 
 * Arduino pin assignment
6 49 
 *

Write Preview
Loading…
Cancel
Save