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

Update README.md for STM32F4 and STM32F1 boards in bugfix 2.0 #17827

Merged
merged 2 commits into from
May 5, 2020

Conversation

chepo92
Copy link
Contributor

@chepo92 chepo92 commented May 1, 2020

Description

STEVAL-3DP001V1 is a STM32F4 so added that category, and added GMT32 in STM32F1

@chepo92 chepo92 changed the title Update README.md Update README.md in dev 2.1 May 1, 2020
@thisiskeithb
Copy link
Member

@thinkyhead: Should the dev-2.1.x branch still exist? It seems to cause confusion with users thinking they are using the latest & greatest version of Marlin when it's just really an outdated copy of bugfix-2.0.x.

@chepo92
Copy link
Contributor Author

chepo92 commented May 2, 2020

I had that doubt :D
As is stated in 2.0 branch readme.md

  • Submit New Features to the (dev-2.1.x) branch.
    Instructions unclear captain, abandon ship?

Also I consider the readme of dev2.1 has more details (HAL), that 2.0 doesn't

@thisiskeithb
Copy link
Member

Yes, but new feature PRs are still being submitted to bugfix-2.0.x and not dev-2.1.x.

@chepo92 chepo92 closed this May 2, 2020
@chepo92
Copy link
Contributor Author

chepo92 commented May 2, 2020

Then let's make that explicit in readme

@thisiskeithb
Copy link
Member

That's why I asked Scott 🙂

@chepo92 chepo92 deleted the SAM4E8E branch May 2, 2020 06:13
@chepo92
Copy link
Contributor Author

chepo92 commented May 2, 2020

The same change of this PR should be done to 2.0 bugfix anyway, rebasing...

@chepo92 chepo92 restored the SAM4E8E branch May 2, 2020 06:31
@chepo92 chepo92 reopened this May 2, 2020
@chepo92 chepo92 changed the base branch from dev-2.1.x to bugfix-2.0.x May 2, 2020 06:32
@chepo92 chepo92 changed the title Update README.md in dev 2.1 Update README.md for STM32F4 and STM32F1 in bugfix 2.0 May 2, 2020
@chepo92 chepo92 changed the title Update README.md for STM32F4 and STM32F1 in bugfix 2.0 Update README.md for STM32F4 and STM32F1 boards in bugfix 2.0 May 2, 2020
README.md Outdated Show resolved Hide resolved
@thinkyhead
Copy link
Member

There are probably many more boards that could be listed.

@thinkyhead thinkyhead merged commit ac5249a into MarlinFirmware:bugfix-2.0.x May 5, 2020
njibhu pushed a commit to njibhu/Marlin that referenced this pull request Aug 24, 2020
HairingX pushed a commit to HairingX/Marlin that referenced this pull request Jun 16, 2021
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.

3 participants