Browse Source

Updated the pin config for RAMPS 1.3 to include ultimaker new style LCD/Rotary Encoder interface

Blair Thompson 13 years ago
parent
commit
1b6765ed12
2 changed files with 88 additions and 20 deletions
  1. 19
    19
      Marlin/Configuration.h
  2. 69
    1
      Marlin/pins.h

+ 19
- 19
Marlin/Configuration.h View File

@@ -23,7 +23,7 @@
23 23
 // Ultimaker = 7,
24 24
 // Teensylu = 8,
25 25
 // Gen3+ =9
26
-#define MOTHERBOARD 7
26
+#define MOTHERBOARD 33
27 27
 
28 28
 //===========================================================================
29 29
 //=============================Thermal Settings  ============================
@@ -41,13 +41,13 @@
41 41
 // 6 is EPCOS 100k
42 42
 // 7 is 100k Honeywell thermistor 135-104LAG-J01
43 43
 
44
-#define TEMP_SENSOR_0 -1
44
+#define TEMP_SENSOR_0 1
45 45
 #define TEMP_SENSOR_1 0
46 46
 #define TEMP_SENSOR_2 0
47
-#define TEMP_SENSOR_BED 0
47
+#define TEMP_SENSOR_BED 1
48 48
 
49 49
 // Actual temperature must be close to target for this long before M109 returns success
50
-#define TEMP_RESIDENCY_TIME 30  // (seconds)
50
+#define TEMP_RESIDENCY_TIME 10	// 30  // (seconds) 30 seconds was too long
51 51
 #define TEMP_HYSTERESIS 3       // (C°) range of +/- temperatures considered "close" to the target one
52 52
 
53 53
 // The minimal temperature defines the temperature below which the heater will not be enabled It is used
@@ -97,7 +97,7 @@
97 97
 //this prevents dangerous Extruder moves, i.e. if the temperature is under the limit
98 98
 //can be software-disabled for whatever purposes by
99 99
 #define PREVENT_DANGEROUS_EXTRUDE
100
-#define EXTRUDE_MINTEMP 190
100
+#define EXTRUDE_MINTEMP 170		// 190 //  Lowered a bit as I want to print PLA
101 101
 #define EXTRUDE_MAXLENGTH (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances.
102 102
 
103 103
 //===========================================================================
@@ -108,9 +108,9 @@
108 108
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
109 109
 
110 110
 // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins.
111
-const bool X_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. 
112
-const bool Y_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. 
113
-const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. 
111
+const bool X_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. 
112
+const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. 
113
+const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. 
114 114
 
115 115
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
116 116
 #define X_ENABLE_ON 0
@@ -124,8 +124,8 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
124 124
 #define DISABLE_Z false
125 125
 #define DISABLE_E false // For all extruders
126 126
 
127
-#define INVERT_X_DIR true    // for Mendel set to false, for Orca set to true
128
-#define INVERT_Y_DIR false    // for Mendel set to true, for Orca set to false
127
+#define INVERT_X_DIR false    // for Mendel set to false, for Orca set to true
128
+#define INVERT_Y_DIR true    // for Mendel set to true, for Orca set to false
129 129
 #define INVERT_Z_DIR true     // for Mendel set to false, for Orca set to true
130 130
 #define INVERT_E0_DIR false   // for direct drive extruder v9 set to true, for geared extruder set to false
131 131
 #define INVERT_E1_DIR false    // for direct drive extruder v9 set to true, for geared extruder set to false
@@ -139,22 +139,22 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
139 139
 
140 140
 #define min_software_endstops true //If true, axis won't move to coordinates less than zero.
141 141
 #define max_software_endstops true  //If true, axis won't move to coordinates greater than the defined lengths below.
142
-#define X_MAX_LENGTH 205
143
-#define Y_MAX_LENGTH 205
144
-#define Z_MAX_LENGTH 200
142
+#define X_MAX_LENGTH 175
143
+#define Y_MAX_LENGTH 185
144
+#define Z_MAX_LENGTH 90
145 145
 
146 146
 //// MOVEMENT SETTINGS
147 147
 #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E
148
-#define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0}  // set the homing speeds (mm/min)
148
+#define HOMING_FEEDRATE {1500, 1500, 80, 0} // {50*60, 50*60, 4*60, 0}  // set the homing speeds (mm/min)
149 149
 
150 150
 // default settings 
151 151
 
152
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {78.7402,78.7402,200*8/3,760*1.1}                    // default steps per unit for ultimaker 
152
+#define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 2560,640.15}	// {78.7402,78.7402,200*8/3,760*1.1} // default steps per unit for metric prusa 
153 153
 #define DEFAULT_MAX_FEEDRATE          {500, 500, 5, 45}    // (mm/sec)    
154 154
 #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.
155 155
 
156
-#define DEFAULT_ACCELERATION          3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves 
157
-#define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for r retracts
156
+#define DEFAULT_ACCELERATION          1500	// 3000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves 
157
+#define DEFAULT_RETRACT_ACCELERATION  1500	// 3000   // X, Y, Z and E max acceleration in mm/s^2 for r retracts
158 158
 
159 159
 // 
160 160
 #define DEFAULT_XYJERK                20.0    // (mm/sec)
@@ -179,9 +179,9 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
179 179
 //#define ULTRA_LCD  //general lcd support, also 16x2
180 180
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
181 181
 
182
-//#define ULTIPANEL
182
+#define ULTIPANEL
183 183
 #ifdef ULTIPANEL
184
-  //#define NEWPANEL  //enable this if you have a click-encoder panel
184
+  #define NEWPANEL  //enable this if you have a click-encoder panel
185 185
   #define SDSUPPORT
186 186
   #define ULTRA_LCD
187 187
   #define LCD_WIDTH 20

+ 69
- 1
Marlin/pins.h View File

@@ -265,7 +265,7 @@
265 265
 #define SDPOWER            -1
266 266
 #define SDSS               53
267 267
 #define LED_PIN            13
268
-#define FAN_PIN            4
268
+#define FAN_PIN            9 // Uses HEATER_1 on Ramps Board
269 269
 #define PS_ON_PIN          12
270 270
 #define KILL_PIN           -1
271 271
 
@@ -278,6 +278,74 @@
278 278
 #define HEATER_BED_PIN     8    // BED
279 279
 #define TEMP_BED_PIN       14   // ANALOG NUMBERING
280 280
 
281
+#ifdef ULTRA_LCD
282
+
283
+  #ifdef NEWPANEL
284
+  //arduino pin witch triggers an piezzo beeper
285
+    #define BEEPER -1			// No Beeper added
286
+
287
+    #define LCD_PINS_RS 16 
288
+    #define LCD_PINS_ENABLE 17
289
+    #define LCD_PINS_D4 23
290
+    #define LCD_PINS_D5 25 
291
+    #define LCD_PINS_D6 27
292
+    #define LCD_PINS_D7 29
293
+    
294
+    //buttons are directly attached using AUX-2
295
+    #define BTN_EN1 44
296
+    #define BTN_EN2 42
297
+    #define BTN_ENC 64  //the click
298
+    
299
+    #define BLEN_C 2
300
+    #define BLEN_B 1
301
+    #define BLEN_A 0
302
+    
303
+    #define SDCARDDETECT -1		// Ramps does not use this port
304
+    
305
+      //encoder rotation values
306
+    #define encrot0 0
307
+    #define encrot1 2
308
+    #define encrot2 3
309
+    #define encrot3 1
310
+
311
+  #else //old style panel with shift register
312
+    //arduino pin witch triggers an piezzo beeper
313
+    #define BEEPER -1		No Beeper added
314
+
315
+    //buttons are attached to a shift register
316
+	// Not wired this yet
317
+    //#define SHIFT_CLK 38
318
+    //#define SHIFT_LD 42
319
+    //#define SHIFT_OUT 40
320
+    //#define SHIFT_EN 17
321
+    
322
+    #define LCD_PINS_RS 16 
323
+    #define LCD_PINS_ENABLE 17
324
+    #define LCD_PINS_D4 23
325
+    #define LCD_PINS_D5 25 
326
+    #define LCD_PINS_D6 27
327
+    #define LCD_PINS_D7 29
328
+    
329
+    //encoder rotation values
330
+    #define encrot0 0
331
+    #define encrot1 2
332
+    #define encrot2 3
333
+    #define encrot3 1
334
+
335
+    
336
+    //bits in the shift register that carry the buttons for:
337
+    // left up center down right red
338
+    #define BL_LE 7
339
+    #define BL_UP 6
340
+    #define BL_MI 5
341
+    #define BL_DW 4
342
+    #define BL_RI 3
343
+    #define BL_ST 2
344
+
345
+    #define BLEN_B 1
346
+    #define BLEN_A 0
347
+  #endif 
348
+#endif //ULTRA_LCD
281 349
 
282 350
 #else // RAMPS_V_1_1 or RAMPS_V_1_2 as default
283 351
 

Loading…
Cancel
Save