Skip to content

I2C fix added, SPI slave fixes added and SPISLAVE enabled #3597

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

Closed
wants to merge 3 commits into from

Conversation

pradeep-gr
Copy link
Contributor

Notes:

  • Pull requests will not be accepted until the submitter has agreed to the contributer agreement.
  • This is just a template, so feel free to use/remove the unnecessary things

Description

A few sentences describing the overall goals of the pull request's commits.

Status

READY/IN DEVELOPMENT/HOLD

Migrations

If this PR changes any APIs or behaviors, give a short description of what API users should do when this PR is merged.

YES | NO

Related PRs

List related PRs against other branches:

branch PR
other_pr_production link
other_pr_master link

Todos

  • Tests
  • Documentation

Deploy notes

Notes regarding the deployment of this PR. These should note any
required changes in the build environment, tools, compilers, etc.

Steps to test or reproduce

Outline the steps to test or reproduce the PR here.

binary output file when more than 316K binary is generated. Need updated
daplink bootloader to flash >316K binary file by drag n drop.Refer pull
request generated for flashalgo and daplink repo for more info.IAR lnker
script modified for flash merge-640K and format changed as per IAR
requirement.
…510.

Linker places feature specific and application code in Flash B while the
rest of the mbed-os including rtos is placed in Flash A.
@pradeep-gr
Copy link
Contributor Author

@maclobdell
This PR created from new feature branch and committed only I2C & SPI changes. Still I am seeing flash merge commits added to this PR. As I am new to GIT please let me know how to raise separate PR only for I2C and SPI.

@maclobdell
Copy link
Contributor

Hi Pradeep, looks like your branch named "origin" has a base that is on top of your master branch which has the other commits, and the base of your master branch is the one that forks off the ARMmbed master branch. So, basically you want your "origin" branch to fork directly from the ARMmbed master branch, in order to only have the i2c commit in the PR.

@maclobdell
Copy link
Contributor

Hi Pradeep, I just tried the following steps and it seems to accomplish the previous recommendation I made. I pulled the latest updates from github.com/armmbed/mbed-os (also called 'origin' in my case), then checked out the origin/master branch. Created a new branch from that point, gave the branch a new name, then "cherry picked" the commit that makes the i2c fixes onto the new branch. I use Git Extensions tool, but this should be able to be done via git commands or other git tools. I hope this helps.

@pradeep-gr
Copy link
Contributor Author

pradeep-gr commented Jan 18, 2017

@maclobdell
I have created new branch from https://github.com/ARMmbed/mbed-os but not able to push branch to GIT
as i do not have permission.

image

@bridadan
Copy link
Contributor

Hi @pradeep-gr, you're almost there! You're currently trying to push a branch to the ARMmbed repository for mbed-os, which it is correctly preventing you from doing :)

You need to push it to your "fork" of the mbed-os repo, which I believe you have one here: https://github.com/pradeep-gr/mbed-os5-onsemi. (If you look at the top of the page, you'll see the text "forked from ARMmbed/mbed-os"), which is your clue that this your "fork")

If you run the following commands you should then be able to submit a PR:

cd D:\MBED\GIT_HUB\MBED_OS_BRANCH
git remote add pradeep-gr https://github.com/pradeep-gr/mbed-os5-onsemi
git checkout feature_i2c_spislave
git push pradeep-gr feature_i2c_spislave

At this point GitHub should let you submit the PR! Hope that helps!

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 19, 2017

One small addition to the above:

Always check what are your remotes (I run this command always when I switch repositories, as I have many remotes often)

git remote -v

In this case, it would show that origin is mbed-os repository, not your fork :-)

@pradeep-gr
Copy link
Contributor Author

@maclobdell @bridadan @0xc0170 Thanks for your help to raise separate PR. I have raised PR for I2C and SPI fixes. #3611.

@bridadan
Copy link
Contributor

@pradeep-gr great, thanks for doing that! I'll close this one and we'll continue the discussion on #3611

@bridadan bridadan closed this Jan 19, 2017
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.

4 participants