Browse Source

Add missing SoftwareSerial begin for TMC2208

Based on #9299
Scott Lahteine 6 years ago
parent
commit
db031d5d76

+ 11
- 11
Marlin/src/HAL/HAL_AVR/SanityCheck_AVR_8_bit.h View File

@@ -100,17 +100,17 @@
100 100
  * TMC2208 software UART and ENDSTOP_INTERRUPTS both use pin change interrupts (PCI)
101 101
  */
102 102
 #if ENABLED(HAVE_TMC2208) && ENABLED(ENDSTOP_INTERRUPTS_FEATURE) && !( \
103
-       ENABLED( X_HARDWARE_SERIAL  ) \
104
-    || ENABLED( X2_HARDWARE_SERIAL ) \
105
-    || ENABLED( Y_HARDWARE_SERIAL  ) \
106
-    || ENABLED( Y2_HARDWARE_SERIAL ) \
107
-    || ENABLED( Z_HARDWARE_SERIAL  ) \
108
-    || ENABLED( Z2_HARDWARE_SERIAL ) \
109
-    || ENABLED( E0_HARDWARE_SERIAL ) \
110
-    || ENABLED( E1_HARDWARE_SERIAL ) \
111
-    || ENABLED( E2_HARDWARE_SERIAL ) \
112
-    || ENABLED( E3_HARDWARE_SERIAL ) \
113
-    || ENABLED( E4_HARDWARE_SERIAL ) )
103
+       defined(X_HARDWARE_SERIAL ) \
104
+    || defined(X2_HARDWARE_SERIAL) \
105
+    || defined(Y_HARDWARE_SERIAL ) \
106
+    || defined(Y2_HARDWARE_SERIAL) \
107
+    || defined(Z_HARDWARE_SERIAL ) \
108
+    || defined(Z2_HARDWARE_SERIAL) \
109
+    || defined(E0_HARDWARE_SERIAL) \
110
+    || defined(E1_HARDWARE_SERIAL) \
111
+    || defined(E2_HARDWARE_SERIAL) \
112
+    || defined(E3_HARDWARE_SERIAL) \
113
+    || defined(E4_HARDWARE_SERIAL) )
114 114
   #error "select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
115 115
 #endif
116 116
 

+ 1
- 1
Marlin/src/inc/Conditionals_post.h View File

@@ -1249,7 +1249,7 @@
1249 1249
     #endif
1250 1250
   #endif
1251 1251
 #endif
1252
-  
1252
+
1253 1253
 // Nozzle park
1254 1254
 #if ENABLED(NOZZLE_PARK_FEATURE) && ENABLED(DELTA)
1255 1255
   #undef NOZZLE_PARK_Z_FEEDRATE

+ 34
- 35
Marlin/src/module/stepper_indirection.cpp View File

@@ -257,82 +257,82 @@
257 257
   #include "planner.h"
258 258
 
259 259
   #define _TMC2208_DEFINE_HARDWARE(ST) TMC2208Stepper stepper##ST(&ST##_HARDWARE_SERIAL)
260
-  #define _TMC2208_DEFINE_SOFTWARE(ST) SoftwareSerial stepper##ST##_serial = SoftwareSerial(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN); \
260
+  #define _TMC2208_DEFINE_SOFTWARE(ST) SoftwareSerial ST##_HARDWARE_SERIAL = SoftwareSerial(ST##_SERIAL_RX_PIN, ST##_SERIAL_TX_PIN); \
261 261
                                        TMC2208Stepper stepper##ST(&stepper##ST##_serial, ST##_SERIAL_RX_PIN > -1)
262 262
 
263 263
   // Stepper objects of TMC2208 steppers used
264 264
   #if ENABLED(X_IS_TMC2208)
265
-    #if defined(X_HARDWARE_SERIAL)
265
+    #ifdef X_HARDWARE_SERIAL
266 266
       _TMC2208_DEFINE_HARDWARE(X);
267 267
     #else
268 268
       _TMC2208_DEFINE_SOFTWARE(X);
269 269
     #endif
270 270
   #endif
271 271
   #if ENABLED(X2_IS_TMC2208)
272
-    #if defined(X2_HARDWARE_SERIAL)
272
+    #ifdef X2_HARDWARE_SERIAL
273 273
       _TMC2208_DEFINE_HARDWARE(X2);
274 274
     #else
275 275
       _TMC2208_DEFINE_SOFTWARE(X2);
276 276
     #endif
277 277
   #endif
278 278
   #if ENABLED(Y_IS_TMC2208)
279
-    #if defined(Y_HARDWARE_SERIAL)
279
+    #ifdef Y_HARDWARE_SERIAL
280 280
       _TMC2208_DEFINE_HARDWARE(Y);
281 281
     #else
282 282
       _TMC2208_DEFINE_SOFTWARE(Y);
283 283
     #endif
284 284
   #endif
285 285
   #if ENABLED(Y2_IS_TMC2208)
286
-    #if defined(Y2_HARDWARE_SERIAL)
286
+    #ifdef Y2_HARDWARE_SERIAL
287 287
       _TMC2208_DEFINE_HARDWARE(Y2);
288 288
     #else
289 289
       _TMC2208_DEFINE_SOFTWARE(Y2);
290 290
     #endif
291 291
   #endif
292 292
   #if ENABLED(Z_IS_TMC2208)
293
-    #if defined(Z_HARDWARE_SERIAL)
293
+    #ifdef Z_HARDWARE_SERIAL
294 294
       _TMC2208_DEFINE_HARDWARE(Z);
295 295
     #else
296 296
       _TMC2208_DEFINE_SOFTWARE(Z);
297 297
     #endif
298 298
   #endif
299 299
   #if ENABLED(Z2_IS_TMC2208)
300
-    #if defined(Z2_HARDWARE_SERIAL)
300
+    #ifdef Z2_HARDWARE_SERIAL
301 301
       _TMC2208_DEFINE_HARDWARE(Z2);
302 302
     #else
303 303
       _TMC2208_DEFINE_SOFTWARE(Z2);
304 304
     #endif
305 305
   #endif
306 306
   #if ENABLED(E0_IS_TMC2208)
307
-    #if defined(E0_HARDWARE_SERIAL)
307
+    #ifdef E0_HARDWARE_SERIAL
308 308
       _TMC2208_DEFINE_HARDWARE(E0);
309 309
     #else
310 310
       _TMC2208_DEFINE_SOFTWARE(E0);
311 311
     #endif
312 312
   #endif
313 313
   #if ENABLED(E1_IS_TMC2208)
314
-    #if defined(E1_HARDWARE_SERIAL)
314
+    #ifdef E1_HARDWARE_SERIAL
315 315
       _TMC2208_DEFINE_HARDWARE(E1);
316 316
     #else
317 317
       _TMC2208_DEFINE_SOFTWARE(E1);
318 318
     #endif
319 319
   #endif
320 320
   #if ENABLED(E2_IS_TMC2208)
321
-    #if defined(E2_HARDWARE_SERIAL)
321
+    #ifdef E2_HARDWARE_SERIAL
322 322
       _TMC2208_DEFINE_HARDWARE(E2);
323 323
     #else
324 324
       _TMC2208_DEFINE_SOFTWARE(E2);
325 325
     #endif
326 326
   #endif
327 327
   #if ENABLED(E3_IS_TMC2208)
328
-    #if defined(E3_HARDWARE_SERIAL)
328
+    #ifdef E3_HARDWARE_SERIAL
329 329
       _TMC2208_DEFINE_HARDWARE(E3);
330 330
     #else
331 331
       _TMC2208_DEFINE_SOFTWARE(E3);
332 332
     #endif
333 333
   #endif
334 334
   #if ENABLED(E4_IS_TMC2208)
335
-    #if defined(E4_HARDWARE_SERIAL)
335
+    #ifdef E4_HARDWARE_SERIAL
336 336
       _TMC2208_DEFINE_HARDWARE(E4);
337 337
     #else
338 338
       _TMC2208_DEFINE_SOFTWARE(E4);
@@ -340,38 +340,38 @@
340 340
   #endif
341 341
 
342 342
   void tmc2208_serial_begin() {
343
-    #if ENABLED(X_IS_TMC2208) && defined(X_HARDWARE_SERIAL)
344
-      X_HARDWARE_SERIAL.begin(250000);
343
+    #if ENABLED(X_IS_TMC2208)
344
+      X_HARDWARE_SERIAL.begin(115200);
345 345
     #endif
346
-    #if ENABLED(X2_IS_TMC2208) && defined(X2_HARDWARE_SERIAL)
347
-      X2_HARDWARE_SERIAL.begin(250000);
346
+    #if ENABLED(X2_IS_TMC2208)
347
+      X2_HARDWARE_SERIAL.begin(115200);
348 348
     #endif
349
-    #if ENABLED(Y_IS_TMC2208) && defined(Y_HARDWARE_SERIAL)
350
-      Y_HARDWARE_SERIAL.begin(250000);
349
+    #if ENABLED(Y_IS_TMC2208)
350
+      Y_HARDWARE_SERIAL.begin(115200);
351 351
     #endif
352
-    #if ENABLED(Y2_IS_TMC2208) && defined(Y2_HARDWARE_SERIAL)
353
-      Y2_HARDWARE_SERIAL.begin(250000);
352
+    #if ENABLED(Y2_IS_TMC2208)
353
+      Y2_HARDWARE_SERIAL.begin(115200);
354 354
     #endif
355
-    #if ENABLED(Z_IS_TMC2208) && defined(Z_HARDWARE_SERIAL)
356
-      Z_HARDWARE_SERIAL.begin(250000);
355
+    #if ENABLED(Z_IS_TMC2208)
356
+      Z_HARDWARE_SERIAL.begin(115200);
357 357
     #endif
358
-    #if ENABLED(Z2_IS_TMC2208) && defined(Z2_HARDWARE_SERIAL)
359
-      Z2_HARDWARE_SERIAL.begin(250000);
358
+    #if ENABLED(Z2_IS_TMC2208)
359
+      Z2_HARDWARE_SERIAL.begin(115200);
360 360
     #endif
361
-    #if ENABLED(E0_IS_TMC2208) && defined(E0_HARDWARE_SERIAL)
362
-      E0_HARDWARE_SERIAL.begin(250000);
361
+    #if ENABLED(E0_IS_TMC2208)
362
+      E0_HARDWARE_SERIAL.begin(115200);
363 363
     #endif
364
-    #if ENABLED(E1_IS_TMC2208) && defined(E1_HARDWARE_SERIAL)
365
-      E1_HARDWARE_SERIAL.begin(250000);
364
+    #if ENABLED(E1_IS_TMC2208)
365
+      E1_HARDWARE_SERIAL.begin(115200);
366 366
     #endif
367
-    #if ENABLED(E2_IS_TMC2208) && defined(E2_HARDWARE_SERIAL)
368
-      E2_HARDWARE_SERIAL.begin(250000);
367
+    #if ENABLED(E2_IS_TMC2208)
368
+      E2_HARDWARE_SERIAL.begin(115200);
369 369
     #endif
370
-    #if ENABLED(E3_IS_TMC2208) && defined(E3_HARDWARE_SERIAL)
371
-      E3_HARDWARE_SERIAL.begin(250000);
370
+    #if ENABLED(E3_IS_TMC2208)
371
+      E3_HARDWARE_SERIAL.begin(115200);
372 372
     #endif
373
-    #if ENABLED(E4_IS_TMC2208) && defined(E4_HARDWARE_SERIAL)
374
-      E4_HARDWARE_SERIAL.begin(250000);
373
+    #if ENABLED(E4_IS_TMC2208)
374
+      E4_HARDWARE_SERIAL.begin(115200);
375 375
     #endif
376 376
   }
377 377
 
@@ -450,7 +450,6 @@
450 450
   }
451 451
 #endif // HAVE_TMC2208
452 452
 
453
-
454 453
 //
455 454
 // L6470 Driver objects and inits
456 455
 //

Loading…
Cancel
Save