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

🎨 LCD_SCREEN_ROT_* => LCD_SCREEN_ROTATE

Scott Lahteine 2 years ago
parent
fd595aa01b
commit
5179f55bf9
25 changed files with 72 additions and 106 deletions
Split View Show Diff Stats
  1. 8
    2
      Marlin/src/inc/SanityCheck.h
  2. 7
    3
      Marlin/src/lcd/dogm/marlinui_DOGM.cpp
  3. 6
    13
      Marlin/src/pins/linux/pins_RAMPS_LINUX.h
  4. 1
    5
      Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
  5. 3
    7
      Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
  6. 3
    7
      Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
  7. 2
    1
      Marlin/src/pins/mega/pins_CNCONTROLS_12.h
  8. 3
    6
      Marlin/src/pins/mega/pins_MEGACONTROLLER.h
  9. 2
    1
      Marlin/src/pins/rambo/pins_RAMBO.h
  10. 3
    2
      Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
  11. 1
    2
      Marlin/src/pins/ramps/pins_K8800.h
  12. 2
    5
      Marlin/src/pins/ramps/pins_RAMPS.h
  13. 8
    15
      Marlin/src/pins/ramps/pins_TT_OSCAR.h
  14. 6
    13
      Marlin/src/pins/samd/pins_RAMPS_144.h
  15. 1
    5
      Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
  16. 5
    6
      Marlin/src/pins/stm32f1/pins_CHITU3D.h
  17. 1
    3
      Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
  18. 1
    3
      Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
  19. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
  20. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
  21. 1
    1
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
  22. 1
    1
      Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
  23. 1
    1
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
  24. 2
    1
      Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
  25. 2
    1
      Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h

+ 8
- 2
Marlin/src/inc/SanityCheck.h View File 

@@ -601,6 +601,12 @@
601 601 
   #error "PROBE_TEMP_COMPENSATION is now set using the PTC_PROBE, PTC_BED, PTC_HOTEND options."
602 602 
 #elif defined(BTC_PROBE_TEMP)
603 603 
   #error "BTC_PROBE_TEMP is now PTC_PROBE_TEMP."
604 
+#elif defined(LCD_SCREEN_ROT_90)
605 
+  #error "LCD_SCREEN_ROT_90 is now LCD_SCREEN_ROTATE with a value of 90."
606 
+#elif defined(LCD_SCREEN_ROT_180)
607 
+  #error "LCD_SCREEN_ROT_180 is now LCD_SCREEN_ROTATE with a value of 180."
608 
+#elif defined(LCD_SCREEN_ROT_270)
609 
+  #error "LCD_SCREEN_ROT_270 is now LCD_SCREEN_ROTATE with a value of 270."
604 610 
 #endif
605 611
606 612 
 #if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
 
@@ -2758,8 +2764,8 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2758 2764 
   #error "Please enable only one of TFT_INTERFACE_SPI or TFT_INTERFACE_SPI."
2759 2765 
 #endif
2760 2766
2761 
-#if MANY(LCD_SCREEN_ROT_0, LCD_SCREEN_ROT_90, LCD_SCREEN_ROT_180, LCD_SCREEN_ROT_270)
2762 
-  #error "Please enable only one LCD_SCREEN_ROT_* option: 0, 90, 180, or 270."
2767 
+#if defined(LCD_SCREEN_ROTATE) && LCD_SCREEN_ROTATE != 0 && LCD_SCREEN_ROTATE != 90 && LCD_SCREEN_ROTATE != 180 && LCD_SCREEN_ROTATE != 270
2768 
+  #error "LCD_SCREEN_ROTATE must be 0, 90, 180, or 270."
2763 2769 
 #endif
2764 2770
2765 2771 
 #if MANY(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_1024x600)

+ 7
- 3
Marlin/src/lcd/dogm/marlinui_DOGM.cpp View File 

@@ -294,9 +294,13 @@ void MarlinUI::init_lcd() {
294 294
295 295 
   TERN_(HAS_LCD_CONTRAST, refresh_contrast());
296 296
297 
-  TERN_(LCD_SCREEN_ROT_90, u8g.setRot90());
298 
-  TERN_(LCD_SCREEN_ROT_180, u8g.setRot180());
299 
-  TERN_(LCD_SCREEN_ROT_270, u8g.setRot270());
297 
+  #if LCD_SCREEN_ROTATE == 90
298 
+    u8g.setRot90();
299 
+  #elif LCD_SCREEN_ROTATE == 180
300 
+    u8g.setRot180();
301 
+  #elif LCD_SCREEN_ROTATE == 270
302 
+    u8g.setRot270();
303 
+  #endif
300 304
301 305 
   update_language_font();
302 306 
 }

+ 6
- 13
Marlin/src/pins/linux/pins_RAMPS_LINUX.h View File 

@@ -584,7 +584,6 @@
584 584
585 585 
       #define DOGLCD_CS                       45
586 586 
       #define DOGLCD_A0                       44
587 
-      #define LCD_SCREEN_ROT_180
588 587
589 588 
       #define BEEPER_PIN                      33
590 589 
       #define STAT_LED_RED_PIN                32
 
@@ -597,6 +596,8 @@
597 596 
       #define SD_DETECT_PIN                   -1  // Pin 49 for display sd interface, 72 for easy adapter board
598 597 
       #define KILL_PIN                        31
599 598
599 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
600 
+
600 601 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
601 602
602 603 
       #define DOGLCD_CS                       29
 
@@ -618,12 +619,6 @@
618 619 
       #define DOGLCD_A0                       27
619 620 
       #define DOGLCD_CS                       25
620 621
621 
-      // GLCD features
622 
-      // Uncomment screen orientation
623 
-      //#define LCD_SCREEN_ROT_90
624 
-      //#define LCD_SCREEN_ROT_180
625 
-      //#define LCD_SCREEN_ROT_270
626 
-
627 622 
       #define BEEPER_PIN                      37
628 623 
       // not connected to a pin
629 624 
       #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
@@ -635,6 +630,8 @@
635 630 
       #define SD_DETECT_PIN                   49
636 631 
       #define KILL_PIN                        64
637 632
633 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
634 
+
638 635 
     #elif ENABLED(MINIPANEL)
639 636
640 637 
       #define BEEPER_PIN                      42
 
@@ -644,12 +641,6 @@
644 641 
       #define DOGLCD_A0                       44
645 642 
       #define DOGLCD_CS                       66
646 643
647 
-      // GLCD features
648 
-      // Uncomment screen orientation
649 
-      //#define LCD_SCREEN_ROT_90
650 
-      //#define LCD_SCREEN_ROT_180
651 
-      //#define LCD_SCREEN_ROT_270
652 
-
653 644 
       #define BTN_EN1                         40
654 645 
       #define BTN_EN2                         63
655 646 
       #define BTN_ENC                         59
 
@@ -657,6 +648,8 @@
657 648 
       #define SD_DETECT_PIN                   49
658 649 
       #define KILL_PIN                        64
659 650
651 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
652 
+
660 653 
     #elif ENABLED(ZONESTAR_LCD)
661 654
662 655 
       #define ADC_KEYPAD_PIN                  12

+ 1
- 5
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h View File 

@@ -278,11 +278,7 @@
278 278 
     #endif
279 279
280 280 
   #elif ENABLED(MINIPANEL)
281 
-    // GLCD features
282 
-    // Uncomment screen orientation
283 
-    //#define LCD_SCREEN_ROT_90
284 
-    //#define LCD_SCREEN_ROT_180
285 
-    //#define LCD_SCREEN_ROT_270
281 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
286 282 
   #endif
287 283
288 284 
 #endif // HAS_WIRED_LCD

+ 3
- 7
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h View File 

@@ -348,8 +348,6 @@
348 348 
   #endif
349 349
350 350 
   #if ANY(VIKI2, miniVIKI)
351 
-    //#define LCD_SCREEN_ROT_180
352 
-
353 351 
     #define DOGLCD_CS                      P0_16  // (16)
354 352 
     #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
355 353 
     #define DOGLCD_SCK                SD_SCK_PIN
 
@@ -358,6 +356,8 @@
358 356 
     #define STAT_LED_BLUE_PIN              P0_26  // (63)  may change if cable changes
359 357 
     #define STAT_LED_RED_PIN               P1_21  // ( 6)  may change if cable changes
360 358
359 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
360 
+
361 361 
   #else
362 362
363 363 
     #if ENABLED(FYSETC_MINI_12864)
 
@@ -406,11 +406,7 @@
406 406 
   #endif
407 407
408 408 
   #if ENABLED(MINIPANEL)
409 
-    // GLCD features
410 
-    // Uncomment screen orientation
411 
-    //#define LCD_SCREEN_ROT_90
412 
-    //#define LCD_SCREEN_ROT_180
413 
-    //#define LCD_SCREEN_ROT_270
409 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
414 410 
  #endif
415 411
416 412 
 #endif // HAS_WIRED_LCD

+ 3
- 7
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h View File 

@@ -155,8 +155,6 @@
155 155 
     #endif
156 156
157 157 
     #if ANY(VIKI2, miniVIKI)
158 
-      //#define LCD_SCREEN_ROT_180
159 
-
160 158 
       #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
161 159 
       #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
162 160 
       #define DOGLCD_SCK              SD_SCK_PIN
 
@@ -164,6 +162,8 @@
164 162
165 163 
       #define STAT_LED_BLUE_PIN            P0_26  // (63)  may change if cable changes
166 164 
       #define STAT_LED_RED_PIN             P1_21  // ( 6)  may change if cable changes
165 
+
166 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
167 167 
     #else
168 168 
       #if IS_ULTIPANEL
169 169 
         #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
 
@@ -180,11 +180,7 @@
180 180 
     #endif
181 181
182 182 
     #if ENABLED(MINIPANEL)
183 
-      // GLCD features
184 
-      // Uncomment screen orientation
185 
-      //#define LCD_SCREEN_ROT_90
186 
-      //#define LCD_SCREEN_ROT_180
187 
-      //#define LCD_SCREEN_ROT_270
183 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
188 184 
     #endif
189 185
190 186 
   #endif

+ 2
- 1
Marlin/src/pins/mega/pins_CNCONTROLS_12.h View File 

@@ -147,7 +147,6 @@
147 147 
 #define DOGLCD_CS                             35
148 148 
 #define DOGLCD_MOSI                           48
149 149 
 #define DOGLCD_SCK                            49
150 
-#define LCD_SCREEN_ROT_180
151 150
152 151 
 // The encoder and click button
153 152 
 #define BTN_EN1                               36
 
@@ -164,3 +163,5 @@
164 163
165 164 
 #define STAT_LED_BLUE_PIN                     -1
166 165 
 #define STAT_LED_RED_PIN                      10  // TOOL_0_PWM_PIN
166 
+
167 
+#define LCD_SCREEN_ROTATE                    180  // 0, 90, 180, 270

+ 3
- 6
Marlin/src/pins/mega/pins_MEGACONTROLLER.h View File 

@@ -139,17 +139,12 @@
139 139 
 #if ENABLED(MINIPANEL)
140 140
141 141 
   #define BEEPER_PIN                          46
142 
-  // Pins for DOGM SPI LCD Support
142 
+
143 143 
   #define DOGLCD_A0                           47
144 144 
   #define DOGLCD_CS                           45
145 145 
   #define LCD_BACKLIGHT_PIN                   44  // backlight LED on PA3
146 146
147 147 
   #define KILL_PIN                            12
148 
-  // GLCD features
149 
-  // Uncomment screen orientation
150 
-  //#define LCD_SCREEN_ROT_90
151 
-  //#define LCD_SCREEN_ROT_180
152 
-  //#define LCD_SCREEN_ROT_270
153 148
154 149 
   #define BTN_EN1                             48
155 150 
   #define BTN_EN2                             11
 
@@ -157,6 +152,8 @@
157 152
158 153 
   #define SD_DETECT_PIN                       49
159 154
155 
+  //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
156 
+
160 157 
 #endif // MINIPANEL
161 158
162 159 
 //

+ 2
- 1
Marlin/src/pins/rambo/pins_RAMBO.h View File 

@@ -214,7 +214,6 @@
214 214
215 215 
       #define DOGLCD_A0                       70
216 216 
       #define DOGLCD_CS                       71
217 
-      #define LCD_SCREEN_ROT_180
218 217
219 218 
       #define BTN_EN1                         85
220 219 
       #define BTN_EN2                         84
 
@@ -225,6 +224,8 @@
225 224 
       #define STAT_LED_RED_PIN                22
226 225 
       #define STAT_LED_BLUE_PIN               32
227 226
227 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
228 
+
228 229 
     #else                                         // !VIKI2 && !miniVIKI
229 230
230 231 
       #define BEEPER_PIN                      79  // AUX-4

+ 3
- 2
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h View File 

@@ -148,10 +148,11 @@
148 148 
   // Pins for DOGM SPI LCD Support
149 149 
   #define DOGLCD_A0                           70
150 150 
   #define DOGLCD_CS                           71
151 
-  #define LCD_SCREEN_ROT_180
152 151
153 152 
   #define SD_DETECT_PIN                       -1  // Pin 72 if using easy adapter board
154 153
155 154 
   #define STAT_LED_RED_PIN                    22
156 155 
   #define STAT_LED_BLUE_PIN                   32
157 
-#endif // VIKI2/miniVIKI
156 
+
157 
+  #define LCD_SCREEN_ROTATE                  180  // 0, 90, 180, 270
158 
+#endif

+ 1
- 2
Marlin/src/pins/ramps/pins_K8800.h View File 

@@ -30,8 +30,6 @@
30 30 
 #define BOARD_INFO_NAME      "K8800"
31 31 
 #define DEFAULT_MACHINE_NAME "Vertex Delta"
32 32
33 
-//#define LCD_SCREEN_ROT_180
34 
-
35 33 
 //
36 34 
 // Limit Switches
37 35 
 //
 
@@ -110,6 +108,7 @@
110 108 
   #define LCD_CONTRAST_MIN                     0
111 109 
   #define LCD_CONTRAST_MAX                   100
112 110 
   #define DEFAULT_LCD_CONTRAST                30
111 
+  //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
113 112
114 113 
   #if IS_NEWPANEL
115 114 
     #define BTN_EN1                           17

+ 2
- 5
Marlin/src/pins/ramps/pins_RAMPS.h View File 

@@ -513,10 +513,7 @@
513 513
514 514 
 #if HAS_WIRED_LCD
515 515
516 
-  // Uncomment screen orientation
517 
-  //#define LCD_SCREEN_ROT_90
518 
-  //#define LCD_SCREEN_ROT_180
519 
-  //#define LCD_SCREEN_ROT_270
516 
+  //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
520 517
521 518 
   //
522 519 
   // LCD Display output pins
 
@@ -660,7 +657,7 @@
660 657
661 658 
       #define DOGLCD_CS              AUX4_05_PIN
662 659 
       #define DOGLCD_A0              AUX2_07_PIN
663 
-      #define LCD_SCREEN_ROT_180
660 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
664 661
665 662 
       #define BEEPER_PIN             EXP2_06_PIN
666 663 
       #define STAT_LED_RED_PIN       AUX4_03_PIN

+ 8
- 15
Marlin/src/pins/ramps/pins_TT_OSCAR.h View File 

@@ -402,7 +402,6 @@
402 402
403 403 
       #define DOGLCD_CS                       45
404 404 
       #define DOGLCD_A0                       44
405 
-      #define LCD_SCREEN_ROT_180
406 405
407 406 
       #define BEEPER_PIN                      33
408 407 
       #define STAT_LED_RED_PIN                32
 
@@ -416,6 +415,8 @@
416 415 
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
417 416 
       //#define KILL_PIN                      31
418 417
418 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
419 
+
419 420 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
420 421
421 422 
       #define DOGLCD_CS                       29
 
@@ -437,13 +438,6 @@
437 438 
       #define DOGLCD_A0                       27
438 439 
       #define DOGLCD_CS                       25
439 440
440 
-      // GLCD features
441 
-      //#define LCD_CONTRAST_INIT            190
442 
-      // Uncomment screen orientation
443 
-      //#define LCD_SCREEN_ROT_90
444 
-      //#define LCD_SCREEN_ROT_180
445 
-      //#define LCD_SCREEN_ROT_270
446 
-
447 441 
       #define BEEPER_PIN                      37
448 442
449 443 
       #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
 
@@ -455,6 +449,9 @@
455 449 
       #define SD_DETECT_PIN                   49
456 450 
       //#define KILL_PIN                      64
457 451
452 
+      //#define LCD_CONTRAST_INIT            190
453 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
454 
+
458 455 
     #elif ENABLED(MINIPANEL)
459 456
460 457 
       #define BEEPER_PIN                      42
 
@@ -464,13 +461,6 @@
464 461 
       #define DOGLCD_A0                       44
465 462 
       #define DOGLCD_CS                       66
466 463
467 
-      // GLCD features
468 
-      //#define LCD_CONTRAST_INIT            190
469 
-      // Uncomment screen orientation
470 
-      //#define LCD_SCREEN_ROT_90
471 
-      //#define LCD_SCREEN_ROT_180
472 
-      //#define LCD_SCREEN_ROT_270
473 
-
474 464 
       #define BTN_EN1                         40
475 465 
       #define BTN_EN2                         63
476 466 
       #define BTN_ENC                         59
 
@@ -479,6 +469,9 @@
479 469 
       #define SD_DETECT_PIN                   49
480 470 
       //#define KILL_PIN                      64
481 471
472 
+      //#define LCD_CONTRAST_INIT            190
473 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
474 
+
482 475 
     #else
483 476
484 477 
       // Beeper on AUX-4

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

@@ -413,7 +413,6 @@
413 413 
       // TO TEST
414 414 
       //#define DOGLCD_CS                     45
415 415 
       //#define DOGLCD_A0                     44
416 
-      //#define LCD_SCREEN_ROT_180
417 416
418 417 
       //#define BEEPER_PIN                    33
419 418 
       //#define STAT_LED_RED_PIN              32
 
@@ -426,6 +425,8 @@
426 425 
       //#define SD_DETECT_PIN                 -1  // Pin 49 for display SD interface, 72 for easy adapter board
427 426 
       //#define KILL_PIN                      31
428 427
428 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
429 
+
429 430 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
430 431
431 432 
       // TO TEST
 
@@ -460,18 +461,14 @@
460 461 
         //#define DOGLCD_A0                   27
461 462 
         //#define DOGLCD_CS                   25
462 463
463 
-        // GLCD features
464 
-        // Uncomment screen orientation
465 
-        //#define LCD_SCREEN_ROT_90
466 
-        //#define LCD_SCREEN_ROT_180
467 
-        //#define LCD_SCREEN_ROT_270
468 
-
469 464 
         // not connected to a pin
470 465 
         //#define LCD_BACKLIGHT_PIN           57  // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
471 466
472 467 
         //#define BTN_EN1                     31
473 468 
         //#define BTN_EN2                     33
474 469
470 
+        //#define LCD_SCREEN_ROTATE          180  // 0, 90, 180, 270
471 
+
475 472 
       #elif ENABLED(FYSETC_MINI_12864)
476 473
477 474 
         // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
 
@@ -518,12 +515,6 @@
518 515 
       //#define DOGLCD_A0                     44
519 516 
       //#define DOGLCD_CS                     58  // Mega/Due:66 - AGCM4:58
520 517
521 
-      // GLCD features
522 
-      // Uncomment screen orientation
523 
-      //#define LCD_SCREEN_ROT_90
524 
-      //#define LCD_SCREEN_ROT_180
525 
-      //#define LCD_SCREEN_ROT_270
526 
-
527 518 
       //#define BTN_EN1                       40
528 519 
       //#define BTN_EN2                       55  // Mega/Due:63 - AGCM4:55
529 520 
       //#define BTN_ENC                       72  // Mega/Due:59 - AGCM4:72
 
@@ -531,6 +522,8 @@
531 522 
       //#define SD_DETECT_PIN                 49
532 523 
       //#define KILL_PIN                      56  // Mega/Due:64 - AGCM4:56
533 524
525 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
526 
+
534 527 
     #elif ENABLED(ZONESTAR_LCD)
535 528
536 529 
       // TO TEST

+ 1
- 5
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h View File 

@@ -207,11 +207,7 @@
207 207
208 208 
     #endif
209 209
210 
-    // Uncomment screen orientation
211 
-    //#define LCD_SCREEN_ROT_0
212 
-    //#define LCD_SCREEN_ROT_90
213 
-    //#define LCD_SCREEN_ROT_180
214 
-    //#define LCD_SCREEN_ROT_270
210 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
215 211
216 212 
   #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
217 213

+ 5
- 6
Marlin/src/pins/stm32f1/pins_CHITU3D.h View File 

@@ -178,7 +178,6 @@
178 178 
       // Pins for DOGM SPI LCD Support
179 179 
       #define DOGLCD_A0                     PC12  // 44
180 180 
       #define DOGLCD_CS                     PC13  // 45
181 
-      #define LCD_SCREEN_ROT_180
182 181
183 182 
       #define BTN_EN1                       PB6   // 22
184 183 
       #define BTN_EN2                       PA7   //  7
 
@@ -192,6 +191,8 @@
192 191 
       #define STAT_LED_RED_PIN              PC0   // 32
193 192 
       #define STAT_LED_BLUE_PIN             PC3   // 35
194 193
194 
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
195 
+
195 196 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
196 197 
       #define BTN_EN1                       PC3   // 35
197 198 
       #define BTN_EN2                       PC5   // 37
 
@@ -214,11 +215,7 @@
214 215 
       #define SDSS                          PD5   // 53
215 216
216 217 
       #define KILL_PIN                      PE0   // 64
217 
-      // GLCD features
218 
-      // Uncomment screen orientation
219 
-      //#define LCD_SCREEN_ROT_90
220 
-      //#define LCD_SCREEN_ROT_180
221 
-      //#define LCD_SCREEN_ROT_270
218 
+
222 219 
       // The encoder and click button
223 220 
       #define BTN_EN1                       PC8   // 40
224 221 
       #define BTN_EN2                       PD15  // 63
 
@@ -226,6 +223,8 @@
226 223 
       // not connected to a pin
227 224 
       #define SD_DETECT_PIN                 PD1   // 49
228 225
226 
+      //#define LCD_SCREEN_ROTATE            180  // 0, 90, 180, 270
227 
+
229 228 
     #else
230 229
231 230 
       // Beeper on AUX-4

+ 1
- 3
Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h View File 

@@ -166,9 +166,7 @@
166 166 
     #endif
167 167
168 168 
     //#define LCD_CONTRAST_INIT              190
169 
-    //#define LCD_SCREEN_ROT_90
170 
-    //#define LCD_SCREEN_ROT_180
171 
-    //#define LCD_SCREEN_ROT_270
169 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
172 170
173 171 
   #endif
174 172

+ 1
- 3
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h View File 

@@ -163,13 +163,11 @@
163 163 
     #define DOGLCD_CS                EXP1_04_PIN
164 164 
     #define DOGLCD_SCK               EXP1_05_PIN
165 165 
     #define DOGLCD_MOSI              EXP1_03_PIN
166 
-    //#define LCD_SCREEN_ROT_90
167 
-    //#define LCD_SCREEN_ROT_180
168 
-    //#define LCD_SCREEN_ROT_270
169 166
170 167 
     #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
171 168 
       #define FORCE_SOFT_SPI
172 169 
     #endif
170 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
173 171 
   #endif
174 172
175 173 
   #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h View File 

@@ -326,7 +326,7 @@
326 326 
     #if SD_CONNECTION_IS(ONBOARD)
327 327 
       #define FORCE_SOFT_SPI
328 328 
     #endif
329 
-    //#define LCD_SCREEN_ROT_180
329 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
330 330
331 331 
   #else                                           // !MKS_MINI_12864
332 332

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h View File 

@@ -207,7 +207,7 @@
207 207 
     #define DOGLCD_SCK               EXP2_09_PIN
208 208 
     #define FORCE_SOFT_SPI
209 209 
     #define SOFTWARE_SPI
210 
-    //#define LCD_SCREEN_ROT_180
210 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
211 211
212 212 
   #else
213 213

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h View File 

@@ -352,7 +352,7 @@
352 352 
     #if SD_CONNECTION_IS(ONBOARD)
353 353 
       #define FORCE_SOFT_SPI
354 354 
     #endif
355 
-    //#define LCD_SCREEN_ROT_180
355 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
356 356
357 357 
   #else                                           // !MKS_MINI_12864
358 358

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h View File 

@@ -363,7 +363,7 @@
363 363 
     #if SD_CONNECTION_IS(ONBOARD)
364 364 
       #define FORCE_SOFT_SPI
365 365 
     #endif
366 
-    //#define LCD_SCREEN_ROT_180
366 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
367 367
368 368 
   #else
369 369

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h View File 

@@ -349,7 +349,7 @@
349 349 
     #if SD_CONNECTION_IS(ONBOARD)
350 350 
       #define FORCE_SOFT_SPI
351 351 
     #endif
352 
-    //#define LCD_SCREEN_ROT_180
352 
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
353 353
354 354 
   #else                                           // !MKS_MINI_12864
355 355

+ 2
- 1
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h View File 

@@ -135,7 +135,6 @@
135 135
136 136 
     #define DOGLCD_A0                         40  // F2       JP2-2
137 137 
     #define DOGLCD_CS                         41  // F3       JP2-4
138 
-    #define LCD_SCREEN_ROT_180
139 138
140 139 
     #define BTN_EN1                            2  // D2 TX1   JP2-5
141 140 
     #define BTN_EN2                            3  // D3 RX1   JP2-7
 
@@ -146,6 +145,8 @@
146 145 
     #define STAT_LED_RED_PIN                  12  // C2    JP11-14
147 146 
     #define STAT_LED_BLUE_PIN                 10  // C0    JP11-12
148 147
148 
+    #define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
149 
+
149 150 
   #elif ENABLED(LCD_I2C_PANELOLU2)
150 151
151 152 
     #define BTN_EN1                            3  // D3 RX1   JP2-7

+ 2
- 1
Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h View File 

@@ -212,7 +212,6 @@
212 212 
     #define BEEPER_PIN                         8  // E0       JP11-10
213 213 
     #define DOGLCD_A0                         40  // F2       JP2-2
214 214 
     #define DOGLCD_CS                         41  // F3       JP2-4
215 
-    #define LCD_SCREEN_ROT_180
216 215
217 216 
     #define BTN_EN1                            2  // D2 TX1   JP2-5
218 217 
     #define BTN_EN2                            3  // D3 RX1   JP2-7
 
@@ -223,6 +222,8 @@
223 222 
     #define STAT_LED_RED_PIN                  12  // C2       JP11-14
224 223 
     #define STAT_LED_BLUE_PIN                 10  // C0       JP11-12
225 224
225 
+    #define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
226 
+
226 227 
   #elif ENABLED(MINIPANEL)
227 228
228 229 
     #if DISABLED(USE_INTERNAL_SD)

Write Preview
Loading…
Cancel
Save