zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🎨 LCD_SCREEN_ROT_* => LCD_SCREEN_ROTATE

Browse source
This commit is contained in:
Scott Lahteine 2022-01-19 03:27:10 -06:00
parent 8ea172cafe
commit 1d0ca179b5
25 changed files with 72 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/inc/SanityCheck.h
View file

@ -601,6 +601,12 @@
#error "PROBE_TEMP_COMPENSATION is now set using the PTC_PROBE, PTC_BED, PTC_HOTEND options."
#elif defined(BTC_PROBE_TEMP)
#error "BTC_PROBE_TEMP is now PTC_PROBE_TEMP."
#elif defined(LCD_SCREEN_ROT_90)
#error "LCD_SCREEN_ROT_90 is now LCD_SCREEN_ROTATE with a value of 90."
#elif defined(LCD_SCREEN_ROT_180)
#error "LCD_SCREEN_ROT_180 is now LCD_SCREEN_ROTATE with a value of 180."
#elif defined(LCD_SCREEN_ROT_270)
#error "LCD_SCREEN_ROT_270 is now LCD_SCREEN_ROTATE with a value of 270."
#endif
#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
#error "Please enable only one of TFT_INTERFACE_SPI or TFT_INTERFACE_SPI."
#endif
#if MANY(LCD_SCREEN_ROT_0, LCD_SCREEN_ROT_90, LCD_SCREEN_ROT_180, LCD_SCREEN_ROT_270)
#error "Please enable only one LCD_SCREEN_ROT_* option: 0, 90, 180, or 270."
#if defined(LCD_SCREEN_ROTATE) && LCD_SCREEN_ROTATE != 0 && LCD_SCREEN_ROTATE != 90 && LCD_SCREEN_ROTATE != 180 && LCD_SCREEN_ROTATE != 270
#error "LCD_SCREEN_ROTATE must be 0, 90, 180, or 270."
#endif
#if MANY(TFT_RES_320x240, TFT_RES_480x272, TFT_RES_480x320, TFT_RES_1024x600)

10
Marlin/src/lcd/dogm/marlinui_DOGM.cpp
View file

@ -294,9 +294,13 @@ void MarlinUI::init_lcd() {
TERN_(HAS_LCD_CONTRAST, refresh_contrast());
TERN_(LCD_SCREEN_ROT_90, u8g.setRot90());
TERN_(LCD_SCREEN_ROT_180, u8g.setRot180());
TERN_(LCD_SCREEN_ROT_270, u8g.setRot270());
#if LCD_SCREEN_ROTATE == 90
u8g.setRot90();
#elif LCD_SCREEN_ROTATE == 180
u8g.setRot180();
#elif LCD_SCREEN_ROTATE == 270
u8g.setRot270();
#endif
update_language_font();
}

19
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View file

@ -584,7 +584,6 @@
#define DOGLCD_CS 45
#define DOGLCD_A0 44
#define LCD_SCREEN_ROT_180
#define BEEPER_PIN 33
#define STAT_LED_RED_PIN 32
@ -597,6 +596,8 @@
#define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board
#define KILL_PIN 31
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define DOGLCD_CS 29
@ -618,12 +619,6 @@
#define DOGLCD_A0 27
#define DOGLCD_CS 25
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BEEPER_PIN 37
// not connected to a pin
#define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
@ -635,6 +630,8 @@
#define SD_DETECT_PIN 49
#define KILL_PIN 64
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(MINIPANEL)
#define BEEPER_PIN 42
@ -644,12 +641,6 @@
#define DOGLCD_A0 44
#define DOGLCD_CS 66
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BTN_EN1 40
#define BTN_EN2 63
#define BTN_ENC 59
@ -657,6 +648,8 @@
#define SD_DETECT_PIN 49
#define KILL_PIN 64
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ZONESTAR_LCD)
#define ADC_KEYPAD_PIN 12

6
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View file

@ -278,11 +278,7 @@
#endif
#elif ENABLED(MINIPANEL)
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
#endif // HAS_WIRED_LCD

10
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View file

@ -348,8 +348,6 @@
#endif
#if ANY(VIKI2, miniVIKI)
//#define LCD_SCREEN_ROT_180
#define DOGLCD_CS P0_16 // (16)
#define DOGLCD_A0 P2_06 // (59) J3-8 & AUX-2
#define DOGLCD_SCK SD_SCK_PIN
@ -358,6 +356,8 @@
#define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
#define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else
#if ENABLED(FYSETC_MINI_12864)
@ -406,11 +406,7 @@
#endif
#if ENABLED(MINIPANEL)
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
#endif // HAS_WIRED_LCD

10
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View file

@ -155,8 +155,6 @@
#endif
#if ANY(VIKI2, miniVIKI)
//#define LCD_SCREEN_ROT_180
#define BEEPER_PIN P1_30 // (37) may change if cable changes
#define DOGLCD_CS P0_26 // (63) J5-3 & AUX-2
#define DOGLCD_SCK SD_SCK_PIN
@ -164,6 +162,8 @@
#define STAT_LED_BLUE_PIN P0_26 // (63) may change if cable changes
#define STAT_LED_RED_PIN P1_21 // ( 6) may change if cable changes
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else
#if IS_ULTIPANEL
#define LCD_PINS_D5 P1_17 // (71) ENET_MDIO
@ -180,11 +180,7 @@
#endif
#if ENABLED(MINIPANEL)
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
#endif

3
Marlin/src/pins/mega/pins_CNCONTROLS_12.h
View file

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

9
Marlin/src/pins/mega/pins_MEGACONTROLLER.h
View file

@ -139,17 +139,12 @@
#if ENABLED(MINIPANEL)
#define BEEPER_PIN 46
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 47
#define DOGLCD_CS 45
#define LCD_BACKLIGHT_PIN 44 // backlight LED on PA3
#define KILL_PIN 12
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BTN_EN1 48
#define BTN_EN2 11
@ -157,6 +152,8 @@
#define SD_DETECT_PIN 49
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif // MINIPANEL
//

3
Marlin/src/pins/rambo/pins_RAMBO.h
View file

@ -214,7 +214,6 @@
#define DOGLCD_A0 70
#define DOGLCD_CS 71
#define LCD_SCREEN_ROT_180
#define BTN_EN1 85
#define BTN_EN2 84
@ -225,6 +224,8 @@
#define STAT_LED_RED_PIN 22
#define STAT_LED_BLUE_PIN 32
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else // !VIKI2 && !miniVIKI
#define BEEPER_PIN 79 // AUX-4

5
Marlin/src/pins/rambo/pins_SCOOVO_X9H.h
View file

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

3
Marlin/src/pins/ramps/pins_K8800.h
View file

@ -30,8 +30,6 @@
#define BOARD_INFO_NAME "K8800"
#define DEFAULT_MACHINE_NAME "Vertex Delta"
//#define LCD_SCREEN_ROT_180
//
// Limit Switches
//
@ -110,6 +108,7 @@
#define LCD_CONTRAST_MIN 0
#define LCD_CONTRAST_MAX 100
#define DEFAULT_LCD_CONTRAST 30
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#if IS_NEWPANEL
#define BTN_EN1 17

7
Marlin/src/pins/ramps/pins_RAMPS.h
View file

@ -513,10 +513,7 @@
#if HAS_WIRED_LCD
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
//
// LCD Display output pins
@ -660,7 +657,7 @@
#define DOGLCD_CS AUX4_05_PIN
#define DOGLCD_A0 AUX2_07_PIN
#define LCD_SCREEN_ROT_180
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#define BEEPER_PIN EXP2_06_PIN
#define STAT_LED_RED_PIN AUX4_03_PIN

23
Marlin/src/pins/ramps/pins_TT_OSCAR.h
View file

@ -402,7 +402,6 @@
#define DOGLCD_CS 45
#define DOGLCD_A0 44
#define LCD_SCREEN_ROT_180
#define BEEPER_PIN 33
#define STAT_LED_RED_PIN 32
@ -416,6 +415,8 @@
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
//#define KILL_PIN 31
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define DOGLCD_CS 29
@ -437,13 +438,6 @@
#define DOGLCD_A0 27
#define DOGLCD_CS 25
// GLCD features
//#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BEEPER_PIN 37
#define LCD_BACKLIGHT_PIN 65 // backlight LED on A11/D65
@ -455,6 +449,9 @@
#define SD_DETECT_PIN 49
//#define KILL_PIN 64
//#define LCD_CONTRAST_INIT 190
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(MINIPANEL)
#define BEEPER_PIN 42
@ -464,13 +461,6 @@
#define DOGLCD_A0 44
#define DOGLCD_CS 66
// GLCD features
//#define LCD_CONTRAST_INIT 190
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BTN_EN1 40
#define BTN_EN2 63
#define BTN_ENC 59
@ -479,6 +469,9 @@
#define SD_DETECT_PIN 49
//#define KILL_PIN 64
//#define LCD_CONTRAST_INIT 190
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else
// Beeper on AUX-4

19
Marlin/src/pins/samd/pins_RAMPS_144.h
View file

@ -413,7 +413,6 @@
// TO TEST
//#define DOGLCD_CS 45
//#define DOGLCD_A0 44
//#define LCD_SCREEN_ROT_180
//#define BEEPER_PIN 33
//#define STAT_LED_RED_PIN 32
@ -426,6 +425,8 @@
//#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
//#define KILL_PIN 31
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
// TO TEST
@ -460,18 +461,14 @@
//#define DOGLCD_A0 27
//#define DOGLCD_CS 25
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
// not connected to a pin
//#define LCD_BACKLIGHT_PIN 57 // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
//#define BTN_EN1 31
//#define BTN_EN2 33
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(FYSETC_MINI_12864)
// From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
@ -518,12 +515,6 @@
//#define DOGLCD_A0 44
//#define DOGLCD_CS 58 // Mega/Due:66 - AGCM4:58
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define BTN_EN1 40
//#define BTN_EN2 55 // Mega/Due:63 - AGCM4:55
//#define BTN_ENC 72 // Mega/Due:59 - AGCM4:72
@ -531,6 +522,8 @@
//#define SD_DETECT_PIN 49
//#define KILL_PIN 56 // Mega/Due:64 - AGCM4:56
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ZONESTAR_LCD)
// TO TEST

6
Marlin/src/pins/sanguino/pins_SANGUINOLOLU_11.h
View file

@ -207,11 +207,7 @@
#endif
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_0
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ZONESTAR_LCD) // For the Tronxy Melzi boards

11
Marlin/src/pins/stm32f1/pins_CHITU3D.h
View file

@ -178,7 +178,6 @@
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 PC12 // 44
#define DOGLCD_CS PC13 // 45
#define LCD_SCREEN_ROT_180
#define BTN_EN1 PB6 // 22
#define BTN_EN2 PA7 // 7
@ -192,6 +191,8 @@
#define STAT_LED_RED_PIN PC0 // 32
#define STAT_LED_BLUE_PIN PC3 // 35
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 PC3 // 35
#define BTN_EN2 PC5 // 37
@ -214,11 +215,7 @@
#define SDSS PD5 // 53
#define KILL_PIN PE0 // 64
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
// The encoder and click button
#define BTN_EN1 PC8 // 40
#define BTN_EN2 PD15 // 63
@ -226,6 +223,8 @@
// not connected to a pin
#define SD_DETECT_PIN PD1 // 49
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else
// Beeper on AUX-4

4
Marlin/src/pins/stm32f1/pins_FYSETC_AIO_II.h
View file

@ -166,9 +166,7 @@
#endif
//#define LCD_CONTRAST_INIT 190
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif

4
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
View file

@ -163,13 +163,11 @@
#define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_SCK EXP1_05_PIN
#define DOGLCD_MOSI EXP1_03_PIN
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
#define FORCE_SOFT_SPI
#endif
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
#define LCD_PINS_RS EXP1_04_PIN // CS -- SOFT SPI for ENDER3 LCD

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
View file

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

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View file

@ -207,7 +207,7 @@
#define DOGLCD_SCK EXP2_09_PIN
#define FORCE_SOFT_SPI
#define SOFTWARE_SPI
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View file

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

2
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
View file

@ -363,7 +363,7 @@
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else

2
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
View file

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

3
Marlin/src/pins/teensy2/pins_PRINTRBOARD.h
View file

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

3
Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h
View file

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