DELTA_DFCM_NNN40 pull request #1002
Conversation
|
Can you squash all these commits into one? |
|
got it, |
|
Hi 0xc0170, Sorry, I try and I don't know how to squash all commits into one. I just want to pull request one commit that ID is 6d53a99. Or do you have other suggestion? Thanks |
| @@ -941,12 +941,6 @@ def __init__(self): | |||
| self.core = "Cortex-M0" | |||
| self.extra_labels = ['NORDIC', 'MCU_NRF51822', 'MCU_NORDIC_16K', 'DELTA_DFCM_NNN40'] | |||
| self.MERGE_SOFT_DEVICE = False | |||
| class DELTA_DFCM_NNN40_OTA(NRF51822): | |||
There was a problem hiding this comment.
Why did you remove this target?
There was a problem hiding this comment.
This target is added by me.
I added twice, so I remove one.
Thanks
|
@Marcomissyou Isn't RTC0 used by soft device? You added and enabled RTC to the platform, but the code is not much clear if it's functional. Is it ? |
|
Yes, Thanks |
|
I am going to clean the history here a bit. I just came across one article explaining well a branch and master merge (aka do rebase), http://kristopherwilson.com/2015/02/12/stop-merging-master/ |
Delta target - add RTC, bugfixes in mbed_overrides and pinnames
|
I went through this PR (=pull request) history, things are mixed between your master and upstream master. The commits should be changed, as not even cherry-pick is possible to pick relevant commits. I merged using squash, did some cleaning. Please don't use tabs in the files and look at the changeset you are introducing before do a commit. Review commit 331dc07. |
add rtc_api.c for MBED_16 RTC test and modify mbed_overrides.c to shut down Flash when boot-up.