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

Format some pins

Scott Lahteine 4 years ago
parent
0332666d38
commit
1aa9d44783
2 changed files with 109 additions and 109 deletions
Unified View Show Diff Stats
  1. 108
    108
      Marlin/src/pins/samd/pins_RAMPS_144.h
  2. 1
    1
      Marlin/src/pins/teensy3/pins_TEENSY31_32.h

+ 108
- 108
Marlin/src/pins/samd/pins_RAMPS_144.h View File

295 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 295 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
296
296
297 
     // TO TEST
 297 
     // TO TEST
298 
-    // #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
299 
-    // #define LCD_PINS_ENABLE     51   // SID (MOSI)
300 
-    // #define LCD_PINS_D4         52   // SCK (CLK) clock
298 
+    //#define LCD_PINS_RS                     49  // CS chip select /SS chip slave select
299 
+    //#define LCD_PINS_ENABLE                 51  // SID (MOSI)
300 
+    //#define LCD_PINS_D4                     52  // SCK (CLK) clock
301
301
302 
   #elif BOTH(NEWPANEL, PANEL_ONE)
 302 
   #elif BOTH(NEWPANEL, PANEL_ONE)
303
303
304 
     // TO TEST
 304 
     // TO TEST
305 
-    // #define LCD_PINS_RS         40
306 
-    // #define LCD_PINS_ENABLE     42
307 
-    // #define LCD_PINS_D4         57     // Mega/Due:65 - AGCM4:57
308 
-    // #define LCD_PINS_D5         58     // Mega/Due:66 - AGCM4:58
309 
-    // #define LCD_PINS_D6         44
310 
-    // #define LCD_PINS_D7         56     // Mega/Due:64 - AGCM4:56
305 
+    //#define LCD_PINS_RS                     40
306 
+    //#define LCD_PINS_ENABLE                 42
307 
+    //#define LCD_PINS_D4                     57  // Mega/Due:65 - AGCM4:57
308 
+    //#define LCD_PINS_D5                     58  // Mega/Due:66 - AGCM4:58
309 
+    //#define LCD_PINS_D6                     44
310 
+    //#define LCD_PINS_D7                     56  // Mega/Due:64 - AGCM4:56
311
311
312 
   #else
 312 
   #else
313
313
314 
     #if ENABLED(CR10_STOCKDISPLAY)
 314 
     #if ENABLED(CR10_STOCKDISPLAY)
315
315
316 
       // TO TEST
 316 
       // TO TEST
317 
-      // #define LCD_PINS_RS       27
318 
-      // #define LCD_PINS_ENABLE   29
319 
-      // #define LCD_PINS_D4       25
317 
+      //#define LCD_PINS_RS                   27
318 
+      //#define LCD_PINS_ENABLE               29
319 
+      //#define LCD_PINS_D4                   25
320
320
321 
       #if DISABLED(NEWPANEL)
 321 
       #if DISABLED(NEWPANEL)
322 
         // TO TEST
 322 
         // TO TEST
323 
-        // #define BEEPER_PIN      37
323 
+        //#define BEEPER_PIN                  37
324 
       #endif
 324 
       #endif
325
325
326 
     #elif ENABLED(ZONESTAR_LCD)
 326 
     #elif ENABLED(ZONESTAR_LCD)
327
327
328 
       // TO TEST
 328 
       // TO TEST
329 
-      // #define LCD_PINS_RS       56     // Mega/Due:64 - AGCM4:56
330 
-      // #define LCD_PINS_ENABLE   44
331 
-      // #define LCD_PINS_D4       55     // Mega/Due:63 - AGCM4:55
332 
-      // #define LCD_PINS_D5       40
333 
-      // #define LCD_PINS_D6       42
334 
-      // #define LCD_PINS_D7       57     // Mega/Due:65 - AGCM4:57
329 
+      //#define LCD_PINS_RS                   56  // Mega/Due:64 - AGCM4:56
330 
+      //#define LCD_PINS_ENABLE               44
331 
+      //#define LCD_PINS_D4                   55  // Mega/Due:63 - AGCM4:55
332 
+      //#define LCD_PINS_D5                   40
333 
+      //#define LCD_PINS_D6                   42
334 
+      //#define LCD_PINS_D7                   57  // Mega/Due:65 - AGCM4:57
335
335
336 
     #else
 336 
     #else
337
337
338 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
 338 
       #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
339 
         // TO TEST
 339 
         // TO TEST
340 
-        // #define LCD_PINS_DC     25   // Set as output on init
341 
-        // #define LCD_PINS_RS     27   // Pull low for 1s to init
340 
+        //#define LCD_PINS_DC                 25  // Set as output on init
341 
+        //#define LCD_PINS_RS                 27  // Pull low for 1s to init
342 
         // DOGM SPI LCD Support
 342 
         // DOGM SPI LCD Support
343 
-        // #define DOGLCD_CS       16
344 
-        // #define DOGLCD_MOSI     17
345 
-        // #define DOGLCD_SCK      23
346 
-        // #define DOGLCD_A0       LCD_PINS_DC
343 
+        //#define DOGLCD_CS                   16
344 
+        //#define DOGLCD_MOSI                 17
345 
+        //#define DOGLCD_SCK                  23
346 
+        //#define DOGLCD_A0          LCD_PINS_DC
347 
       #else
 347 
       #else
348 
         #define LCD_PINS_RS                   16
 348 
         #define LCD_PINS_RS                   16
349 
         #define LCD_PINS_ENABLE               17
 349 
         #define LCD_PINS_ENABLE               17
382
382
383 
       #if ENABLED(CR10_STOCKDISPLAY)
 383 
       #if ENABLED(CR10_STOCKDISPLAY)
384 
         // TO TEST
 384 
         // TO TEST
385 
-        // #define BTN_EN1         17
386 
-        // #define BTN_EN2         23
385 
+        //#define BTN_EN1                     17
386 
+        //#define BTN_EN2                     23
387 
       #else
 387 
       #else
388 
         #define BTN_EN1                       31
 388 
         #define BTN_EN1                       31
389 
         #define BTN_EN2                       33
 389 
         #define BTN_EN2                       33
397
397
398 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
 398 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
399 
         // TO TEST
 399 
         // TO TEST
400 
-        // #define LCD_BACKLIGHT_PIN 39
400 
+        //#define LCD_BACKLIGHT_PIN           39
401 
       #endif
 401 
       #endif
402
402
403 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 403 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
404
404
405 
       // TO TEST
 405 
       // TO TEST
406 
-      // #define BTN_EN1           56     // Mega/Due:64 - AGCM4:56
407 
-      // #define BTN_EN2           72     // Mega/Due:59 - AGCM4:72
408 
-      // #define BTN_ENC           55
409 
-      // #define SD_DETECT_PIN     42
406 
+      //#define BTN_EN1                       56  // Mega/Due:64 - AGCM4:56
407 
+      //#define BTN_EN2                       72  // Mega/Due:59 - AGCM4:72
408 
+      //#define BTN_ENC                       55
409 
+      //#define SD_DETECT_PIN                 42
410
410
411 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 411 
     #elif ENABLED(LCD_I2C_PANELOLU2)
412
412
413 
       // TO TEST
 413 
       // TO TEST
414 
-      // #define BTN_EN1           47
415 
-      // #define BTN_EN2           43
416 
-      // #define BTN_ENC           32
417 
-      // #define LCD_SDSS          SDSS
418 
-      // #define KILL_PIN          41
414 
+      //#define BTN_EN1                       47
415 
+      //#define BTN_EN2                       43
416 
+      //#define BTN_ENC                       32
417 
+      //#define LCD_SDSS                    SDSS
418 
+      //#define KILL_PIN                      41
419
419
420 
     #elif ENABLED(LCD_I2C_VIKI)
 420 
     #elif ENABLED(LCD_I2C_VIKI)
421
421
422 
       // TO TEST
 422 
       // TO TEST
423 
-      // #define BTN_EN1           40   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
424 
-      // #define BTN_EN2           42
425 
-      // #define BTN_ENC           -1
423 
+      //#define BTN_EN1                       40  // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
424 
+      //#define BTN_EN2                       42
425 
+      //#define BTN_ENC                       -1
426
426
427 
-      // #define LCD_SDSS SDSS
428 
-      // #define SD_DETECT_PIN     49
427 
+      //#define LCD_SDSS                    SDSS
428 
+      //#define SD_DETECT_PIN                 49
429
429
430 
     #elif ANY(VIKI2, miniVIKI)
 430 
     #elif ANY(VIKI2, miniVIKI)
431
431
432 
       // TO TEST
 432 
       // TO TEST
433 
-      // #define DOGLCD_CS         45
434 
-      // #define DOGLCD_A0         44
435 
-      // #define LCD_SCREEN_ROT_180
433 
+      //#define DOGLCD_CS                     45
434 
+      //#define DOGLCD_A0                     44
435 
+      //#define LCD_SCREEN_ROT_180
436
436
437 
-      // #define BEEPER_PIN        33
438 
-      // #define STAT_LED_RED_PIN  32
439 
-      // #define STAT_LED_BLUE_PIN 35
437 
+      //#define BEEPER_PIN                    33
438 
+      //#define STAT_LED_RED_PIN              32
439 
+      //#define STAT_LED_BLUE_PIN             35
440
440
441 
-      // #define BTN_EN1           22
442 
-      // #define BTN_EN2            7
443 
-      // #define BTN_ENC           39
441 
+      //#define BTN_EN1                       22
442 
+      //#define BTN_EN2                        7
443 
+      //#define BTN_ENC                       39
444
444
445 
-      // #define SD_DETECT_PIN     -1   // Pin 49 for display SD interface, 72 for easy adapter board
446 
-      // #define KILL_PIN          31
445 
+      //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
446 
+      //#define KILL_PIN                      31
447
447
448 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
 448 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
449
449
450 
       // TO TEST
 450 
       // TO TEST
451 
-      // #define DOGLCD_CS         29
452 
-      // #define DOGLCD_A0         27
451 
+      //#define DOGLCD_CS                     29
452 
+      //#define DOGLCD_A0                     27
453
453
454 
-      // #define BEEPER_PIN        23
455 
-      // #define LCD_BACKLIGHT_PIN 33
454 
+      //#define BEEPER_PIN                    23
455 
+      //#define LCD_BACKLIGHT_PIN             33
456
456
457 
-      // #define BTN_EN1           35
458 
-      // #define BTN_EN2           37
459 
-      // #define BTN_ENC           31
457 
+      //#define BTN_EN1                       35
458 
+      //#define BTN_EN2                       37
459 
+      //#define BTN_ENC                       31
460
460
461 
-      // #define LCD_SDSS          SDSS
462 
-      // #define SD_DETECT_PIN     49
463 
-      // #define KILL_PIN          41
461 
+      //#define LCD_SDSS                    SDSS
462 
+      //#define SD_DETECT_PIN                 49
463 
+      //#define KILL_PIN                      41
464
464
465 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
 465 
     #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
466
466
476 
       #if ENABLED(MKS_MINI_12864)                 // Added in Marlin 1.1.6
 476 
       #if ENABLED(MKS_MINI_12864)                 // Added in Marlin 1.1.6
477
477
478 
         // TO TEST
 478 
         // TO TEST
479 
-        // #define DOGLCD_A0       27
480 
-        // #define DOGLCD_CS       25
479 
+        //#define DOGLCD_A0                   27
480 
+        //#define DOGLCD_CS                   25
481
481
482 
         // GLCD features
 482 
         // GLCD features
483 
         // Uncomment screen orientation
 483 
         // Uncomment screen orientation
484 
-        // #define LCD_SCREEN_ROT_90
485 
-        // #define LCD_SCREEN_ROT_180
486 
-        // #define LCD_SCREEN_ROT_270
484 
+        //#define LCD_SCREEN_ROT_90
485 
+        //#define LCD_SCREEN_ROT_180
486 
+        //#define LCD_SCREEN_ROT_270
487
487
488 
         // not connected to a pin
 488 
         // not connected to a pin
489 
-        // #define LCD_BACKLIGHT_PIN 57    // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
489 
+        //#define LCD_BACKLIGHT_PIN           57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
490
490
491 
-        // #define BTN_EN1         31
492 
-        // #define BTN_EN2         33
491 
+        //#define BTN_EN1                     31
492 
+        //#define BTN_EN2                     33
493
493
494 
       #elif ENABLED(FYSETC_MINI_12864)
 494 
       #elif ENABLED(FYSETC_MINI_12864)
495
495
496 
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
 496 
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
497
497
498 
         // TO TEST
 498 
         // TO TEST
499 
-        // #define DOGLCD_A0       16
500 
-        // #define DOGLCD_CS       17
499 
+        //#define DOGLCD_A0                   16
500 
+        //#define DOGLCD_CS                   17
501
501
502 
-        // #define BTN_EN1         33
503 
-        // #define BTN_EN2         31
502 
+        //#define BTN_EN1                     33
503 
+        //#define BTN_EN2                     31
504
504
505 
         //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
 505 
         //#define FORCE_SOFT_SPI                  // Use this if default of hardware SPI causes display problems
506 
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
 506 
                                                   //   results in LCD soft SPI mode 3, SD soft SPI mode 0
507
507
508 
-        // #define LCD_RESET_PIN   23   // Must be high or open for LCD to operate normally.
508 
+        //#define LCD_RESET_PIN               23  // Must be high or open for LCD to operate normally.
509
509
510 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
 510 
         #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
511 
           #ifndef RGB_LED_R_PIN
 511 
           #ifndef RGB_LED_R_PIN
512 
             // TO TEST
 512 
             // TO TEST
513 
-            // #define RGB_LED_R_PIN 25
513 
+            //#define RGB_LED_R_PIN           25
514 
           #endif
 514 
           #endif
515 
           #ifndef RGB_LED_G_PIN
 515 
           #ifndef RGB_LED_G_PIN
516 
             // TO TEST
 516 
             // TO TEST
517 
-            // #define RGB_LED_G_PIN 27
517 
+            //#define RGB_LED_G_PIN           27
518 
           #endif
 518 
           #endif
519 
           #ifndef RGB_LED_B_PIN
 519 
           #ifndef RGB_LED_B_PIN
520 
             // TO TEST
 520 
             // TO TEST
521 
-            // #define RGB_LED_B_PIN 29
521 
+            //#define RGB_LED_B_PIN           29
522 
           #endif
 522 
           #endif
523 
         #elif ENABLED(FYSETC_MINI_12864_2_1)
 523 
         #elif ENABLED(FYSETC_MINI_12864_2_1)
524 
           // TO TEST
 524 
           // TO TEST
525 
-          // #define NEOPIXEL_PIN    25
525 
+          //#define NEOPIXEL_PIN              25
526 
         #endif
 526 
         #endif
527
527
528 
       #endif
 528 
       #endif
530 
     #elif ENABLED(MINIPANEL)
 530 
     #elif ENABLED(MINIPANEL)
531
531
532 
       // TO TEST
 532 
       // TO TEST
533 
-      // #define BEEPER_PIN        42
533 
+      //#define BEEPER_PIN                    42
534 
       // not connected to a pin
 534 
       // not connected to a pin
535 
-      // #define LCD_BACKLIGHT_PIN 57    // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
535 
+      //#define LCD_BACKLIGHT_PIN             57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
536
536
537 
-      // #define DOGLCD_A0         44
538 
-      // #define DOGLCD_CS         58    // Mega/Due:66 - AGCM4:58
537 
+      //#define DOGLCD_A0                     44
538 
+      //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
539
539
540 
       // GLCD features
 540 
       // GLCD features
541 
       // Uncomment screen orientation
 541 
       // Uncomment screen orientation
542 
-      // #define LCD_SCREEN_ROT_90
543 
-      // #define LCD_SCREEN_ROT_180
544 
-      // #define LCD_SCREEN_ROT_270
542 
+      //#define LCD_SCREEN_ROT_90
543 
+      //#define LCD_SCREEN_ROT_180
544 
+      //#define LCD_SCREEN_ROT_270
545
545
546 
-      // #define BTN_EN1           40
547 
-      // #define BTN_EN2           55    // Mega/Due:63 - AGCM4:55
548 
-      // #define BTN_ENC           72    // Mega/Due:59 - AGCM4:72
546 
+      //#define BTN_EN1                       40
547 
+      //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
548 
+      //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
549
549
550 
-      // #define SD_DETECT_PIN     49
551 
-      // #define KILL_PIN          56    // Mega/Due:64 - AGCM4:56
550 
+      //#define SD_DETECT_PIN                 49
551 
+      //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
552
552
553 
     #elif ENABLED(ZONESTAR_LCD)
 553 
     #elif ENABLED(ZONESTAR_LCD)
554
554
555 
       // TO TEST
 555 
       // TO TEST
556 
-      // #define ADC_KEYPAD_PIN    12
556 
+      //#define ADC_KEYPAD_PIN                12
557
557
558 
     #elif ENABLED(AZSMZ_12864)
 558 
     #elif ENABLED(AZSMZ_12864)
559
559
562 
     #else
 562 
     #else
563
563
564 
       // Beeper on AUX-4
 564 
       // Beeper on AUX-4
565 
-      // #define BEEPER_PIN        33
565 
+      //#define BEEPER_PIN                    33
566
566
567 
       // Buttons are directly attached to AUX-2
 567 
       // Buttons are directly attached to AUX-2
568 
       #if ENABLED(REPRAPWORLD_KEYPAD)
 568 
       #if ENABLED(REPRAPWORLD_KEYPAD)
569 
         // TO TEST
 569 
         // TO TEST
570 
-        // #define SHIFT_OUT       40
571 
-        // #define SHIFT_CLK       44
572 
-        // #define SHIFT_LD        42
573 
-        // #define BTN_EN1         56    // Mega/Due:64 - AGCM4:56
574 
-        // #define BTN_EN2         72    // Mega/Due:59 - AGCM4:72
575 
-        // #define BTN_ENC         55    // Mega/Due:63 - AGCM4:55
570 
+        //#define SHIFT_OUT                   40
571 
+        //#define SHIFT_CLK                   44
572 
+        //#define SHIFT_LD                    42
573 
+        //#define BTN_EN1                     56  // Mega/Due:64 - AGCM4:56
574 
+        //#define BTN_EN2                     72  // Mega/Due:59 - AGCM4:72
575 
+        //#define BTN_ENC                     55  // Mega/Due:63 - AGCM4:55
576 
       #elif ENABLED(PANEL_ONE)
 576 
       #elif ENABLED(PANEL_ONE)
577 
         // TO TEST
 577 
         // TO TEST
578 
-        // #define BTN_EN1         72    // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
579 
-        // #define BTN_EN2         55    // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
580 
-        // #define BTN_ENC         49    // AUX3 PIN 7
578 
+        //#define BTN_EN1                     72  // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
579 
+        //#define BTN_EN2                     55  // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
580 
+        //#define BTN_ENC                     49  // AUX3 PIN 7
581 
       #else
 581 
       #else
582 
         // TO TEST
 582 
         // TO TEST
583 
-        // #define BTN_EN1         37
584 
-        // #define BTN_EN2         35
585 
-        // #define BTN_ENC         31
583 
+        //#define BTN_EN1                     37
584 
+        //#define BTN_EN2                     35
585 
+        //#define BTN_ENC                     31
586 
       #endif
 586 
       #endif
587
587
588 
       #if ENABLED(G3D_PANEL)
 588 
       #if ENABLED(G3D_PANEL)
589 
         // TO TEST
 589 
         // TO TEST
590 
-        // #define SD_DETECT_PIN   49
591 
-        // #define KILL_PIN        41
590 
+        //#define SD_DETECT_PIN               49
591 
+        //#define KILL_PIN                    41
592 
       #endif
 592 
       #endif
593
593
594 
     #endif
 594 
     #endif

+ 1
- 1
Marlin/src/pins/teensy3/pins_TEENSY31_32.h View File

72 
 // Heaters / Fans
 72 
 // Heaters / Fans
73 
 //
 73 
 //
74 
 #define HEATER_0_PIN                          20
 74 
 #define HEATER_0_PIN                          20
75 
-// #define HEATER_1_PIN      36
75 
+//#define HEATER_1_PIN                        36
76 
 #define HEATER_BED_PIN                        21
 76 
 #define HEATER_BED_PIN                        21
77 
 #ifndef FAN_PIN
 77 
 #ifndef FAN_PIN
78 
   #define FAN_PIN                             22
 78 
   #define FAN_PIN                             22

Write Preview
Loading…
Cancel
Save