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 PCA1000X variant PCA10001 #226

Merged
merged 2 commits into from
Jan 16, 2018
Merged

Add PCA1000X variant PCA10001 #226

merged 2 commits into from
Jan 16, 2018

Conversation

oyooyo
Copy link
Contributor

@oyooyo oyooyo commented Jan 14, 2018

This PR adds a PCA1000X board variant called PCA10001, for the PCA10001 development board.

@dlabun
Copy link
Collaborator

dlabun commented Jan 14, 2018

@sandeepmistry Should the PCA10001 be broken out to a separate folder?

@sandeepmistry
Copy link
Owner

@dlabun no I think it's ok, it's a sub-variant of PCA1000x.

@oyooyo please see comment in #224 (comment) . Do you want us to merge this or PR #224, which has both changes?

@sandeepmistry sandeepmistry mentioned this pull request Jan 14, 2018
@oyooyo
Copy link
Contributor Author

oyooyo commented Jan 15, 2018

@sandeepmistry Oops, sorry for that - I actually intended to truly separate the changes in this PR and PR #224, but I guess I screwed up (I'm still severely struggling with mastering GIT and Github).

I'll update both PRs later today to address the mentioned issues.

@oyooyo
Copy link
Contributor Author

oyooyo commented Jan 15, 2018

Ok, I think I managed to add the missing Travis CI entry to this PR.
Unfortunately I still haven't figured out how to properly remove the duplicate commit 29e5058 from PR #224, sorry :-(

@dlabun
Copy link
Collaborator

dlabun commented Jan 15, 2018

No worries, i'm no Github expert... If you need to you can simply create a new PR.

@oyooyo
Copy link
Contributor Author

oyooyo commented Jan 16, 2018

I believe both PRs (#224 and #226) should be okay now.

@dlabun dlabun merged commit ff2ca12 into sandeepmistry:master Jan 16, 2018
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