Kaynağa Gözat

🎨 LCD_SCREEN_ROT_* => LCD_SCREEN_ROTATE

Scott Lahteine 3 yıl önce
ebeveyn
işleme
5179f55bf9

+ 8
- 2
Marlin/src/inc/SanityCheck.h Dosyayı Görüntüle

601
   #error "PROBE_TEMP_COMPENSATION is now set using the PTC_PROBE, PTC_BED, PTC_HOTEND options."
601
   #error "PROBE_TEMP_COMPENSATION is now set using the PTC_PROBE, PTC_BED, PTC_HOTEND options."
602
 #elif defined(BTC_PROBE_TEMP)
602
 #elif defined(BTC_PROBE_TEMP)
603
   #error "BTC_PROBE_TEMP is now PTC_PROBE_TEMP."
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
 #endif
610
 #endif
605
 
611
 
606
 #if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
612
 #if MB(DUE3DOM_MINI) && PIN_EXISTS(TEMP_2) && DISABLED(TEMP_SENSOR_BOARD)
2758
   #error "Please enable only one of TFT_INTERFACE_SPI or TFT_INTERFACE_SPI."
2764
   #error "Please enable only one of TFT_INTERFACE_SPI or TFT_INTERFACE_SPI."
2759
 #endif
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
 #endif
2769
 #endif
2764
 
2770
 
2765
 #if MANY(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_1024x600)
2771
 #if MANY(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_1024x600)

+ 7
- 3
Marlin/src/lcd/dogm/marlinui_DOGM.cpp Dosyayı Görüntüle

294
 
294
 
295
   TERN_(HAS_LCD_CONTRAST, refresh_contrast());
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
   update_language_font();
305
   update_language_font();
302
 }
306
 }

+ 6
- 13
Marlin/src/pins/linux/pins_RAMPS_LINUX.h Dosyayı Görüntüle

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

+ 1
- 5
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h Dosyayı Görüntüle

278
     #endif
278
     #endif
279
 
279
 
280
   #elif ENABLED(MINIPANEL)
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
   #endif
282
   #endif
287
 
283
 
288
 #endif // HAS_WIRED_LCD
284
 #endif // HAS_WIRED_LCD

+ 3
- 7
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h Dosyayı Görüntüle

348
   #endif
348
   #endif
349
 
349
 
350
   #if ANY(VIKI2, miniVIKI)
350
   #if ANY(VIKI2, miniVIKI)
351
-    //#define LCD_SCREEN_ROT_180
352
-
353
     #define DOGLCD_CS                      P0_16  // (16)
351
     #define DOGLCD_CS                      P0_16  // (16)
354
     #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
352
     #define DOGLCD_A0                      P2_06  // (59) J3-8 & AUX-2
355
     #define DOGLCD_SCK                SD_SCK_PIN
353
     #define DOGLCD_SCK                SD_SCK_PIN
358
     #define STAT_LED_BLUE_PIN              P0_26  // (63)  may change if cable changes
356
     #define STAT_LED_BLUE_PIN              P0_26  // (63)  may change if cable changes
359
     #define STAT_LED_RED_PIN               P1_21  // ( 6)  may change if cable changes
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
   #else
361
   #else
362
 
362
 
363
     #if ENABLED(FYSETC_MINI_12864)
363
     #if ENABLED(FYSETC_MINI_12864)
406
   #endif
406
   #endif
407
 
407
 
408
   #if ENABLED(MINIPANEL)
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
  #endif
410
  #endif
415
 
411
 
416
 #endif // HAS_WIRED_LCD
412
 #endif // HAS_WIRED_LCD

+ 3
- 7
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h Dosyayı Görüntüle

155
     #endif
155
     #endif
156
 
156
 
157
     #if ANY(VIKI2, miniVIKI)
157
     #if ANY(VIKI2, miniVIKI)
158
-      //#define LCD_SCREEN_ROT_180
159
-
160
       #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
158
       #define BEEPER_PIN                   P1_30  // (37) may change if cable changes
161
       #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
159
       #define DOGLCD_CS                    P0_26  // (63) J5-3 & AUX-2
162
       #define DOGLCD_SCK              SD_SCK_PIN
160
       #define DOGLCD_SCK              SD_SCK_PIN
164
 
162
 
165
       #define STAT_LED_BLUE_PIN            P0_26  // (63)  may change if cable changes
163
       #define STAT_LED_BLUE_PIN            P0_26  // (63)  may change if cable changes
166
       #define STAT_LED_RED_PIN             P1_21  // ( 6)  may change if cable changes
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
     #else
167
     #else
168
       #if IS_ULTIPANEL
168
       #if IS_ULTIPANEL
169
         #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
169
         #define LCD_PINS_D5                P1_17  // (71) ENET_MDIO
180
     #endif
180
     #endif
181
 
181
 
182
     #if ENABLED(MINIPANEL)
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
     #endif
184
     #endif
189
 
185
 
190
   #endif
186
   #endif

+ 2
- 1
Marlin/src/pins/mega/pins_CNCONTROLS_12.h Dosyayı Görüntüle

147
 #define DOGLCD_CS                             35
147
 #define DOGLCD_CS                             35
148
 #define DOGLCD_MOSI                           48
148
 #define DOGLCD_MOSI                           48
149
 #define DOGLCD_SCK                            49
149
 #define DOGLCD_SCK                            49
150
-#define LCD_SCREEN_ROT_180
151
 
150
 
152
 // The encoder and click button
151
 // The encoder and click button
153
 #define BTN_EN1                               36
152
 #define BTN_EN1                               36
164
 
163
 
165
 #define STAT_LED_BLUE_PIN                     -1
164
 #define STAT_LED_BLUE_PIN                     -1
166
 #define STAT_LED_RED_PIN                      10  // TOOL_0_PWM_PIN
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 Dosyayı Görüntüle

139
 #if ENABLED(MINIPANEL)
139
 #if ENABLED(MINIPANEL)
140
 
140
 
141
   #define BEEPER_PIN                          46
141
   #define BEEPER_PIN                          46
142
-  // Pins for DOGM SPI LCD Support
142
+
143
   #define DOGLCD_A0                           47
143
   #define DOGLCD_A0                           47
144
   #define DOGLCD_CS                           45
144
   #define DOGLCD_CS                           45
145
   #define LCD_BACKLIGHT_PIN                   44  // backlight LED on PA3
145
   #define LCD_BACKLIGHT_PIN                   44  // backlight LED on PA3
146
 
146
 
147
   #define KILL_PIN                            12
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
   #define BTN_EN1                             48
149
   #define BTN_EN1                             48
155
   #define BTN_EN2                             11
150
   #define BTN_EN2                             11
157
 
152
 
158
   #define SD_DETECT_PIN                       49
153
   #define SD_DETECT_PIN                       49
159
 
154
 
155
+  //#define LCD_SCREEN_ROTATE                180  // 0, 90, 180, 270
156
+
160
 #endif // MINIPANEL
157
 #endif // MINIPANEL
161
 
158
 
162
 //
159
 //

+ 2
- 1
Marlin/src/pins/rambo/pins_RAMBO.h Dosyayı Görüntüle

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

+ 3
- 2
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h Dosyayı Görüntüle

148
   // Pins for DOGM SPI LCD Support
148
   // Pins for DOGM SPI LCD Support
149
   #define DOGLCD_A0                           70
149
   #define DOGLCD_A0                           70
150
   #define DOGLCD_CS                           71
150
   #define DOGLCD_CS                           71
151
-  #define LCD_SCREEN_ROT_180
152
 
151
 
153
   #define SD_DETECT_PIN                       -1  // Pin 72 if using easy adapter board
152
   #define SD_DETECT_PIN                       -1  // Pin 72 if using easy adapter board
154
 
153
 
155
   #define STAT_LED_RED_PIN                    22
154
   #define STAT_LED_RED_PIN                    22
156
   #define STAT_LED_BLUE_PIN                   32
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 Dosyayı Görüntüle

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

+ 2
- 5
Marlin/src/pins/ramps/pins_RAMPS.h Dosyayı Görüntüle

513
 
513
 
514
 #if HAS_WIRED_LCD
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
   // LCD Display output pins
519
   // LCD Display output pins
660
 
657
 
661
       #define DOGLCD_CS              AUX4_05_PIN
658
       #define DOGLCD_CS              AUX4_05_PIN
662
       #define DOGLCD_A0              AUX2_07_PIN
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
       #define BEEPER_PIN             EXP2_06_PIN
662
       #define BEEPER_PIN             EXP2_06_PIN
666
       #define STAT_LED_RED_PIN       AUX4_03_PIN
663
       #define STAT_LED_RED_PIN       AUX4_03_PIN

+ 8
- 15
Marlin/src/pins/ramps/pins_TT_OSCAR.h Dosyayı Görüntüle

402
 
402
 
403
       #define DOGLCD_CS                       45
403
       #define DOGLCD_CS                       45
404
       #define DOGLCD_A0                       44
404
       #define DOGLCD_A0                       44
405
-      #define LCD_SCREEN_ROT_180
406
 
405
 
407
       #define BEEPER_PIN                      33
406
       #define BEEPER_PIN                      33
408
       #define STAT_LED_RED_PIN                32
407
       #define STAT_LED_RED_PIN                32
416
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
415
       #define SD_DETECT_PIN                   -1  // Pin 49 for display SD interface, 72 for easy adapter board
417
       //#define KILL_PIN                      31
416
       //#define KILL_PIN                      31
418
 
417
 
418
+      #define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
419
+
419
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
420
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
420
 
421
 
421
       #define DOGLCD_CS                       29
422
       #define DOGLCD_CS                       29
437
       #define DOGLCD_A0                       27
438
       #define DOGLCD_A0                       27
438
       #define DOGLCD_CS                       25
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
       #define BEEPER_PIN                      37
441
       #define BEEPER_PIN                      37
448
 
442
 
449
       #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
443
       #define LCD_BACKLIGHT_PIN               65  // backlight LED on A11/D65
455
       #define SD_DETECT_PIN                   49
449
       #define SD_DETECT_PIN                   49
456
       //#define KILL_PIN                      64
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
     #elif ENABLED(MINIPANEL)
455
     #elif ENABLED(MINIPANEL)
459
 
456
 
460
       #define BEEPER_PIN                      42
457
       #define BEEPER_PIN                      42
464
       #define DOGLCD_A0                       44
461
       #define DOGLCD_A0                       44
465
       #define DOGLCD_CS                       66
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
       #define BTN_EN1                         40
464
       #define BTN_EN1                         40
475
       #define BTN_EN2                         63
465
       #define BTN_EN2                         63
476
       #define BTN_ENC                         59
466
       #define BTN_ENC                         59
479
       #define SD_DETECT_PIN                   49
469
       #define SD_DETECT_PIN                   49
480
       //#define KILL_PIN                      64
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
     #else
475
     #else
483
 
476
 
484
       // Beeper on AUX-4
477
       // Beeper on AUX-4

+ 6
- 13
Marlin/src/pins/samd/pins_RAMPS_144.h Dosyayı Görüntüle

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

+ 1
- 5
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h Dosyayı Görüntüle

207
 
207
 
208
     #endif
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
   #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
212
   #elif ENABLED(ZONESTAR_LCD)                     // For the Tronxy Melzi boards
217
 
213
 

+ 5
- 6
Marlin/src/pins/stm32f1/pins_CHITU3D.h Dosyayı Görüntüle

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

+ 1
- 3
Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h Dosyayı Görüntüle

166
     #endif
166
     #endif
167
 
167
 
168
     //#define LCD_CONTRAST_INIT              190
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
   #endif
171
   #endif
174
 
172
 

+ 1
- 3
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h Dosyayı Görüntüle

163
     #define DOGLCD_CS                EXP1_04_PIN
163
     #define DOGLCD_CS                EXP1_04_PIN
164
     #define DOGLCD_SCK               EXP1_05_PIN
164
     #define DOGLCD_SCK               EXP1_05_PIN
165
     #define DOGLCD_MOSI              EXP1_03_PIN
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
     #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
167
     #if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
171
       #define FORCE_SOFT_SPI
168
       #define FORCE_SOFT_SPI
172
     #endif
169
     #endif
170
+    //#define LCD_SCREEN_ROTATE              180  // 0, 90, 180, 270
173
   #endif
171
   #endif
174
 
172
 
175
   #define LCD_PINS_RS                EXP1_04_PIN  // CS -- SOFT SPI for ENDER3 LCD
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 Dosyayı Görüntüle

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

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h Dosyayı Görüntüle

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

+ 1
- 1
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h Dosyayı Görüntüle

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

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h Dosyayı Görüntüle

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

+ 1
- 1
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h Dosyayı Görüntüle

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

+ 2
- 1
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h Dosyayı Görüntüle

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

+ 2
- 1
Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h Dosyayı Görüntüle

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

Loading…
İptal
Kaydet