Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ports/esp32: Added new UM boards. #15848

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

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

UnexpectedMaker
Copy link
Contributor

  • Added 2 new UM boards: OMGS3 and RGB Touch Mini
  • Fixed NanoS3 deploy info.

@mattytrentini
Copy link
Contributor

Ruff format is complaining about the use of tabs, which should be converted to spaces. But otherwise, it looks good to me. 😄

@mattytrentini mattytrentini added port-esp32 board-definition New or updated board definition files. Combine with a port- label. labels Sep 15, 2024
@UnexpectedMaker
Copy link
Contributor Author

Ruff format is complaining about the use of tabs, which should be converted to spaces. But otherwise, it looks good to me. 😄

Thanks - Ok, converted the script to spaces... let's see what it fails on now ;)

@Gadgetoid
Copy link
Contributor

Gadgetoid commented Sep 16, 2024

You should be able to git rebase -i HEAD~4 and "squash" all of your linting fixes into the original commit. No need to add separate commits.

You can also git commit --amend to edit the last commit, and push with --force to rewrite your remote with basic fixes like this. Then you only need to format one commit message!

EDIT:

For example git rebase -i HEAD~4 and:

pick c94eb7420 ports/esp32: Added new UM boards.                                 
squash 062ec7258 Fixed some github check issues.                                 
squash 728afea4c Convert some TABS to spaces                                     
squash 909616271 Convert some single quotes to dbl quotes.  

Followed by cleaning up the commit message.

Results in one clean commit: pimoroni@62f1503

Commits for linting fixes are unnecessary noise that someone will have to fix, better the PR-author than the stretched-thin maintainers.

Forgive the intrusion but I sensed some frustration in #15823!

@UnexpectedMaker
Copy link
Contributor Author

You should be able to git rebase -i HEAD~4 and "squash" all of your linting fixes into the original commit. No need to add separate commits.

You can also git commit --amend to edit the last commit, and push with --force to rewrite your remote with basic fixes like this. Then you only need to format one commit message!

EDIT:

For example git rebase -i HEAD~4 and:

pick c94eb7420 ports/esp32: Added new UM boards.                                 
squash 062ec7258 Fixed some github check issues.                                 
squash 728afea4c Convert some TABS to spaces                                     
squash 909616271 Convert some single quotes to dbl quotes.  

Followed by cleaning up the commit message.

Results in one clean commit: pimoroni@62f1503

Commits for linting fixes are unnecessary noise that someone will have to fix, better the PR-author than the stretched-thin maintainers.

Forgive the intrusion but I sensed some frustration in #15823!

Hey, thanks for your post - Interactive rebasing is a little beyond my git skills, but giving it a go, and hoping for the best :)

Yes, some ongoing frustration with the rules and previous vagueness of the cryptic fails in the CI tests. Some things have been improved over time, but some I just don't agree with, like the rules around commit message naming.

@Gadgetoid
Copy link
Contributor

but some I just don't agree with, like the rules around commit message naming.

You'll come 'round eventually! If you ever have to chase down a bug and bisect a repository this big and complex you'll be singing the praises of a little consistency 😆

Do hit me up if you ever need a hand!

@UnexpectedMaker
Copy link
Contributor Author

Thank you!

This adds two new UM boards: OMGS3 and RGB Touch Mini.  Also fixed the
NanoS3 deploy info.

Signed-off-by: Seon Rozenblum <[email protected]>
@dpgeorge dpgeorge merged commit 9b5f99e into micropython:master Sep 19, 2024
8 checks passed
@dpgeorge
Copy link
Member

@UnexpectedMaker it looks like UM_RGBTOUCH_MINI doesn't compile. Can you please investigate that?

@UnexpectedMaker
Copy link
Contributor Author

@UnexpectedMaker it looks like UM_RGBTOUCH_MINI doesn't compile. Can you please investigate that?

It definitely compiles, as I am currently hosting the firmware in my rgbtouch repo.

MPY: soft reboot
MicroPython v1.24.0-preview.309.gf1bdac375.dirty on 2024-09-12; RGB Touch Mini with ESP32-S3-PICO-1-N8R2
Type "help()" for more information.
>>> 

Built with:

idf.py --version
ESP-IDF v5.2.2-388-g021c03c9f2

What IDF version and what error are you getting?

@UnexpectedMaker
Copy link
Contributor Author

I just built it again here and it compiled fine with no errors, so looks like it's IDF version specific?

@dpgeorge
Copy link
Member

I'm building with IDF v5.2.2. The error is:

freeze error executing "micropython/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py": Error in manifest file: micropython/ports/esp32/boards/UM_RGBTOUCH_MINI/manifest.py: [Errno 2] No such file or directory: 'micropython/ports/esp32/boards/UM_RGBTOUCH_MINI/modules'

@UnexpectedMaker
Copy link
Contributor Author

Hmm, so because the modules folder is empty, git doesn't send it. Nice.

It's in my local folder, so compiles fine here. The folder wont be empty in the future, so I didn't want to remove the framework using it.

I'll get this sorted right now, thanks.

@UnexpectedMaker
Copy link
Contributor Author

Ok, I fixed it, but now the PR is merged, I can't add my fix to it?
I have to create a new PR?

@UnexpectedMaker
Copy link
Contributor Author

Ok, sorted it out... this is fixed in #15880

Cheers :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
board-definition New or updated board definition files. Combine with a port- label. port-esp32
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants