Skip to content

[miniclient] SWO, TRNG for NRF52_DK only #5963

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 4 commits into from
Closed

[miniclient] SWO, TRNG for NRF52_DK only #5963

wants to merge 4 commits into from

Conversation

marcuschangarm
Copy link
Contributor

@marcuschangarm marcuschangarm commented Jan 29, 2018

Trial balloon for resolving issues in #5726

Note that the feature-miniclient branch is for some reason currently incompatible with master.

@cmonr
Copy link
Contributor

cmonr commented Jan 29, 2018

Note that the feature-miniclient branch is for some reason currently incompatible with master.

It's possible that it's been a long time since feature-miniclient has been rebased against master.

@marcuschangarm
Copy link
Contributor Author

@cmonr it should still be rebase compatible right? I got a merge conflict for a file I've never touched when I tried.

@marcuschangarm
Copy link
Contributor Author

Also, this is not meant to go into master, it's supposed to go into feature-miniclient.

@cmonr
Copy link
Contributor

cmonr commented Jan 29, 2018

/morph build

@cmonr
Copy link
Contributor

cmonr commented Jan 29, 2018

@cmonr it should still be rebase compatible right? I got a merge conflict for a file I've never touched when I tried.

Should, but not guaranteed. A rebase can fail if a file has changed in both branches, with Git not sure how to resolve which change goes on top of the other.

@marcuschangarm
Copy link
Contributor Author

lol - I see the problem now. Someone merged the same changes in both master and the feature branch.

@mbed-ci
Copy link

mbed-ci commented Jan 29, 2018

Build : SUCCESS

Build number : 1003
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/5963/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci
Copy link

mbed-ci commented Jan 29, 2018

@mbed-ci
Copy link

mbed-ci commented Jan 30, 2018

@TeroJaasko
Copy link
Contributor

This code works with miniclient at NRF52_DK so I can confirm that TRNG and SWO do work with it. Note: the flash API is not yet used or tested on it.

@cmonr
Copy link
Contributor

cmonr commented Jan 30, 2018

/morph build

@marcuschangarm marcuschangarm changed the title [miniclient] SWO, TRNG, FLASH for NRF52_DK only [miniclient] SWO, TRNG for NRF52_DK only Jan 30, 2018
@mbed-ci
Copy link

mbed-ci commented Jan 30, 2018

Build : SUCCESS

Build number : 1012
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/5963/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci
Copy link

mbed-ci commented Jan 30, 2018

@cmonr
Copy link
Contributor

cmonr commented Jan 30, 2018

/morph uvisor-test

@mbed-ci
Copy link

mbed-ci commented Jan 30, 2018

@marcuschangarm
Copy link
Contributor Author

@TeroJaasko @yogpan01
Would you be happy to see this branch replace the current miniclient branch? I think it is the easiest way forward since the current miniclient branch has merge conflicts with master.

@cmonr
Copy link
Contributor

cmonr commented Jan 31, 2018

/morph uvisor-test

1 similar comment
@0xc0170
Copy link
Contributor

0xc0170 commented Feb 1, 2018

/morph uvisor-test

@cmonr
Copy link
Contributor

cmonr commented Feb 1, 2018

Pinging @TeroJaasko @yogpan01 for feedback on @marcuschangarm's question.

@marcuschangarm
Copy link
Contributor Author

Merged to new feature branch: https://github.com/ARMmbed/mbed-os/tree/feature-cloud-client-lite

@marcuschangarm marcuschangarm deleted the feature-miniclient-take2 branch April 5, 2018 11:32
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.

6 participants