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

update "Fix #253: Use AdcStart() before each ReadAnalog value" #256

Merged
merged 4 commits into from
Jun 16, 2020

Conversation

dhineshkumarmcci
Copy link
Contributor

Advanced the version number in README.md and CatenaBase.h

Copy link
Member

@terrillmoore terrillmoore left a comment

Choose a reason for hiding this comment

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

This is not part of v0.19.0. If someone checks out v0.19.0 (the tag), they won't get this change.

You need to move line 1581 AHEAD of 1381, and not change 1384. See comments.

README.md Outdated Show resolved Hide resolved
@terrillmoore terrillmoore merged commit ae2b198 into master Jun 16, 2020
@dhineshkumarmcci
Copy link
Contributor Author

@terrillmoore changes in the file CatenaStm32L0_ReadAnalog.cpp of the branch issue253 is not reflected in the master during the merge of this pull-request.

{
AdcStart();
fStatusOk = AdcGetValue(&vChannel);
}

Trying to create a new pull-request with branch issue253 says no changes to compare. Is that ok to create a new branch and submit a pull-request?

@terrillmoore terrillmoore deleted the issue253 branch June 26, 2020 22:26
@terrillmoore
Copy link
Member

It would be best to understand how this happened. I suggest that you fork this repo, first apply your pull request there, then you can push changes upstream from your repo once you are sure they are correct.

@terrillmoore terrillmoore restored the issue253 branch June 26, 2020 22:29
@terrillmoore
Copy link
Member

I think the merge didn't pick up your changes -- you committed changes to issue253 after I merged. Reopen #253, rename your local branch to "issue253a" or something, and submit a new pr.

@terrillmoore terrillmoore deleted the issue253 branch June 26, 2020 22:30
@terrillmoore
Copy link
Member

Note this from the history above:
image
The highlighted commits appear after the [Merged] indication. As far as I know, there is no way to merge the extra commits without a new PR. They don't point to the reference lines.

More research points to #254. I reverted that, because the documentation was not done.

Proper process was not followed. Proper process is to push additional changes to the branch used for PR #254, not to create a new branch. I am going to REVERT this PR as well, and you must push ALL your changes onto either #254, or a different new PR. Please get review from @mcciyssaroha for this, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants