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

Check (and display) app vs partition size before flashing #232

Merged
merged 1 commit into from
Sep 12, 2022

Conversation

jendakol
Copy link
Contributor

@jendakol jendakol commented Sep 9, 2022

No description provided.

Copy link
Member

@jessebraham jessebraham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine overall, thank you for contributing! I know it's a bit of a pain, but if you could just get the CI green that would be very much appreciated and I can get this merged.

Additionally, we are in the process of trying to re-license this project to MIT/Apache 2. Assuming you consent to your contributions being under these licenses rather than GPL2 could you please just say so in this RFC?

@jendakol
Copy link
Contributor Author

Hey @jessebraham, I don't really care about the licensing so I've posted the consent 😄
As for this PR, I'll try to fix the build. What bothers me more is that I realized that my change is related only to ESP32, not to all other variants of the chip. It's kind of hard to develop it as I have only ESP32 available right now :-) What do you think about that?

@jessebraham
Copy link
Member

jessebraham commented Sep 12, 2022

Thank you for doing that! I think just running cargo fmt and pushing the changes should be enough to fix the CI.

This does actually work on the ESP32, ESP32-C3, ESP32-S2, and ESP32-S3 (I've tested them all). The esp32bootloader.rs file is probably not the best name, this refers to all devices starting from the ESP32 and moving forward; this only really excludes the ESP8266.

@jendakol
Copy link
Contributor Author

Does it? 😮 It didn't look like that when I was exploring the code 😂 (maybe because I was looking at ESP8266 🤔)
Anyway, let me fix the build and we're good to go then 😎

Copy link
Member

@jessebraham jessebraham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks again!

@jessebraham jessebraham merged commit 1b23940 into esp-rs:master Sep 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants