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

Move duplicated analogin and pwmout to NRF52 directory #4366

Merged
merged 3 commits into from May 24, 2017

Conversation

Projects
None yet
7 participants
@theotherjimmy
Contributor

theotherjimmy commented May 22, 2017

Description

Resolves #4349

Both analogin_api.c and pwmapi.c would fail for any MCU_NRF51822_UNIFIED
target, as the files were duplicated there, when they seem to be intended for
any MCU_NRF52 target. This PR moves the files from the root to the latter
target.

Status

Ready

Todos

  • /morph test
  • /morph export-build
@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented May 22, 2017

/morph test

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented May 22, 2017

/morph export-build

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented May 22, 2017

@pan-

This patch will cause trouble for NRF52840 based targets which also require them. NRF52840 target doesn't define the label MCU_NRF52 (here) .

Maybe these files can go in a folder shared between NRF52832 and NRF52840 based target but it also requires a change in targets.json.

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented May 22, 2017

@pan- Thanks! I missed that. Any recomendations?

@theotherjimmy theotherjimmy force-pushed the theotherjimmy:dedupe-nordic branch to da9b8f3 May 22, 2017

@pan-

pan- approved these changes May 22, 2017

LGTM

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented May 22, 2017

/morph export-build

@mbed-bot

This comment has been minimized.

mbed-bot commented May 23, 2017

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

@mbed-bot

This comment has been minimized.

mbed-bot commented May 23, 2017

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph export-build

@mbed-bot

This comment has been minimized.

mbed-bot commented May 23, 2017

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph export-build

Output

mbed Build Number: 40

Exporter Build failed!

@0xc0170

This comment has been minimized.

Member

0xc0170 commented May 23, 2017

@pan- is looking at the failure . It is this error for some targets : 02:32:43 .\mbed-os\cmsis\core_cm4.h(1536): error: #13: expected a file name . I believe this is another issue to be fixed

@adbridge

This comment has been minimized.

Contributor

adbridge commented May 23, 2017

@0xc0170 @pan- That looks like a similar error to what was causing some of the BLE examples to also fail ??

@pan-

This comment has been minimized.

Member

pan- commented May 23, 2017

@adbridge No, it is different than this untraceable error or the one this PR fix.

pan- added some commits May 23, 2017

uvision exporter: Escape double quote in flags.
Without this fix macro defined as -DFOO="BAR" won't be correctly handled
by uvision.
makefile exporter: Escape double quote in toolchain flags.
Without this fix macro defined as -DFOO="BAR" won't be correctly
interpreted by the compiler.
@adbridge

This comment has been minimized.

Contributor

adbridge commented May 23, 2017

/morph test-nightly

@adbridge

This comment has been minimized.

Contributor

adbridge commented May 23, 2017

/morph export-build

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented May 23, 2017

Thanks for the fixes @pan-!

@mbed-bot

This comment has been minimized.

mbed-bot commented May 23, 2017

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph export-build

Output

mbed Build Number: 41

All exports and builds passed!

@mbed-bot

This comment has been minimized.

mbed-bot commented May 23, 2017

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 320

Test failed!

@pan-

This comment has been minimized.

Member

pan- commented May 23, 2017

@theotherjimmy Could you comment on the tests results ? I do not understand how the failure can be the linked to this PR.

@studavekar

This comment has been minimized.

Collaborator

studavekar commented May 23, 2017

@pan- There were few devices which went bad causing erroneous results, re-triggering the job

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented May 24, 2017

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 325

Test failed!

@0xc0170

This comment has been minimized.

Member

0xc0170 commented May 24, 2017

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented May 24, 2017

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 327

All builds and test passed!

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels May 24, 2017

@0xc0170 0xc0170 merged commit 186f406 into ARMmbed:master May 24, 2017

5 checks passed

Cam-CI uvisor Build & Test Success
Details
ci/morph-export-build Job has completed
Details
ci/morph-test-nightly Job has completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@sg- sg- removed the ready for merge label May 24, 2017

@theotherjimmy theotherjimmy deleted the theotherjimmy:dedupe-nordic branch May 24, 2017

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