Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixing a macro to detect when RTOS was in use for the NRF52840_DK #4021

Merged
merged 2 commits into from
Mar 29, 2017
Merged

Fixing a macro to detect when RTOS was in use for the NRF52840_DK #4021

merged 2 commits into from
Mar 29, 2017

Conversation

bridadan
Copy link
Contributor

@bridadan bridadan commented Mar 24, 2017 •
edited
Loading

Description

The recently added NRF52840_DK broke the mbed 2 nightly. This is because the check for the presence of the RTOS was using the wrong macro. I have fixed it in this PR.

Status

READY

Migrations

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

NO

Todos

  • morph test
  • export build
  • mbed 2 bot

Steps to test or reproduce

Currently on master if you run the following command:

$ python tools/build_release.py -t GCC_ARM -p NRF52840_DK -v

You will get the following error:

[Error] app_timer_rtx.c@47,0:  #5: cannot open source input file "cmsis_os.h": No such file or directory

This branch should fix the issue.

@bridadan bridadan requested review from pan- and c1728p9 March 24, 2017 15:26
@bridadan
Copy link
Contributor Author

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

@bridadan
Copy link
Contributor Author

bridadan commented Mar 24, 2017 •
edited
Loading

Just tried the uvision exporter locally and there's still an issue with this platform. It's because there are two nrf_soc.h files that are being included:

  1. https://github.com/ARMmbed/mbed-os/blob/master/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/nrf_soc_nosd/nrf_soc.h
  2. https://github.com/ARMmbed/mbed-os/blob/master/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/nrf_soc.h

I tried my hand at resolving it and I wasn't sure which file to rename. I think we probably want to rename the one in the softdevice dirtectory but I'm not sure. Any tips @anangl @nvlsianpu @pan-? This will also affect all the files that include it and I'm not sure which of the files that include nrf_soc.h will need the updated file.

This was referenced Mar 24, 2017
Merged
Merged
@nvlsianpu
Copy link
Contributor

Try remove https://github.com/ARMmbed/mbed-os/blob/master/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/nrf_soc_nosd/nrf_soc.h. Probably This whole directory should be removed.

@theotherjimmy
Copy link
Contributor

theotherjimmy commented Mar 24, 2017 •
edited
Loading

@nvlsianpu You can't remove that directory, as features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/source/btle/btle.cpp depends on targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/sdk/softdevice/s140/headers/ble_types.h Whoops, wrong dir.

@theotherjimmy
Copy link
Contributor

@nvlsianpu It compiles fine with targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/nrf_soc_nosd/ removed.

@theotherjimmy
Remove the nrf_soc_nosd directory
0ed0a9e 
This removes the duplicate header files from the build. We were getting
lucky on most invocations of `mbed compile` in that these headers were
searched for after some others, but not when exporting to uvision.
@theotherjimmy
Copy link
Contributor

/morph export-build

@bridadan
Copy link
Contributor Author

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

This was referenced Mar 24, 2017
Merged
Closed
@mbed-bot
Copy link

Result: SUCCESS

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

/morph export-build

Output

mbed Build Number: 142

All exports and builds passed!

@mbed-bot
Copy link

[Build 1317]
SUCCESS: Building succeeded and tests were run! Be sure to check the test results

@bridadan
Copy link
Contributor Author

/morph test

@mbed-bot
Copy link

Result: SUCCESS

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

/morph test

Output

mbed Build Number: 1740

All builds and test passed!

@bridadan
Copy link
Contributor Author

Just looking for reviews from @c1728p9 and @pan-, but then this should be ok to come in. And the sooner the better, this fixes issues on master.

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 26, 2017

@bridadan thanks for spotting this and fixing

pan-
pan- approved these changes Mar 27, 2017
View reviewed changes
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.

I'm happy with the changes.
@bridadan thanks.

@bridadan
Copy link
Contributor Author

@0xc0170 This PR is blocking a whole bunch of other PRs from being tested, so if we can prioritize this getting merged that'd be great 😄

@0xc0170
Copy link
Contributor

0xc0170 commented Mar 29, 2017

@0xc0170 This PR is blocking a whole bunch of other PRs from being tested, so if we can prioritize this getting merged that'd be great 😄

Yes, aware of this. I'll merge it now

@0xc0170 0xc0170 merged commit 16bf07e into ARMmbed:master Mar 29, 2017
aisair pushed a commit to aisair/mbed that referenced this pull request Apr 30, 2024
Release 140 of the mbed library
a7a4a81 
Ports for Upcoming Targets

3841: Add nRf52840 target ARMmbed/mbed-os#3841
3992: Introducing UBLOX_C030 platform. ARMmbed/mbed-os#3992

Fixes and Changes

3951: [NUCLEO_F303ZE] Correct ARDUINO pin ARMmbed/mbed-os#3951
4021: Fixing a macro to detect when RTOS was in use for the NRF52840_DK ARMmbed/mbed-os#4021
3979: KW24D: Add missing SPI defines and Arduino connector definitions ARMmbed/mbed-os#3979
3990: UBLOX_C027: construct a ticker-based wait, rather than calling wait_ms(), in the  ARMmbed/mbed-os#3990
4003: Fixed OBOE in async serial tx for NRF52 target, fixes #4002 ARMmbed/mbed-os#4003
4012: STM32: Correct I2C master error handling ARMmbed/mbed-os#4012
4020: NUCLEO_L011K4 remove unsupported tool chain files ARMmbed/mbed-os#4020
4065: K66F: Move bss section to m_data_2 Section ARMmbed/mbed-os#4065
4014: Issue 3763: Reduce heap allocation in the GCC linker file ARMmbed/mbed-os#4014
4030: [STM32L0] reduce IAR heap and stack size for small targets ARMmbed/mbed-os#4030
4109: NUCLEO_L476RG : minor serial pin update ARMmbed/mbed-os#4109
3982: Ticker - kl25z bugfix for handling events in the past ARMmbed/mbed-os#3982
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@c1728p9 c1728p9 c1728p9 approved these changes

@pan- pan- pan- approved these changes

Assignees
No one assigned
Labels
release-version: 5.4.3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@bridadan @nvlsianpu @theotherjimmy @mbed-bot @0xc0170 @pan- @c1728p9