Skip to content

Move duplicated analogin and pwmout to NRF52 directory #4366

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

Merged
merged 3 commits into from
May 24, 2017

Conversation

theotherjimmy
Copy link
Contributor

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
Copy link
Contributor Author

/morph test

@theotherjimmy
Copy link
Contributor Author

/morph export-build

@theotherjimmy
Copy link
Contributor Author

@pan- @screamerbg FYI

Copy link
Member

@pan- pan- left a comment

Choose a reason for hiding this comment

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

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
Copy link
Contributor Author

theotherjimmy commented May 22, 2017

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

Copy link
Member

@pan- pan- left a comment

Choose a reason for hiding this comment

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

LGTM

@theotherjimmy
Copy link
Contributor Author

/morph export-build

@mbed-bot
Copy link

Result: FAILURE

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

/morph test

@mbed-bot
Copy link

Result: FAILURE

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

/morph export-build

@mbed-bot
Copy link

Result: FAILURE

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

/morph export-build

Output

mbed Build Number: 40

Exporter Build failed!

@0xc0170
Copy link
Contributor

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
Copy link
Contributor

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

@pan-
Copy link
Member

pan- commented May 23, 2017

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

pan- added 2 commits May 23, 2017 14:04
Without this fix macro defined as -DFOO="BAR" won't be correctly handled
by uvision.
Without this fix macro defined as -DFOO="BAR" won't be correctly
interpreted by the compiler.
@adbridge
Copy link
Contributor

/morph test-nightly

@adbridge
Copy link
Contributor

/morph export-build

@theotherjimmy
Copy link
Contributor Author

Thanks for the fixes @pan-!

@mbed-bot
Copy link

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
Copy link

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 320

Test failed!

@pan-
Copy link
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
Copy link
Contributor

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

/morph test-nightly

@mbed-bot
Copy link

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 325

Test failed!

@0xc0170
Copy link
Contributor

0xc0170 commented May 24, 2017

/morph test-nightly

@mbed-bot
Copy link

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 merged commit 186f406 into ARMmbed:master May 24, 2017
@theotherjimmy theotherjimmy deleted the dedupe-nordic branch May 24, 2017 17:08
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.

7 participants