Browse Source

local configuration stuff- WATCHPERIOD causes breakage, disable. few other misc changes

Michael Moon 12 years ago
parent
commit
ab01658fd2
2 changed files with 18 additions and 18 deletions
  1. 16
    16
      Marlin/Configuration.h
  2. 2
    2
      Marlin/pins.h

+ 16
- 16
Marlin/Configuration.h View File

70
 // This waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
70
 // This waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
71
 // If the temperature has not increased at the end of that period, the target temperature is set to zero. 
71
 // If the temperature has not increased at the end of that period, the target temperature is set to zero. 
72
 // It can be reset with another M104/M109
72
 // It can be reset with another M104/M109
73
-#define WATCHPERIOD 20000 //20 seconds
73
+// #define WATCHPERIOD 20000 //20 seconds
74
 
74
 
75
 // Actual temperature must be close to target for this long before M109 returns success
75
 // Actual temperature must be close to target for this long before M109 returns success
76
-#define TEMP_RESIDENCY_TIME 50  // (seconds)
76
+#define TEMP_RESIDENCY_TIME 5   // (seconds)
77
 #define TEMP_HYSTERESIS 3       // (C°) range of +/- temperatures considered "close" to the target one
77
 #define TEMP_HYSTERESIS 3       // (C°) range of +/- temperatures considered "close" to the target one
78
 
78
 
79
 //// The minimal temperature defines the temperature below which the heater will not be enabled
79
 //// The minimal temperature defines the temperature below which the heater will not be enabled
181
 
181
 
182
 // Endstop Settings
182
 // Endstop Settings
183
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
183
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
184
-
185
 // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
184
 // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
186
-const bool X_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. 
187
-const bool Y_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. 
188
-const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. 
185
+
186
+const bool X_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. 
187
+const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. 
188
+const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. 
189
 // For optos H21LOB set to true, for Mendel-Parts newer optos TCST2103 set to false
189
 // For optos H21LOB set to true, for Mendel-Parts newer optos TCST2103 set to false
190
 
190
 
191
-#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
191
+//#define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing
192
 
192
 
193
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
193
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
194
 #define X_ENABLE_ON 0
194
 #define X_ENABLE_ON 0
217
 
217
 
218
 //// ENDSTOP SETTINGS:
218
 //// ENDSTOP SETTINGS:
219
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
219
 // Sets direction of endstops when homing; 1=MAX, -1=MIN
220
-#define X_HOME_DIR -1
220
+#define X_HOME_DIR  1
221
 #define Y_HOME_DIR -1
221
 #define Y_HOME_DIR -1
222
 #define Z_HOME_DIR -1
222
 #define Z_HOME_DIR -1
223
 
223
 
246
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {64,64,3200,110}                    // default steps per unit for ultimaker 
246
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {64,64,3200,110}                    // default steps per unit for ultimaker 
247
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {40, 40, 3333.92, 360} //sells mendel with v9 extruder
247
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {40, 40, 3333.92, 360} //sells mendel with v9 extruder
248
 //#define DEFAULT_AXIS_STEPS_PER_UNIT   {80.3232, 80.8900, 2284.7651, 757.2218} // SAE Prusa w/ Wade extruder
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, 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.
249
+#define DEFAULT_MAX_FEEDRATE          {500, 500, 2.5, 1000}    // (mm/sec)
250
+#define DEFAULT_MAX_ACCELERATION      {7000,7000,50,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.
251
 
251
 
252
-#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves 
253
-#define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for r retracts
252
+#define DEFAULT_ACCELERATION          4000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves 
253
+#define DEFAULT_RETRACT_ACCELERATION  7000   // X, Y, Z and E max acceleration in mm/s^2 for r retracts
254
 
254
 
255
-#define DEFAULT_MINIMUMFEEDRATE       0.0     // minimum feedrate
256
-#define DEFAULT_MINTRAVELFEEDRATE     0.0
255
+#define DEFAULT_MINIMUMFEEDRATE       10.0     // minimum feedrate
256
+#define DEFAULT_MINTRAVELFEEDRATE     10.0
257
 
257
 
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.
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
 #define DEFAULT_MINSEGMENTTIME        20000   // Obsolete delete this
259
 #define DEFAULT_MINSEGMENTTIME        20000   // Obsolete delete this
260
-#define DEFAULT_XYJERK                12.0    // (mm/sec)
261
-#define DEFAULT_ZJERK                 0.4     // (mm/sec)
260
+#define DEFAULT_XYJERK                8.0    // (mm/sec)
261
+#define DEFAULT_ZJERK                 0.1     // (mm/sec)
262
 
262
 
263
 // If defined the movements slow down when the look ahead buffer is only half full
263
 // If defined the movements slow down when the look ahead buffer is only half full
264
 #define SLOWDOWN
264
 #define SLOWDOWN

+ 2
- 2
Marlin/pins.h View File

7
 #define X_STEP_PIN          2
7
 #define X_STEP_PIN          2
8
 #define X_DIR_PIN           3
8
 #define X_DIR_PIN           3
9
 #define X_ENABLE_PIN        -1
9
 #define X_ENABLE_PIN        -1
10
-#define X_MIN_PIN           16
11
-#define X_MAX_PIN           -1
10
+#define X_MIN_PIN           -1
11
+#define X_MAX_PIN           16
12
 
12
 
13
 #define Y_STEP_PIN          5
13
 #define Y_STEP_PIN          5
14
 #define Y_DIR_PIN           6
14
 #define Y_DIR_PIN           6

Loading…
Cancel
Save