[NRF5 + NRF52840]: Merge nrf52840 to [NRF5] sources #4245

nvlsianpu · 2017-04-28T11:50:28Z

Description

Former nRF52840 was based on its private api hal drivers and ble implementation. This PR merge those nRF52840 changes to NRF5.

nRF5 SDK base codes and softdevice versions are not changed for mcu targets.

changes:
renamed dir. NRF5/sdk -> NRF5/TARGET_SDK11
moved dir. NRF5_SDK13/sdk -> NR5/TARGET_SDK13
moved dir. NRF5_SDK13/TARGET_MCU_NRF52840 -> NRF5/TARGET_MCU_NRF52840

merged changes introduce to BLE port for compatibility with newest SD API
changes FEATURE_BLE(...)/NRF5_SDK13/.(c,h,cpp) -> FEATURE_BLE(...)/NRF5/.(c,h,cpp)

merged changes introduce to device hal driver port for compatibility with nRF5 SDK13
NRF5_SDK13/.(c,h) -> NRF5/.(c,h)

Added backward compatibility code to API implementation of gpio, pwm, serial, port, spi
Added backward compatibility code to BLE implementation of GAP.

Modified targets description in order to use moved files.

Purpose of changes

This PR purpose is to reduce Nordic maintenance effort. It introduce coherence between NRF51, NRF52, NRF52840 ports.

Status

READY

TARGET_NRF5_SDK13/sdk -> TARGET_NRF5/TARGET_SDK13 TARGET_NRF5/sdk -> TARGET_NRF5/TARGET_SDK11 TARGET_NRF5_SDK13/TARGET_MCU_NRF52840 -> TARGET_NRF5/TARGET_MCU_NRF52840

HAL driver: Add changes from needad for nrf52840 support us_ticker, spi, sleep, serial, pwmout, pinmap, object, i2c, gpio, analogin Add compatibility patches for: - SoftDevice headers renamed (redirec by a few h files) - sdk configuration (redirect by sdk_config.h files) - renaming of func in softdevice handler module

….x,5.0.0-1.alpha by Copy of changes from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/source to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source

…g to NRFFOETT-1674.

nvlsianpu · 2017-04-28T12:02:33Z

I tested BLE applications for all Nordic Soc witch success.

mbed test are blocked by #4237. Although this tests pass if unwanted intel-hex record was removed from hex file "by hand".

tommikas · 2017-04-28T13:36:45Z

A couple of NRF52 DK builds are failing. Neither build has the BLE feature included.

Compile [  8.2%]: btle.cpp
[Fatal Error] ble.h@1,23: .\nrf_ble.h: No such file or directory
[ERROR] In file included from ./mbed-os/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.h:27:0,
                 from ./mbed-os/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp:20:
./mbed-os/targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble.h:1:23: fatal error: .\nrf_ble.h: No such file or directory
 #include ".\nrf_ble.h"

Btw @theotherjimmy, getting [Warning] mbed_config.h@64,0: #1-D: last line of file ends without a newline for every file with armcc builds.

0xc0170 · 2017-04-28T13:44:31Z

Btw @theotherjimmy, getting [Warning] mbed_config.h@64,0: #1-D: last line of file ends without a newline for every file with armcc builds.

The patch is already for review, will be fixed soon

tommikas · 2017-04-28T14:00:14Z

Cool, I figured you'd probably be aware of it already.

theotherjimmy · 2017-05-02T16:09:47Z

@pan- could you review?

pan-

Thanks, it looks good. I leaved few comments you can address.
I still need to run the test suite on these changes.

pan- · 2017-05-08T12:51:01Z

targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c

@@ -46,15 +56,15 @@ gpio_cfg_t m_gpio_cfg[GPIO_PIN_COUNT];

 static gpio_irq_handler m_irq_handler;
 static uint32_t m_channel_ids[GPIO_PIN_COUNT] = {0};
-uint32_t m_gpio_irq_enabled;
+static uint32_t m_gpio_irq_enabled;


The type should be gpio_mask_t.

pan- · 2017-05-08T12:52:54Z

targets/TARGET_NORDIC/TARGET_NRF5/gpio_api.c

@@ -79,20 +89,26 @@ void gpio_init(gpio_t *obj, PinName pin)
    m_gpio_cfg[obj->pin].used_as_gpio = true;
 }

+#ifdef TARGET_SDK11


Is it a polyfill for SDK V11 ? If so, can it be explicitly indicated.

pan- · 2017-05-08T13:01:41Z

targets/TARGET_NORDIC/TARGET_NRF5/port_api.c

+    #error not recognized gpio count for mcu
+#endif
+
+#define GPIO_PORT_COUNT (sizeof(m_gpio_pin_count)/sizeof(uint32_t))


little note, (sizeof(m_gpio_pin_count)/sizeof(m_gpio_pin_count[0])) is more correct because it doesn't assume the type of m_gpio_pin_count as uint32_t.

pan- · 2017-05-08T13:43:31Z

targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c

-        US_TICKER_INT_MASK |
-        NRF_RTC_INT_OVERFLOW_MASK);
+#if DEVICE_LOWPOWERTIMER
+                       LP_TICKER_INT_MASK |


Could you fix the indentation ?

pan- · 2017-05-08T13:43:48Z

targets/TARGET_NORDIC/TARGET_NRF5/us_ticker.c

+#if DEVICE_LOWPOWERTIMER
+                       LP_TICKER_INT_MASK |
+#endif
+                       US_TICKER_INT_MASK |


Indentation

pan- · 2017-05-08T15:09:58Z

targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_hci.h

@@ -0,0 +1 @@
+#include "nrf_ble_hci.h"


Please remove this header.

pan- · 2017-05-08T15:10:06Z

targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_l2capi.h

@@ -0,0 +1 @@
+#include "nrf_ble_l2cap.h"


Please remove this header.

pan- · 2017-05-08T15:10:13Z

targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_ranges.h

@@ -0,0 +1 @@
+#include "nrf_ble_ranges.h"


Please remove this header.

pan- · 2017-05-08T15:10:19Z

targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/softdevice/s132/headers/ble_types.h

@@ -0,0 +1 @@
+#include "nrf_ble_types.h"


Please remove this header.

pan- · 2017-05-08T15:30:03Z

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xGap.cpp

@@ -167,7 +173,11 @@ ble_error_t nRF5xGap::startAdvertising(const GapAdvertisingParams &params)
        (params.getTimeout() > GapAdvertisingParams::GAP_ADV_PARAMS_TIMEOUT_MAX)) {
        return BLE_ERROR_PARAM_OUT_OF_RANGE;
    }
-
+    uint32_t err;


Is it possible to move back err and adv_para variables ?

s140 headers renamed form ble_* to nrf_ble_*, Removed s130 and s132 headers named form ble_* (Them had been added by #2ff572682798562e812015dc775b5896e0fda5a4) Headers inclusinons were changed in order to meet above changes. Revrted bad change in us_ticker.c: use __disable_irq lock instead of core_util_critical_section_enter lock for setting rtc1 tick for systick emulation as was good before.

0xc0170 · 2017-05-11T12:40:47Z

/morph test

pan- · 2017-05-11T13:18:17Z

test ble

{ 
    "targets": ["NRF51_DK", "NRF52_DK"],
    "toolchains": ["GCC_ARM", "ARM"]
}

mbed-bot · 2017-05-11T21:39:50Z

Result: SUCCESS

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

/morph test

Output

mbed Build Number: 188

All builds and test passed!

…ed in ARMmbed#4245.

theotherjimmy · 2017-05-22T14:37:56Z

@pan- Did IAR get tested?

adbridge · 2017-05-22T14:39:29Z

This PR didn't have examples or exporters tested

nvlsianpu · 2017-05-23T06:52:07Z

https://github.com/ARMmbed/mbed-os-example-ble work fine on nRF52840_DK (although BLE_Button and BLE_GAPButton require new definition of buton pin in mbed_app.json):

"NRF52840_DK": {
            "ble_button_pin_name": "BUTTON1"
        }

nvlsianpu added 6 commits April 26, 2017 11:38

NORDIC: moving nRF52840 files to NRF5 "common" port.

c62a33e

TARGET_NRF5_SDK13/sdk -> TARGET_NRF5/TARGET_SDK13 TARGET_NRF5/sdk -> TARGET_NRF5/TARGET_SDK11 TARGET_NRF5_SDK13/TARGET_MCU_NRF52840 -> TARGET_NRF5/TARGET_MCU_NRF52840

Make NRF5 BLE implementation compatible with SoftDevice API 2.x.x,3.x…

b2080ab

….x,5.0.0-1.alpha by Copy of changes from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/source to features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source

Apply resloution for the "Read long UUID of service problem" accordin…

53c6f85

…g to NRFFOETT-1674.

[NRF5] coding style format.

e6dbbde

remove orphaned NRF5_SDK13 hal api driver

708dd47

This was referenced Apr 28, 2017

Move NRF52_DK target to NRF5_SDK13 sources #4132

Closed

POC of moving NRF51_unified to common sources [former nRF52840 ONLY port] nvlsianpu/mbed#8

Closed

0xc0170 added the needs: work label Apr 28, 2017

Fix compilation errors on linux machine

382a067

theotherjimmy added needs: review and removed needs: work labels May 2, 2017

theotherjimmy requested a review from pan- May 2, 2017 16:09

nvlsianpu changed the title ~~[NRF5 + NRF52840]: Merge nrf52840 to [NRF5] suorces~~ [NRF5 + NRF52840]: Merge nrf52840 to [NRF5] sources May 4, 2017

pan- requested changes May 8, 2017

View reviewed changes

pan- approved these changes May 9, 2017

View reviewed changes

0xc0170 approved these changes May 11, 2017

View reviewed changes

0xc0170 added needs: CI and removed needs: review labels May 11, 2017

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

0xc0170 added release-version: 5.4.6 and removed ready for merge labels May 15, 2017

0xc0170 merged commit ef56d95 into ARMmbed:master May 15, 2017

nvlsianpu added a commit to nvlsianpu/mbed that referenced this pull request May 16, 2017

remove unwanted (and unused anymore) NRF5_SDK13 BLE port. It was omit…

64f2a9d

…ed in ARMmbed#4245.

This was referenced May 16, 2017

Remove unwanted (and unused anymore) NRF5_SDK13 BLE port #4328

Merged

[NRF52840]: SecurityManager::getAddressesFromBondTable #4178

Merged

This was referenced May 16, 2017

Flash api nRF52840 #4282

Merged

Feature qspi #4229

Closed

0xc0170 mentioned this pull request May 19, 2017

nrf51 targets - exports contain duplicated files #4349

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NRF5 + NRF52840]: Merge nrf52840 to [NRF5] sources #4245

[NRF5 + NRF52840]: Merge nrf52840 to [NRF5] sources #4245

nvlsianpu commented Apr 28, 2017

nvlsianpu commented Apr 28, 2017

tommikas commented Apr 28, 2017

0xc0170 commented Apr 28, 2017

tommikas commented Apr 28, 2017

theotherjimmy commented May 2, 2017

pan- left a comment

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

pan- May 8, 2017

0xc0170 commented May 11, 2017

pan- commented May 11, 2017

mbed-bot commented May 11, 2017

theotherjimmy commented May 22, 2017

adbridge commented May 22, 2017

nvlsianpu commented May 23, 2017

[NRF5 + NRF52840]: Merge nrf52840 to [NRF5] sources #4245

[NRF5 + NRF52840]: Merge nrf52840 to [NRF5] sources #4245

Conversation

nvlsianpu commented Apr 28, 2017

Description

Purpose of changes

Status

nvlsianpu commented Apr 28, 2017

tommikas commented Apr 28, 2017

0xc0170 commented Apr 28, 2017

tommikas commented Apr 28, 2017

theotherjimmy commented May 2, 2017

pan- left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xc0170 commented May 11, 2017

pan- commented May 11, 2017

mbed-bot commented May 11, 2017

Output

theotherjimmy commented May 22, 2017

adbridge commented May 22, 2017

nvlsianpu commented May 23, 2017