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

Add argument for path to pico_configs file #27

Merged
merged 5 commits into from
Mar 10, 2021

Conversation

CodePurble
Copy link
Contributor

@CodePurble CodePurble commented Feb 25, 2021

The path to pico_configs.tsv is hard-coded in the generator script. It complains when I use the generator in other scripts and even when I symlinked the script to my PATH for convenience. An option to specify where to find it will remove all this hassle. This PR aims to do just that.

@CodePurble
Copy link
Contributor Author

#26 is related. Maybe just that PR is enough to fix this. There's not much progress there, so I am leaving this PR as it is for now.

@lurch
Copy link
Contributor

lurch commented Mar 8, 2021

pico_configs.tsv will probably update more frequently than pico_project.py (the former is generated from pico-sdk), so it's probably worth including this command-line-arg regardless of #26 👍

pico_project.py Outdated Show resolved Hide resolved
@JamesH65
Copy link
Contributor

JamesH65 commented Mar 9, 2021

Something has gone a bit pear shaped in that commit. Might be worth trying a "git pull --rebase" from the upstream master, then doing a push of the resulting tree to your codebase. That SHOULD update the PR to only have your changes in it. Or not...

@lurch
Copy link
Contributor

lurch commented Mar 9, 2021

More specifically, I think the following sequence of commands should sort you out:

git fetch origin
git checkout config-file-arg
git rebase origin/master
git push -f fork config-file-arg

@CodePurble
Copy link
Contributor Author

CodePurble commented Mar 9, 2021

More specifically, I think the following sequence of commands should sort you out:

git fetch origin
git checkout config-file-arg
git rebase origin/master
git push -f fork config-file-arg

This does the job. Thanks for the help!

README.md Outdated Show resolved Hide resolved
@JamesH65
Copy link
Contributor

This LGTM now @lurch?

Copy link
Contributor

@lurch lurch left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@JamesH65 JamesH65 merged commit 3a1cdad into raspberrypi:master Mar 10, 2021
@JamesH65
Copy link
Contributor

Thanks all!

@CodePurble CodePurble deleted the config-file-arg branch March 12, 2021 07:46
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.

3 participants