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

Move code to 'firmware' folder, #55

Merged
merged 1 commit into from
Oct 21, 2024

Conversation

learn-more
Copy link
Collaborator

@learn-more learn-more commented Sep 24, 2024

allow opening platformio from the root of the repository
Additionally, I deleted Info-Orbs/icons and re-used the existing icons/jpg white/ files.

❗ Please note, merging this will cause merge conflicts in all existing open PR's ❗

@learn-more learn-more force-pushed the platformio_root branch 2 times, most recently from e52c1f4 to 96d4d3b Compare September 28, 2024 20:15
Copy link
Collaborator

@brett-dot-tech brett-dot-tech 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 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

@brett-dot-tech
Copy link
Collaborator

@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

@learn-more learn-more changed the base branch from main to dev October 4, 2024 08:15
@learn-more
Copy link
Collaborator Author

@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

I re-created the PR,
and I added the github actions (building) for the 'dev' branch as well as PR's to the 'dev' branch.

@brett-dot-tech
Copy link
Collaborator

@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

@learn-more
Copy link
Collaborator Author

@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
icons/rain.jpg
icons/clouds.jpg
board_build.embed_files =
icons/jpg white/moonCloud.jpg
Copy link
Collaborator Author

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.

@brett-dot-tech brett-dot-tech merged commit 9921a9a into brettdottech:dev Oct 21, 2024
3 checks passed
@learn-more learn-more deleted the platformio_root branch October 21, 2024 20:31
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