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 MT6701 I2C sensor configuration #398

Closed
wants to merge 5 commits into from

Conversation

alperbasarn
Copy link

No description provided.

@runger1101001 runger1101001 changed the base branch from master to dev May 12, 2024 19:30
@runger1101001
Copy link
Member

Thanks a lot for this contribution!

I will gladly merge it, but we accept the PRs only against the dev branch of the library. I've changed the base of your PR, but there are some other parallel changes. I'll look into this, and merge it once I've sorted this out.

@runger1101001 runger1101001 self-assigned this May 12, 2024
@runger1101001 runger1101001 added the enhancement New feature or request label May 12, 2024
@runger1101001 runger1101001 added this to the 2.3.4_Release milestone May 12, 2024
@alperbasarn
Copy link
Author

thanks! let me know if you would like me to rebase and resolve if there are any conflicts.

@runger1101001
Copy link
Member

Hey, if you do not mind sending it again based on the "dev" branch then I could straight merge it.

It's not your fault, we caused this by accidentally merging some changes to the master branch.
I've tried to fix it by pre-merging the changes from the master branch but it hasn't worked as I expected, and I still see your PR as including the other changes.

Can I ask you to rebase your changes on the dev branch, then I can merge that.
Otherwise, if you prefer I can rebase your changes locally, this will be no work for you, but it might lose the reference to your GitHub user and contribution.

@alperbasarn
Copy link
Author

Sure thing, I have also extended example file for demonstrating MT6701 integration.

But, somehow I cannot see dev branch in my fork, and cannot push a proposal branch to direct clone(not forked). is there any permission that needs to be granted ?

@runger1101001
Copy link
Member

But, somehow I cannot see dev branch in my fork, and cannot push a proposal branch to direct clone(not forked). is there any permission that needs to be granted ?

Huh, that's weird... I'm not sure. Maybe there is a way to pull over the other branch into your forked repo on GitHub but not sure how...

One way you could definately do it is to add the SimpleFOC repo as another remote to your local cloned copy, and then pull the dev branch from this. Then you can push that branch to your fork, and do the PR from there...

@runger1101001
Copy link
Member

I have cherry-picked your changes over in this PR: #406
The change is attributed to you, but committed by me. I hope it is ok:

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants