Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add missing FORCE_SOFT_SPI for MKS_MINI_12864 on skr v1.3 #24940

Merged
merged 1 commit into from
Nov 14, 2022

Conversation

ellensp
Copy link
Contributor

@ellensp ellensp commented Oct 30, 2022

Description

Bugfix 2.0.x brother PR to #24850

MKS_MINI_12864 on SKR v1.3 was found not to work.
#24848
This was traced back to PR #16349 accidently removing
#define FORCE_SOFT_SPI when adding support for ENDER2_STOCKDISPLAY

Requirements

MKS_MINI_12864 and BOARD_BTT_SKR_V1_3

Benefits

Display works as expected

Related Issues

#24848
#16349
#24850

@ellensp ellensp changed the title add missing FORCE_SOFT_SPI add missing FORCE_SOFT_SPI for MKS_MINI_12864 on skr v1.3 Oct 30, 2022
@thisiskeithb
Copy link
Member

thisiskeithb commented Nov 2, 2022

ellensp wants to merge 1 commit into MarlinFirmware:bugfix-2.0.x

It took me a bit to figure out how this wasn't a dupe of the referenced "brother" PR 🙂.

What factors are you using to determine which PRs should be backported to 2.0.x (especially since it's closed)?

image

I would assume most/all, but we're not doing that currently.

@ellensp
Copy link
Contributor Author

ellensp commented Nov 2, 2022

The #24863 is not closing 2.0.x this is a rogue pr attempting to push 2.0.x into bugfix-2.1.x

@thisiskeithb
Copy link
Member

Ok. I am still curious why this single PR is being backported to 2.0.x since we're not doing that for other changes.

@ellensp
Copy link
Contributor Author

ellensp commented Nov 2, 2022

Since 2.0.x and 2.1.x are both still being worked on I wanted both updated.

But since these pr are being ignored for some reason... it all rather moot.

@thinkyhead thinkyhead merged commit a6cc7a4 into MarlinFirmware:bugfix-2.0.x Nov 14, 2022
@ellensp ellensp deleted the patch-3 branch November 14, 2022 05:31
thinkyhead pushed a commit that referenced this pull request Apr 16, 2023
thinkyhead pushed a commit that referenced this pull request Apr 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants