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.

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

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

Merged
merged 8 commits into from
May 15, 2017

Commits on Apr 26, 2017

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

    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
    nvlsianpu committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    c62a33e View commit details
    Browse the repository at this point in the history
  2. [NRF5]

    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
    nvlsianpu committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    2ff5726 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

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

    ….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
    nvlsianpu committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    b2080ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    53c6f85 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2017

  1. [NRF5] coding style format.

    nvlsianpu committed Apr 28, 2017
    Configuration menu
    Copy the full SHA
    e6dbbde View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    708dd47 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    382a067 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2017

  1. NRF5: changes for code review of merg nrf52840 to NRF5 sources

    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.
    nvlsianpu committed May 9, 2017
    Configuration menu
    Copy the full SHA
    1f1168a View commit details
    Browse the repository at this point in the history