Skip to content
Snippets Groups Projects
  1. Jul 18, 2018
    • glennrub's avatar
      nrf: Replace custom-HAL with nrfx-HAL · 002f7d1a
      glennrub authored
      Summarized this squashed PR replaces the hal/ folder in the port. This has been replaced the official
      HAL layer from Nordic Semiconductor; https://github.com/NordicSemiconductor/nrfx.
      
      A Git submodule has been added under lib/nrfx, for the nrfx dependency.
      
      The drivers / modules has been updated to use this new HAL layer; nrfx at v1.0.0.
      
      Also, header files and system files for nrf51/nrf52x chip variants has been deleted from the device/ folder, only keeping back the startup files written in C. All other files are now fetched from nrfx.
      
      3 new header files in the ports/nrf/ folder has been added to configure nrfx (nrfx_config.h), logging (nrfx_log.h) and glue nrfx together with the drivers and modules from micropython (nrfx_glue.h).
      
      The PR has been a joint effort from @aykevl (Ayke van Laethem) and @glennrub.
      
      For reference, the commit log will be kept to get an overview of the changes done:
      
      * ports/nrf: Initial commit for moving hal to Nordic Semiconductor BSD-3 licensed nrfx-hal.
      
      * ports/nrf: Adding nrfx, Nordic Semiconductor BSD-3 hal layer, as git submodule checked out at lib/nrfx.
      
      * ports/nrf/modules/machine/uart: Fixing bug which set hwfc to parity excluded, always resulting in no flow control, hence corrupted output. Also adding an extra loop on uart_tx_char to prevent any tx when any ongoing tx is in progress.
      
      * ports/nrf/i2c: Moving I2C over to nrfx driver.
      
      * ports/nrf/modules/machine/i2c: Alignment. Renaming print function param 'o' to 'self_in'
      
      * ports/nrf/spi: Updating SPI machine module to use nrfx drivers.
      
      * ports/nrf: Renaming modules/machine/rtc.c/.h to rtcounter.c/.h to not confuse the peripheral with Real-Time Clock:
      
      * ports/nrf: Updating various files after renaming machine module RTC to RTCounter.
      
      * ports/nrf: Renaming RTC to RTCounter in modmachine globals dict table. Also updating object type name to reflect new module name.
      
      * ports/nrf: Fixing leftovers after renaming rtc to rtcounter.
      
      * ports/nrf: Early untested adoption of nrfx_rtc in RTCounter. Untested.
      
      * nrf/modules/machine/i2c: Improve keyword argument handling
      
      * ports/nrf/modules/temp: Updating Temp machine module to use nrfx defined hal nrf_temp.h. Moving logic of BLE stack awareness to machine module.
      
      * ports/nrf/boards/pca10040: Enable machine Temp module.
      
      * nrf/modules/machine/rtcounter: Remove magic constants.
      
      * ports/nrf: Adding base support for nrfx module logging. Adding option to disable logging of UART as it might log its own setup over UART while the peripheral is not yet set up. Logging of UART could make sense if other transport of log is used.
      
      * ports/nrf: updating nrfx_log.h with more correct parenthisis on macro grouping.
      
      * ports/nrf: Updating nrfx logging with configuration to disable logging of UART module. The pattern can be used to turn off other modules as well. However, for now UART is the only module locking itself by logging before the peripheral is configured. Logging is turned off by default, can be enabled in nrfx_config.h by setting NRFX_LOG_ENABLED=1.
      
      * ports/nrf/modules/random: Updating modrandom to use nrfx hal for rng. Not using nrfx-driver for this peripheral as its blocking mode would do the trick on RNG. Moving softdevice aware code from legacy hal to modrandom.c.
      
      * nrf: Enable Peripheral Resource Sharing.
      
      This enables TWI and SPI to be enabled at the same time.
      
      * nrf/Makefile: Define MCU sub variant (e.g. NRF51822/NRF51422)
      
      * nrf: Port TIMER peripheral to nrfx HAL.
      
      * nrf/modules/machine/uart: Optimize UART module
      
      For a nRF51, this results in a size reduction of:
      .text: -68 bytes
      .data: -56 bytes
      
      * nrf/modules/machine/uart: Don't use magic index numbers.
      
      * nrf/modules/machine/uart: Fix off-by-one error.
      
      For nrf51:
      .text: -40 bytes
      
      * nrf/modules/machine/rtcounter: Update for nrfx HAL.
      
      * nrf/modules/machine/i2c: Reduce RAM consumption.
      
      Reductions for the nrf51:
      flash: -108 bytes
      RAM:   -72 bytes
      
      * nrf/mpconfigport: Avoid unnecessary root pointers.
      
      This saves 92 bytes of RAM.
      
      * nrf: Support SoftDevice with nrfx HAL.
      
      * nrf: Add NVMC peripheral (microbitfs) support.
      
      There is no support yet for a SoftDevice.
      
      It also fixes a potentially serious bug in start_index generation.
      
      * nrf/modules/machine/spi: Optimize SPI peripheral.
      
      nrf51:
      text: -340 bytes
      data: -72  bytes
      
      nrf52:
      text: -352 bytes
      data: -108 bytes
      
      * nrf/modules/random: Forgot to commit header file.
      
      * nrf: Make nrfx_config.h universal for all boards.
      
      * nrf: Use SoftDevice API for flash access when built for SD
      
      * nrf/drivers/bluetooth: Remove legacy HAL driver includes.
      
      These were not used anymore so can be removed.
      
      * ports/nrf/microbit: Port microbit targets to nrfx HAL
      
      Initial port of microbit modules to use nrfx HAL layer.
      Tested display/image and modmusic on micro:bit to verify that
      softpwm and ticker for nrf51 is working as expected.
      
      Changing IRQ priority on timer to priority 2, as 1 might collide if
      used side by side of SD110 BLE stack.
      
      The patch reserves Timer1 peripheral compile time. This is not ideal
      and should be resolved in seperate task.
      
      * nrf/boards/microbit: Remove custom nrfx_config.h from microbit target, adding disablement of timer1 if softpwm is enabled.
      
      * nrf/adc: Update ADC module to use nrfx
      
      * nrf/modules/machine/pwm: Updating machine PWM module to use nrfx HAL driver.
      
      examples/nrf52_pwm.py and examples/nrf52_servo.py tested on pca10040.
      
      * nrf: Removing hal folder and boards nrf5x_hal_conf.h headers.
      
      * nrf/nrfx_glue: Adding direct NVIC access for S110 BLE stack
      
      If SoftDevice s110 has not yet been initialized, the IRQ will not be forwarded to
      the application using the sd_nvic* function calls. Hence, direct access to cmsi
      nvic functions are used instead if SoftDevice is not enabled.
      
      * nrf/drivers/ticker: Setting IRQ priority 3 on Timer1
      
      SoftDevice fails to initilize if Timer1 has been configured to priority
      level 2 before enabling the SD. The timer is set to priority 1, higher than BLE
      stack in order to provide better quality of music rendering when used with the
      music module. This might be too high, time will show.
      
      * nrf/examples: Updating ubluepy_temp after moving RTCounter to nrfx.
      
      * nrf: delete duplicate files from device folder which can be located in nrfx/mdk.
      
      * nrf/Makefile: Fetch system files from nrfx.
      
      Testing on each device sub-variant to figure out which system file to
      use. Reason for this is that nrf52.c is actually defining nrf52832.
      
      Removing NRF_DEFINES parameter setting the device in use into the
      same sub-variant test, as NRF52 is unique to nrf52832 when using nrfx.
      Without this exclusion of -DNRF52 in compilation for nrf52840, the
      device will be interpreted as a nrf52, hence nrf52832.
      
      Also, changing name on variable SRC_NRF_HAL to SRC_NRFX_HAL to
      explicitly tell the origin of the file.
      
      * nrf: Updating device #ifdefs to be more open to non-nrf51 targets.
      
      * nrf/modules/machine/uart: Removing second instance of UART for nrf52840 as it only has one non-DMA variant.
      
      * nrf/device: Removing system files as these are now used from nrfx/mdk
      
      * nrf: Moving startup files in device one level up as there is no need for deep hierarchy.
      
      * nrf: Use NRF52_SERIES defined in nrfx/mdk/nrf.h as define value when testing for both nrf52(832) and nrf52840 variants.
      
      * nrf/modules/machine/uart: Enable UART RX by default
      
      Enable rx by default after intiialization of the peripheral.
      Else, the nrfx driver will re-enable rx for each byte read
      on uart REPL, clearing the EVENT_RXDRDY before second byte,
      which again will make second byte get lost and read will get stuck.
      
      This happens if the bytes are transmitted nrf(51) while still
      processing the previous byte. Not seen on nrf52, but should
      also become an issue at higher speeds.
      
      This patch sets rx to always be enabled. Hence, not clearing the event
      between read bytes, and it will be able to detect next byte recieved
      upon finishing the first.
      
      * nrf/modules/machine/timer: Fixing defines excluding Timer1 if ticker/softpwm is used.
      
      * nrf: Switching import form mpconfigboard.h to mpconfigport.h in nrfx_config.h as mpconfigboard.h might define default values for defines not set by board specific header.
      
      * nrf/modules/machine/i2c: nrfx integration fixes
      
      Increasing speed to 400K.
      
      Returning Address NACK's as MP error code; MP_ENODEV.
      
      Returning MP_ETIMEOUT on all other error codes from TWI nrfx driver
      except the ANACK.
      
      Enabling and disabling the TWI peripheral before and after each transaction.
      
      * nrf/examples: Updating ssd1306_mod.py to split framebuffer transfer into multiple chunks
      
      * nrf/modules/machine/i2c: Return MP_EIO error if Data NACK occurs.
      
      * nrf: Addressing review comments.
      
      * nrf: Updating git submodule and users to nrfx v1.0.0.
      
      * nrf/modules/machine/adc: Update adc module to follow v1.0.0 nrfx API.
      
      * nrf/modules/machine/spi: Implement init and deinit functions
      
      Extending SPI objects with a config member such that
      configuration can be kept between new() and init().
      
      Moving initialization done in new() to common init
      function shared between the module functions.
      
      If SPI is already configured, the SPI peripheral will
      be uninitialized before initalized again.
      
      Adding logic to handle initialization of polarity and
      phase. As well, updating default speed to 1M from 500K.
      
      * nrf/modules/machine: Removing unused nrfx includes in machine module header files
      002f7d1a
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit/modules: Initialize variable in microbit_sleep. · 62931398
      Glenn Ruben Bakke authored
      When compiling for microbit with LTO=0, a compiler error occurs due to
      'ms' variable in the microbit_sleep function has not been initialized.
      
      This patch initialize the variable to 0.
      62931398
    • Ayke van Laethem's avatar
      nrf: Make LTO configurable via Makefile flag. · 3cdecf90
      Ayke van Laethem authored
      LTO messes up debuggability and may cause some other issues.
      Additionally, it does not always result in reduced code size.
      3cdecf90
    • Glenn Ruben Bakke's avatar
      nrf: Improve include of boardmodules.mk · c4861273
      Glenn Ruben Bakke authored
      Removing shell commands for checking if boardmodules.mk exists
      under boards/<BOARD>/modules folder before including it.
      
      This patch does the equivalent to previous test without using
      shell commands. Hence, including the .mk if it exists.
      
      Reference:
      https://stackoverflow.com/questions/8346118/check-if-a-makefile-exists-before-including-it
      c4861273
    • Ayke van Laethem's avatar
      nrf: Fix stack size in ld script and enable MICROPY_STACK_CHECK. · 4231d431
      Ayke van Laethem authored
      The nrf51x22_256k_16k_s110_8.0.0.ld had a stack size of only 1kB, which
      is way too low. Additionally, the indicated _minimum_stack_size (set at
      2kB for that chip) isn't respected.
      
      This commit sets the heap end based on the stack size (heap end = RAM
      end - stack size) making it much easier to configure.
      
      Additionally, the stack/heap size of nrf52 chips has been set to a more
      sane value of 8kB.
      4231d431
    • Ayke van Laethem's avatar
      nrf: Make machine.UART optional. · 987381df
      Ayke van Laethem authored
      Leave it enabled by default on all targets.
      
      This is only possible when using UART-over-BLE (NUS) instead of the
      default hardware peripheral. The flash area saved is quite substantial
      (about 2.2KB) so this is useful for custom builds that do not need UART.
      987381df
    • Glenn Ruben Bakke's avatar
      nrf/drivers/ble_drv: Fixing sd_ble_enable bug for SD s132 v.2.0.1 · f679ee20
      Glenn Ruben Bakke authored
      Feather52 target which is using SD s132 v.2.0.1 cannot compile
      due to variable containing RAM start address is not used.
      
      This patch enables the correct sd_ble_enable variant for this SD.
      f679ee20
    • Ayke van Laethem's avatar
      nrf/boards/common.ld: Avoid overflowing the .text region. · f907139f
      Ayke van Laethem authored
      Similar commit to this one:
      https://github.com/tralamazza/micropython/commit/6e56e6269f467e59316b5e4cb04ea37ab6a0dfe3
      
      When .text + .data oveflow available flash, the linker may not show an
      error. This change makes sure .data is included in the size calculation.
      f907139f
    • Ayke van Laethem's avatar
      nrf/modules/machine/pin: Disable pin debug by default. · 4c011e66
      Ayke van Laethem authored
      Saves for the nrf51:
      flash: 336 bytes
      RAM:     4 bytes
      4c011e66
    • Ayke van Laethem's avatar
      nrf/mpconfigport: Reduce GC stack size for nrf51. · 1b988f1e
      Ayke van Laethem authored
      This frees 128 bytes of .bss RAM on the nRF51, at the cost of possibly
      more expensive GC cycles. Leave it as-is on the nRF52 as that chip has a
      lot more RAM.
      
      This is also done in the micro:bit:
      https://github.com/bbcmicrobit/micropython/blob/a7544718a7138a04168e8e6b283e14e500ffbe8b/inc/microbit/mpconfigport.h#L6
      1b988f1e
    • kaasasolut's avatar
    • Glenn Ruben Bakke's avatar
      nrf: Change PYB prefix to MPY · 725267df
      Glenn Ruben Bakke authored
      725267df
    • glennrub's avatar
      nrf: Add support for s132 v5.0.0 bluetooth stack (#139) · f8f14bf0
      glennrub authored
      * ports/nrf/boards: Adding linker script for nrf52832 using BLE stack s132 v.5.0.0.
      
      * ports/nrf/drivers/bluetooth: Updating makefile to add BLE_API_VERSION=4 if s132 v5.0.0 is used.
      
      * ports/nrf/drivers/bluetooth: Updating BLE stack download script to also download S132 v5.0.0.
      
      * ports/nrf/drivers/bluetooth: Updating ble_drv.c to handle BLE_API_VERSION=4 (s132 v5.0.0).
      
      * ports/nrf/boards: Updating linker script for nrf52832 with s132 v.5.0.0 bluetooth stack.
      
      * ports/nrf/drivers/bluetooth: Removing commented out code in ble_drv.c
      
      * ports/nrf/drivers/bluetooth: Updating define of GATT_MTU_SIZE_DEFAULT for SD132v5 to be defined using the new name defined in the SD headers in a more generic way.
      
      * ports/nrf/drivers/bluetooth: Cleaning up use of BLE_API_VERSION in the ble_drv.c. Also considering s140v6 API, so not all has been changed to >= if API version 3 and 4 in combo is used. New s140v6 will differ on these, and add a new API not compatible with the API for 3 and 4.
      f8f14bf0
    • Glenn Ruben Bakke's avatar
      nrf/drivers/bluetooth: Reset evt_len to size of static buffer each iter. · 95bd2052
      Glenn Ruben Bakke authored
      For each iteration of polling BLE events from the Bluetooth LE stack.
      95bd2052
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Enable music, display, image, microbit module. · c8fd7161
      Glenn Ruben Bakke authored
      Enabled by default on microbit targets, with or without BLE stack.  Also
      enable softpwm to make display and music module compile.
      c8fd7161
    • Glenn Ruben Bakke's avatar
      nrf: Add if-def around inclusion of nrf_sdm.h in main. · f5ed4011
      Glenn Ruben Bakke authored
      Not all targets are using bluetooth le.
      f5ed4011
    • Glenn Ruben Bakke's avatar
      nrf: Change board module header from board_modules.h to boardmodules.h. · 6062d461
      Glenn Ruben Bakke authored
      Applicable for targets with board specific modules.
      6062d461
    • Glenn Ruben Bakke's avatar
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Add temperature back to microbit module. · 1128aacb
      Glenn Ruben Bakke authored
      Increases size by 68 bytes.  Should be considered to be removed as temp
      module is already providing this functionality.
      1128aacb
    • Glenn Ruben Bakke's avatar
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Move microbit target to custom linker script. · 5601fc93
      Glenn Ruben Bakke authored
      To use if BLE stack is enabled.  The custom linker script also set off
      space enough to compile in microbitfs+hal_nvmc.
      5601fc93
    • Glenn Ruben Bakke's avatar
      nrf: Update main.c to init relevant board drivers, if enabled. · 67b57beb
      Glenn Ruben Bakke authored
      If the board has these drivers then they will be initialized:
      - softpwm (implicit ticker)
      - music module
      - board specific module
      67b57beb
    • Glenn Ruben Bakke's avatar
      nrf/modules/music: Remove init of softpwm/ticker upon music module load. · f8ae6b7b
      Glenn Ruben Bakke authored
      Also update microbit_music_init0 to register low priority ticker callback
      for the music module.
      f8ae6b7b
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Update to work with new ticker code. · 789f8f1c
      Glenn Ruben Bakke authored
      - Rename microbit_module_init to board_module_init0 which is the generic
        board module init function.
      - Add low priority callback registration of display tick handler in the
        module init function.
      789f8f1c
    • Glenn Ruben Bakke's avatar
      nrf/drivers/ticker: Rework ticker functions for microbit display/music. · 91fcde73
      Glenn Ruben Bakke authored
      - Rename init function to ticker_init0.
      - Implement ticker_register_low_pri_callback (recycle of unused
        set_low_priority_callback function which was unimplemented).
      - Add support for registering 2 low pri callbacks.  For now, one intended
        for microbit display, and one for modmusic.
      91fcde73
    • Glenn Ruben Bakke's avatar
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Include modmicrobit.h in board_modules.h. · d76982e3
      Glenn Ruben Bakke authored
      So that users of the board module can find the init function of the module
      implicitly.
      d76982e3
    • Glenn Ruben Bakke's avatar
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Attempt to get working display/images without FP. · 1b241be3
      Glenn Ruben Bakke authored
      And update the API to align with new unary/binary function callback
      structures.
      1b241be3
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Add framework updates to build micro:bit modules. · 9e090a87
      Glenn Ruben Bakke authored
      Makefile and mpconfigport.h update is generic, and could be used by other
      boards to give extra modules which are only for a selected board.
      9e090a87
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Update board modules from C++ to C-code. · fbc45bd3
      Glenn Ruben Bakke authored
      This aligns implementation with new style structures.
      fbc45bd3
    • Glenn Ruben Bakke's avatar
      nrf/boards/microbit: Rename display/image files from .cpp to .c ext. · f3386cfc
      Glenn Ruben Bakke authored
      Also rename modmicrobit.h to microbitconstimage.h.
      f3386cfc
    • Glenn Ruben Bakke's avatar
    • Glenn Ruben Bakke's avatar
    • Ayke van Laethem's avatar
      nrf: Option to enable Ctrl-C in NUS console. · a248db69
      Ayke van Laethem authored
      Costs 136 bytes on a nRF51822.
      a248db69
    • Ayke van Laethem's avatar
      nrf: Remove default FROZEN_MPY_DIR. · 03b8429c
      Ayke van Laethem authored
      Saves 448 bytes of flash. Can still be enabled using:
      
          make FROZEN_MPY_DIR=freeze BOARD=foo
      03b8429c
    • Glenn Ruben Bakke's avatar
    • Ayke van Laethem's avatar
      nrf/drivers/bluetooth: Start advertising after disconnect. · fc5d89e2
      Ayke van Laethem authored
      Disconnecting after a connect would not restart advertising, so
      reconnecting may get harder.
      fc5d89e2
    • Ayke van Laethem's avatar
      nrf/main: Add ampy support. · 2561bcf0
      Ayke van Laethem authored
      The ampy tool expects a "soft reboot" line when it does a soft reset.
      2561bcf0
    • Glenn Ruben Bakke's avatar
      nrf: Use micropython libm to save flash · 2b32333f
      Glenn Ruben Bakke authored
      Using libm from micropython free up about 5.5kb flash on nrf52
      targets which have floating point enabled.
      2b32333f
Loading