Browse Source

Merge pull request #8425 from Vynt-1/bugfix-2.0.x

Update pins_RuRAMPS
Scott Lahteine 7 years ago
parent
commit
5cfdb76186
No account linked to committer's email address
2 changed files with 122 additions and 77 deletions
  1. 1
    1
      Marlin/src/module/temperature.cpp
  2. 121
    76
      Marlin/src/pins/pins_RURAMPS4D.h

+ 1
- 1
Marlin/src/module/temperature.cpp View File

1302
           case TIMER5A: case TIMER5B: case TIMER5C: _SET_CS(5, val); break;
1302
           case TIMER5A: case TIMER5B: case TIMER5C: _SET_CS(5, val); break;
1303
         #endif
1303
         #endif
1304
       }
1304
       }
1305
-    #endif  
1305
+    #endif
1306
   }
1306
   }
1307
 
1307
 
1308
 #endif // FAST_PWM_FAN
1308
 #endif // FAST_PWM_FAN

+ 121
- 76
Marlin/src/pins/pins_RURAMPS4D.h View File

29
  *
29
  *
30
  *  Differences between
30
  *  Differences between
31
  *     RADDS | RuRAMPS4DUE
31
  *     RADDS | RuRAMPS4DUE
32
- *       A13 | A9/D63 (shares the same pin with AUX2_4PIN)
33
- *       A14 | A10/D64 (shares the same pin with AUX2_5PIN)
34
- *       A15 | NC
32
+ *           |
35
  */
33
  */
36
 
34
 
37
 #ifndef __SAM3X8E__
35
 #ifndef __SAM3X8E__
39
 #endif
37
 #endif
40
 
38
 
41
 #ifndef BOARD_NAME
39
 #ifndef BOARD_NAME
42
-  #define BOARD_NAME "RuRAMPS4Due"
40
+  #define BOARD_NAME       "RuRAMPS4Due"
43
 #endif
41
 #endif
42
+#define RURAMPS4DUE        // #1550 in boards.h
44
 
43
 
45
 #undef INVERTED_HEATER_PINS
44
 #undef INVERTED_HEATER_PINS
46
 #undef INVERTED_BED_PINS
45
 #undef INVERTED_BED_PINS
47
 #undef INVERTED_FAN_PINS
46
 #undef INVERTED_FAN_PINS
48
 
47
 
49
-#define I2C_EEPROM
50
-//#define SPI_EEPROM
51
-
52
 //
48
 //
53
 // Servos
49
 // Servos
54
 //
50
 //
77
 //
73
 //
78
 // Steppers
74
 // Steppers
79
 //
75
 //
80
-#define X_STEP_PIN         37
76
+#define X_STEP_PIN         37 // Support Extension Board
81
 #define X_DIR_PIN          36
77
 #define X_DIR_PIN          36
82
 #define X_ENABLE_PIN       38
78
 #define X_ENABLE_PIN       38
83
 #define X_CS_PIN           -1
79
 #define X_CS_PIN           -1
84
 
80
 
85
-#define Y_STEP_PIN         32
81
+#define Y_STEP_PIN         32 // Support Extension Board
86
 #define Y_DIR_PIN          35
82
 #define Y_DIR_PIN          35
87
 #define Y_ENABLE_PIN       34
83
 #define Y_ENABLE_PIN       34
88
 #define Y_CS_PIN           -1
84
 #define Y_CS_PIN           -1
89
 
85
 
90
-#define Z_STEP_PIN         30
91
-#define Z_DIR_PIN          2
86
+#define Z_STEP_PIN         30 // Support Extension Board
87
+#define Z_DIR_PIN           2
92
 #define Z_ENABLE_PIN       33
88
 #define Z_ENABLE_PIN       33
93
 #define Z_CS_PIN           -1
89
 #define Z_CS_PIN           -1
94
 
90
 
102
 #define E1_ENABLE_PIN      26
98
 #define E1_ENABLE_PIN      26
103
 #define E1_CS_PIN          -1
99
 #define E1_CS_PIN          -1
104
 
100
 
105
-#define E2_STEP_PIN        25 //14 //sys0724
106
-#define E2_DIR_PIN         23 //15
107
-#define E2_ENABLE_PIN      27 //61
101
+#define E2_STEP_PIN        25
102
+#define E2_DIR_PIN         23
103
+#define E2_ENABLE_PIN      27
108
 #define E2_CS_PIN          -1
104
 #define E2_CS_PIN          -1
109
 
105
 
110
-// For Extension Board V2
111
-// http://doku.radds.org/dokumentation/extension-board
112
-//#define E3_STEP_PIN        35
113
-//#define E3_DIR_PIN         33
114
-//#define E3_ENABLE_PIN      37
115
-//#define E3_CS_PIN           6
116
-
117
-//#define Z2_STEP_PIN        29
118
-//#define Z2_DIR_PIN         27
119
-//#define Z2_ENABLE_PIN      31
120
-//#define Z2_CS_PIN          39
106
+#define E3_STEP_PIN        15 // Only For Extension Board
107
+#define E3_DIR_PIN         14
108
+#define E3_ENABLE_PIN      61
109
+#define E3_CS_PIN          -1
121
 
110
 
122
-// Microstepping pins - Mapping not from fastio.h (?)
123
-//#define E3_MS1_PIN         67
124
-//#define E3_MS2_PIN         68
125
-//#define E3_MS3_PIN         69
126
-//#define Z2_MS1_PIN         67 // shared with E3_MS1_PIN
127
-//#define Z2_MS2_PIN         68 // shared with E3_MS2_PIN
128
-//#define Z2_MS3_PIN         69 // shared with E3_MS3_PIN
111
+// For Future: Microstepping pins - Mapping not from fastio.h (?)
112
+//#define E3_MS1_PIN         ?
113
+//#define E3_MS2_PIN         ?
114
+//#define E3_MS3_PIN         ?
115
+//#define Z2_MS1_PIN         ? // shared with E3_MS1_PIN
116
+//#define Z2_MS2_PIN         ? // shared with E3_MS2_PIN
117
+//#define Z2_MS3_PIN         ? // shared with E3_MS3_PIN
129
 
118
 
130
 //
119
 //
131
-// Temperature Sensors
120
+// Limit Switches
132
 //
121
 //
133
-#define TEMP_0_PIN          0  // ANALOG NUMBERING #54
134
-#define TEMP_1_PIN          1  // ANALOG NUMBERING #55
135
-#define TEMP_2_PIN          2  // ANALOG NUMBERING #56
136
-#define TEMP_3_PIN          3  // ANALOG NUMBERING #57
137
-#define TEMP_BED_PIN        4  // ANALOG NUMBERING #58
122
+#define X_MIN_PIN          45
123
+#define X_MAX_PIN          39
124
+#define Y_MIN_PIN          46
125
+#define Y_MAX_PIN          41
126
+#define Z_MIN_PIN          47
127
+#define Z_MAX_PIN          43
138
 
128
 
139
-/*
140
-// SPI for Max6675 or Max31855 Thermocouple
141
-#if DISABLED(SDSUPPORT)
142
-  #define MAX6675_SS       53
143
-#else
144
-  #define MAX6675_SS       49
129
+#if !ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
130
+  #define Z_PROBE_PIN      49
131
+#endif // else Z_PROBE_PIN = Z_MIN_PIN
132
+
133
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
134
+  #ifndef FIL_RUNOUT_PIN
135
+    #define FIL_RUNOUT_PIN   Y_MIN_PIN
136
+  #endif
145
 #endif
137
 #endif
146
-*/
147
 
138
 
148
 //
139
 //
149
 // Heaters / Fans
140
 // Heaters / Fans
151
 #define HEATER_0_PIN       13
142
 #define HEATER_0_PIN       13
152
 #define HEATER_1_PIN       12
143
 #define HEATER_1_PIN       12
153
 #define HEATER_2_PIN       11
144
 #define HEATER_2_PIN       11
154
-#define HEATER_BED_PIN      7    // BED H1
145
+#define HEATER_BED_PIN      7  // BED H1
155
 
146
 
156
 #define FAN_PIN	            9
147
 #define FAN_PIN	            9
157
 #define FAN1_PIN            8
148
 #define FAN1_PIN            8
149
+#define CONTROLLER_FAN_PIN -1
150
+
151
+//
152
+// Temperature Sensors
153
+//
154
+#define TEMP_0_PIN          0  // ANALOG A0
155
+#define TEMP_1_PIN          1  // ANALOG A1
156
+#define TEMP_2_PIN          2  // ANALOG A2
157
+#define TEMP_3_PIN          3  // ANALOG A2
158
+#define TEMP_BED_PIN        4  // ANALOG A3
159
+//Thermocouple Use Analog Pins
160
+#if ENABLED(VER_WITH_THERMOCOUPLE) // If Nead, define is in Configuration.h
161
+  #define TEMP_4_PIN        5  // A5
162
+  #define TEMP_5_PIN        6  // A6 (Marlin 2.0 not support)
163
+#endif
164
+
165
+// SPI for Max6675 or Max31855 Thermocouple
166
+//#if DISABLED(SDSUPPORT)
167
+//  #define MAX6675_SS        53
168
+//#else
169
+//  #define MAX6675_SS        49
170
+//#endif
171
+
172
+//
173
+// Servos
174
+//
175
+#define SERVO0_PIN          5
176
+#define SERVO1_PIN          3
177
+#define SERVO2_PIN         -1
178
+#define SERVO3_PIN         -1
158
 
179
 
159
 //
180
 //
160
 // Misc. Functions
181
 // Misc. Functions
161
 //
182
 //
162
-#define SDSS                4   // 4,10,52 if using HW SPI.
163
-#define LED_PIN            13
183
+#define SDSS                4 // 4,10,52 if using HW SPI.
184
+#define LED_PIN            -1 // 13 - HEATER_0_PIN
185
+#define SDPOWER	           -1
186
+#define PS_ON_PIN          -1 // 65
187
+#define KILL_PIN           -1
188
+
189
+// MKS TFT / Nextion Use internal USART-1
190
+#define TFT_LCD_MODULE_COM        1
191
+#define TFT_LCD_MODULE_BAUDRATE   115600
192
+
193
+// ESP WiFi Use internal USART-2
194
+#define ESP_WIFI_MODULE_COM       2
195
+#define ESP_WIFI_MODULE_BAUDRATE  115600
196
+#define ESP_WIFI_MODULE_RESET_PIN -1
197
+#define PIGGY_GPIO_PIN            -1
164
 
198
 
165
-//#define FIL_RUNOUT_PIN    Y_MIN_PIN
199
+//
200
+// EEPROM
201
+//
202
+#define E2END 0x8000  // 32Kb (24lc256)
203
+#define I2C_EEPROM    // EEPROM on I2C-0
204
+//#define EEPROM_SD   // EEPROM on SDCARD
205
+//#define SPI_EEPROM  // EEPROM on SPI-0
206
+//#define SPI_CHAN_EEPROM1        ?
207
+//#define SPI_EEPROM1_CS          ?
208
+// 2K EEPROM
209
+//#define SPI_EEPROM2_CS          ?
210
+// 32Mb FLASH
211
+//#define SPI_FLASH_CS            ?
166
 
212
 
167
 //
213
 //
168
 // LCD / Controller
214
 // LCD / Controller
186
     #define SD_DETECT_PIN   51
232
     #define SD_DETECT_PIN   51
187
 
233
 
188
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
234
   #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
189
-    #define LCD_PINS_RS     52   //?
190
-    #define LCD_PINS_ENABLE 53   //?
191
-    #define LCD_PINS_D4     48   //?
192
-    #define LCD_PINS_D5     50   //?
193
-    #define LCD_PINS_D6     52   //?
194
-    #define LCD_PINS_D7     53   //?
235
+    #define LCD_PINS_RS     52
236
+    #define LCD_PINS_ENABLE 53
237
+    #define LCD_PINS_D4     48
238
+    #define LCD_PINS_D5     50
239
+    #define LCD_PINS_D6     52
240
+    #define LCD_PINS_D7     53
195
 
241
 
196
     #define BEEPER_PIN      62
242
     #define BEEPER_PIN      62
197
 
243
 
198
-    #define BTN_EN1         44   //!
199
-    #define BTN_EN2         42   //!
244
+    #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
245
+     #define BTN_EN1        44
246
+     #define BTN_EN2        42
247
+     #define BTN_ENC        40
248
+     #define SD_DETECT_PIN  51
249
+    #endif
250
+  #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
251
+    #define BTN_EN1         44
252
+    #define BTN_EN2         42
200
     #define BTN_ENC         40
253
     #define BTN_ENC         40
254
+    #define BEEPER_PIN      62
255
+    #define LCD_SDSS        10
201
     #define SD_DETECT_PIN   51
256
     #define SD_DETECT_PIN   51
202
 
257
 
203
-  #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)
204
-
205
-    #define BTN_EN1         44   //?
206
-    #define BTN_EN2         42   //?
207
-    #define BTN_ENC         40   //?
208
-    #define SD_DETECT_PIN   51   //?
209
-
210
-    #define BEEPER_PIN      62   //?
211
-    #define LCD_SDSS        10   //?
212
-
213
-  #elif ENABLED(SPARK_FULL_GRAPHICS)   //!!! - check!
214
-
215
-    #define LCD_PINS_D4     29
216
-    #define LCD_PINS_ENABLE 27
217
-    #define LCD_PINS_RS     25
218
-    #define BTN_EN1         35
219
-    #define BTN_EN2         33
220
-    #define BTN_ENC         37
221
-
258
+  #elif ENABLED(SPARK_FULL_GRAPHICS)
259
+    //http://doku.radds.org/dokumentation/other-electronics/sparklcd/
260
+    #error "Oops! SPARK_FULL_GRAPHICS not supported with this board"
261
+    //#define LCD_PINS_D4     29//?
262
+    //#define LCD_PINS_ENABLE 27//?
263
+    //#define LCD_PINS_RS     25//?
264
+    //#define BTN_EN1         35//?
265
+    //#define BTN_EN2         33//?
266
+    //#define BTN_ENC         37//?
222
   #endif // SPARK_FULL_GRAPHICS
267
   #endif // SPARK_FULL_GRAPHICS
223
 
268
 
224
 #endif // ULTRA_LCD
269
 #endif // ULTRA_LCD

Loading…
Cancel
Save