-
Notifications
You must be signed in to change notification settings - Fork 100
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
Move code to 'firmware' folder, #55
Conversation
e52c1f4
to
96d4d3b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good, I'm going to wait to merge it though for 2-3 weeks until most folks have got their orbs (there are currently many in the mail) as to not distrust their flashing, after which I will add overlays on the youtube to accommodate this, just merging this now will be more distruptive now than it would be later
@learn-more Could you move this PR to the dev branch? Going to start making major codebase changes there then doing big version level merges to main. I'll merge this right away when you do |
96d4d3b
to
0ff9583
Compare
I re-created the PR, |
@learn-more one final question here before finally getting this merge; Any reason behind keeping the Info-Orbs file for images the assets opposed to nesting it under an assets folder under the firmware? Is this strictly an organizational choice or is it required to be in a separate folder for PIO to compile |
No reason, I simply reused the PNG files that were already present in the repo. |
allow opening platformio from the root of the repository
0ff9583
to
15f7a2d
Compare
icons/rain.jpg | ||
icons/clouds.jpg | ||
board_build.embed_files = | ||
icons/jpg white/moonCloud.jpg |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@brett-dot-tech I have updated these to use the images that were already present in your repository (one level above the old Info-orbs
)
Due to how this embedding works, the icons.h
also needed updating to reflect these paths.
allow opening platformio from the root of the repository
Additionally, I deleted
Info-Orbs/icons
and re-used the existingicons/jpg white/
files.❗ Please note, merging this will cause merge conflicts in all existing open PR's ❗