search

simplefoc / Arduino-FOC

Arduino FOC for BLDC and Stepper motors - Arduino Based Field Oriented Control Algorithm Library
https://docs.simplefoc.com
MIT License
1.94k stars 510 forks source link

add MT6701 I2C sensor configuration #398

Closed alperbasarn closed 3 weeks ago

runger1101001 commented 1 month ago

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.

alperbasarn commented 1 month ago

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

runger1101001 commented 1 month ago

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 commented 1 month ago

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 commented 1 month ago

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 commented 3 weeks ago

I have cherry-picked your changes over in this PR: https://github.com/simplefoc/Arduino-FOC/pull/406 The change is attributed to you, but committed by me. I hope it is ok:

image