Skip to content

Commit b6bba59

Browse files
committed
♻️ Begin LCD pins migration
1 parent 22fc07d commit b6bba59

File tree

84 files changed

+1886
-1197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1886
-1197
lines changed

Marlin/src/HAL/DUE/HAL_SPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
// Public functions
4343
// ------------------------
4444

45-
#if ANY(DUE_SOFTWARE_SPI, FORCE_SOFT_SPI)
45+
#if ANY(SOFTWARE_SPI, FORCE_SOFT_SPI)
4646

4747
// ------------------------
4848
// Software SPI

Marlin/src/HAL/DUE/inc/SanityCheck.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272

7373
#if HAS_MEDIA && HAS_DRIVER(TMC2130)
7474
#if ENABLED(TMC_USE_SW_SPI)
75-
#if DISABLED(DUE_SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
75+
#if DISABLED(SOFTWARE_SPI) && (_IS_HW_SPI(MOSI) || _IS_HW_SPI(MISO) || _IS_HW_SPI(SCK))
7676
#error "DUE hardware SPI is required but is incompatible with TMC2130 software SPI. Either disable TMC_USE_SW_SPI or use separate pins for the two SPIs."
7777
#endif
78-
#elif ENABLED(DUE_SOFTWARE_SPI)
78+
#elif ENABLED(SOFTWARE_SPI)
7979
#error "DUE software SPI is required but is incompatible with TMC2130 hardware SPI. Enable TMC_USE_SW_SPI to fix."
8080
#endif
8181
#endif

Marlin/src/HAL/DUE/spi_pins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#define SD_MOSI_PIN 75
4949
#else
5050
// defaults
51-
#define DUE_SOFTWARE_SPI
51+
#define SOFTWARE_SPI
5252
#ifndef SD_SCK_PIN
5353
#define SD_SCK_PIN 52
5454
#endif

Marlin/src/HAL/LINUX/spi_pins.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
*/
2222
#pragma once
2323

24-
#include "../../core/macros.h"
25-
#include "../../inc/MarlinConfigPre.h"
26-
2724
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2825
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2926
// needed due to the speed and mode required for communicating with each device being different.

Marlin/src/HAL/LPC1768/spi_pins.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
*/
2222
#pragma once
2323

24-
#include "../../core/macros.h"
25-
26-
#if ALL(HAS_MEDIA, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
24+
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2725
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2826
// needed due to the speed and mode required for communicating with each device being different.
2927
// This requirement can be removed if the SPI access to these devices is updated to use

Marlin/src/HAL/NATIVE_SIM/spi_pins.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
*/
2222
#pragma once
2323

24-
#include "../../core/macros.h"
25-
#include "../../inc/MarlinConfigPre.h"
26-
2724
#if ALL(HAS_MARLINUI_U8GLIB, HAS_MEDIA) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_EN == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
2825
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2926
// needed due to the speed and mode required for communicating with each device being different.

Marlin/src/MarlinCore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,7 +1063,7 @@ inline void tmc_standby_setup() {
10631063
* - Init the buzzer, possibly a custom timer
10641064
* - Init more optional hardware:
10651065
* • Color LED illumination
1066-
* • Neopixel illumination
1066+
* • NeoPixel illumination
10671067
* • Controller Fan
10681068
* • Creality DWIN LCD (show boot image)
10691069
* • Tare the Probe if possible

Marlin/src/inc/Conditionals_LCD.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@
575575
#define MKS_MINI_12864
576576
#endif
577577

578-
// MKS_MINI_12864_V3 , BTT_MINI_12864 and BEEZ_MINI_12864 have identical pinouts to FYSETC_MINI_12864_2_1
578+
// MKS_MINI_12864_V3 , BTT_MINI_12864 and BEEZ_MINI_12864 are nearly identical to FYSETC_MINI_12864_2_1
579579
#if ANY(MKS_MINI_12864_V3, BTT_MINI_12864, BEEZ_MINI_12864)
580580
#define FYSETC_MINI_12864_2_1
581581
#endif

Marlin/src/inc/Conditionals_post.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3215,18 +3215,6 @@
32153215
#undef SOUND_ON_DEFAULT
32163216
#endif
32173217

3218-
/**
3219-
* Make sure DOGLCD_SCK and DOGLCD_MOSI are defined.
3220-
*/
3221-
#if HAS_MARLINUI_U8GLIB
3222-
#ifndef DOGLCD_SCK
3223-
#define DOGLCD_SCK SD_SCK_PIN
3224-
#endif
3225-
#ifndef DOGLCD_MOSI
3226-
#define DOGLCD_MOSI SD_MOSI_PIN
3227-
#endif
3228-
#endif
3229-
32303218
/**
32313219
* Z_CLEARANCE_FOR_HOMING / Z_CLEARANCE_BETWEEN_PROBES
32323220
*/

Marlin/src/lcd/dogm/marlinui_DOGM.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,6 @@ void MarlinUI::init_lcd() {
311311

312312
#if ANY(MKS_12864OLED, MKS_12864OLED_SSD1306, FYSETC_242_OLED_12864, ZONESTAR_12864OLED, K3D_242_OLED_CONTROLLER)
313313
SET_OUTPUT(LCD_PINS_DC);
314-
#ifndef LCD_RESET_PIN
315-
#define LCD_RESET_PIN LCD_PINS_RS
316-
#endif
317314
#endif
318315

319316
#if PIN_EXISTS(LCD_RESET)

0 commit comments

Comments
 (0)