Skip to content

[NUCLEO_F103RB] Migration to STM32Cube driver #953

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

Merged
merged 5 commits into from
Mar 9, 2015
Merged

[NUCLEO_F103RB] Migration to STM32Cube driver #953

merged 5 commits into from
Mar 9, 2015

Conversation

bcostm
Copy link
Contributor

@bcostm bcostm commented Mar 6, 2015

From now on, all Nucleo platforms use the STM32Cube driver.

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 6, 2015

Did you update your master to the upstream master? There are conflicts, although you added new commits just 3 hours ago. Will look at the conflicts

@bcostm
Copy link
Contributor Author

bcostm commented Mar 6, 2015

No I didn't do it before these commits. Can you tell me which conflicts you see ?

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 9, 2015

Thanks for resolving the conflicts. It's a good practice to rebase your branch to the latest master's HEAD, to resolve all conflicts before issuing a new pull request. Same when starting adding a new feature, to start from the latest changes.

0xc0170 added a commit that referenced this pull request Mar 9, 2015
NUCLEO_F103RB - Migration to STM32Cube driver
@0xc0170 0xc0170 merged commit 4b74c54 into ARMmbed:master Mar 9, 2015
@0xc0170
Copy link
Contributor

0xc0170 commented Mar 17, 2015

I have just noticed, you removed from gpio_objects header file the function:

static inline int gpio_is_connected(const gpio_t *obj) {
    return obj->pin != (PinName)NC;
}

I'll send the new PR to fix this.

@bcostm
Copy link
Contributor Author

bcostm commented Mar 17, 2015

I didn't see it. It is a new function that has been added recently. Thanks for the update.

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 17, 2015

I do a diff when I am about to commit changes, to see if all files contain changes I have done, not introducing any new. Diff tool might help for this type of paste-replace, to only apply new differences and keep the old ones in the place.

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