From 261436d22bc93338e08e67956a47142e3b0d5086 Mon Sep 17 00:00:00 2001
From: root <root@lamia.panaceas.james.local>
Date: Mon, 31 Aug 2015 10:29:39 +0100
Subject: working copy of sdks dfu bootloader

---
 .gitignore                                         |   7 +
 .gitmodules                                        |   3 +
 Makefile                                           | 169 +++++++++++
 bsp/ble400.h                                       | 112 +++++++
 bsp/boards.h                                       |  60 ++++
 bsp/bsp.h                                          | 330 +++++++++++++++++++++
 bsp/bsp_btn_ble.h                                  |  72 +++++
 bsp/pca10028.h                                     | 113 +++++++
 dfu_ble_svc.c                                      | 205 +++++++++++++
 dfu_gcc_nrf51.ld                                   |  53 ++++
 gdb.script                                         |   2 +
 main.c                                             | 253 ++++++++++++++++
 openocd.cfg                                        |  12 +
 sdk-9.0.0                                          |   1 +
 sdk-config/sdk/drivers_nrf/config/nrf_drv_config.h | 137 +++++++++
 .../pstorage/config/pstorage_platform.h            |  65 ++++
 .../libraries/hci/config/hci_mem_pool_internal.h   |  32 ++
 17 files changed, 1626 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .gitmodules
 create mode 100644 Makefile
 create mode 100644 bsp/ble400.h
 create mode 100644 bsp/boards.h
 create mode 100644 bsp/bsp.h
 create mode 100644 bsp/bsp_btn_ble.h
 create mode 100644 bsp/pca10028.h
 create mode 100644 dfu_ble_svc.c
 create mode 100644 dfu_gcc_nrf51.ld
 create mode 100644 gdb.script
 create mode 100644 main.c
 create mode 100644 openocd.cfg
 create mode 160000 sdk-9.0.0
 create mode 100644 sdk-config/sdk/drivers_nrf/config/nrf_drv_config.h
 create mode 100644 sdk-config/sdk/drivers_nrf/pstorage/config/pstorage_platform.h
 create mode 100644 sdk-config/sdk/libraries/hci/config/hci_mem_pool_internal.h

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..74e86ef
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.map
+main
+*~
+*.o
+*.hex
+*.bin
+.*.swp
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..88c4f11
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sdk-9.0.0"]
+	path = sdk-9.0.0
+	url = ssh://git@git.panaceas.org/git/nRF51/sdk-9.0.0
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..721f452
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,169 @@
+PROG=main
+
+DEFINES =
+DEFINES += -DSWI_DISABLE0
+#DEFINES += -DBOARD_PCA10028
+DEFINES += -DBOARD_BLE400
+DEFINES += -DSOFTDEVICE_PRESENT
+DEFINES += -DNRF51
+DEFINES += -D__HEAP_SIZE=0
+DEFINES += -DS130
+DEFINES += -DBLE_STACK_SUPPORT_REQD
+DEFINES += -DBSP_DEFINES_ONLY
+
+CFLAGS=-Os
+LDFLAGS=
+ASFLAGS=
+INCLUDES=
+
+SDK=sdk-9.0.0
+
+SDKCSRCS= \
+	libraries/util/app_error.c \
+	libraries/scheduler/app_scheduler.c \
+	libraries/timer/app_timer.c \
+	libraries/timer/app_timer_appsh.c \
+	libraries/bootloader_dfu/bootloader.c \
+	libraries/bootloader_dfu/bootloader_settings.c \
+	libraries/bootloader_dfu/bootloader_util.c \
+	libraries/crc16/crc16.c \
+	libraries/bootloader_dfu/dfu_dual_bank.c \
+	libraries/bootloader_dfu/dfu_init_template.c \
+	libraries/bootloader_dfu/dfu_transport_ble.c \
+	libraries/hci/hci_mem_pool.c \
+	libraries/util/nrf_assert.c \
+	drivers_nrf/hal/nrf_delay.c \
+	drivers_nrf/pstorage/pstorage_raw.c \
+	ble/common/ble_advdata.c \
+	ble/common/ble_conn_params.c \
+	ble/ble_services/ble_dfu/ble_dfu.c \
+	ble/common/ble_srv_common.c \
+	toolchain/system_nrf51.c \
+	softdevice/common/softdevice_handler/softdevice_handler.c \
+	softdevice/common/softdevice_handler/softdevice_handler_appsh.c \
+
+SDKSSRCS  = toolchain/gcc/gcc_startup_nrf51.s
+
+
+CSRCS = \
+	dfu_ble_svc.c \
+	main.c 
+
+
+SOFTDEVICE=${SDK}/sdk/softdevice/s130/hex/s130_softdevice.hex
+
+LINKER_SCRIPT=dfu_gcc_nrf51.ld #sdk/toolchain/gcc/s130.ld
+
+INCLUDES += -Isdk-config -I${SDK} -I.
+#INCLUDES += -Iconfig
+
+OOCD=openocd
+OOCD_CFG=openocd.cfg
+
+
+CROSS=arm-none-eabi-
+CC       		:= $(CROSS)gcc
+AS       		:= $(CROSS)as
+AR       		:= $(CROSS)ar
+LD       		:= $(CROSS)ld
+NM       		:= $(CROSS)nm
+OBJDUMP  		:= $(CROSS)objdump
+OBJCOPY  		:= $(CROSS)objcopy
+SIZE    		:= $(CROSS)size
+GDB	    		:= $(CROSS)gdb
+
+
+CFLAGS += -mcpu=cortex-m0
+CFLAGS += -mthumb -mabi=aapcs --std=gnu99
+CFLAGS += -Wall -Werror -Os
+CFLAGS += -mfloat-abi=soft
+# keep every function in separate section. This will allow linker to dump unused functions
+CFLAGS += -ffunction-sections -fdata-sections -fno-strict-aliasing
+CFLAGS += -fno-builtin --short-enums
+
+# keep every function in separate section. This will allow linker to dump unused functions
+LDFLAGS += -Xlinker -Map=$(PROG).map
+LDFLAGS += -mthumb -mabi=aapcs -L${SDK} -T$(LINKER_SCRIPT)
+LDFLAGS += -mcpu=cortex-m0
+# let linker to dump unused sections
+LDFLAGS += -Wl,--gc-sections
+# use newlib in nano version
+#LDFLAGS += --specs=nano.specs -lc -lnosys
+LIBS += -lc -lnosys
+
+# Assembler flags
+ASFLAGS += -x assembler-with-cpp
+
+CPPFLAGS=$(DEFINES) $(INCLUDES)
+
+
+OBJS=${CSRCS:%.c=%.o} ${SDKCSRCS:%.c=${SDK}/sdk/%.o} ${SDKSSRCS:%.s=${SDK}/sdk/%.o}
+
+default: ${PROG}.bin ${PROG}.hex 
+
+clean:
+	/bin/rm -f ${OBJS} ${PROG} ${PROG}.bin ${PROG}.hex
+
+${PROG}:${OBJS}
+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) $(LIBS) -o $@
+	$(SIZE) $@
+
+%.bin:%
+	$(OBJCOPY) -O binary $< $@
+%.hex:%
+	$(OBJCOPY) -O ihex $< $@
+
+
+twongle.o:twongle.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+%.o:%.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+	
+%.o:%.s
+	$(CC) $(CPPFLAGS) $(ASFLAGS) -c -o $@ $<
+
+
+flash: ${PROG}.hex
+	${OOCD} -f ${OOCD_CFG} \
+		-c "init" -c "reset init" \
+		-c "flash write_image erase $<" \
+		-c "reset" \
+		-c "shutdown"
+
+
+
+flash_softdevice: ${SOFTDEVICE}
+	${OOCD} -f ${OOCD_CFG} \
+		-c "init" -c "reset init" \
+		-c "nrf51 mass_erase"  \
+		-c "flash write_image erase $<" \
+		-c "reset" \
+		-c "shutdown"
+
+flashall: ${SOFTDEVICE} ${PROG}.hex
+	${OOCD} -f ${OOCD_CFG} \
+		-c "init" -c "reset init" \
+		-c "nrf51 mass_erase"  \
+		-c "flash write_image ${SOFTDEVICE}" \
+		-c "flash write_image ${PROG}.hex" \
+		-c "reset" \
+		-c "shutdown"
+
+
+ds:
+	$(OOCD) -f $(OOCD_CFG)
+
+debug: ${PROG}
+	${GDB} -x gdb.script ${PROG}
+
+
+
+#flash: $(MAKECMDGOALS)
+#	@echo Flashing: $(OUTPUT_BINARY_DIRECTORY)/$<.hex
+#	nrfjprog --reset --program $(OUTPUT_BINARY_DIRECTORY)/$<.hex
+#
+### Flash softdevice
+#flash_softdevice: 
+#	@echo Flashing: s130_softdevice.hex
+#	nrfjprog --reset --program softdevice/s130/hex/s130_softdevice.hex
diff --git a/bsp/ble400.h b/bsp/ble400.h
new file mode 100644
index 0000000..4c8866b
--- /dev/null
+++ b/bsp/ble400.h
@@ -0,0 +1,112 @@
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+#ifndef BLE400_H
+#define BLE400_H
+
+// LEDs definitions for BLE400
+#define LEDS_NUMBER    4
+
+#define LED_START      18
+#define LED_0          18
+#define LED_1          19
+#define LED_2          20
+#define LED_3          21
+#define LED_4          22
+#define LED_STOP       22
+
+#define LEDS_LIST { LED_0, LED_1, LED_2, LED_3, LED_4 }
+
+#define BSP_LED_0      LED_0
+#define BSP_LED_1      LED_1
+#define BSP_LED_2      LED_2
+#define BSP_LED_3      LED_3
+#define BSP_LED_4      LED_4
+
+#define BSP_LED_0_MASK (1<<BSP_LED_0)
+#define BSP_LED_1_MASK (1<<BSP_LED_1)
+#define BSP_LED_2_MASK (1<<BSP_LED_2)
+#define BSP_LED_3_MASK (1<<BSP_LED_3)
+#define BSP_LED_4_MASK (1<<BSP_LED_4)
+
+#define LEDS_MASK      (BSP_LED_0_MASK | BSP_LED_1_MASK | BSP_LED_2_MASK | BSP_LED_3_MASK | BSP_LED_4_MASK )
+/* all LEDs are lit when GPIO is low */
+#define LEDS_INV_MASK  LEDS_MASK
+
+#define BUTTONS_NUMBER 2
+
+#define BUTTON_START   16
+#define BUTTON_1       16
+#define BUTTON_2       17
+#define BUTTON_STOP    17
+#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
+
+#define BUTTONS_LIST { BUTTON_1, BUTTON_2 }
+
+#define BSP_BUTTON_0   BUTTON_1
+#define BSP_BUTTON_1   BUTTON_2
+
+#define BSP_BUTTON_0_MASK (1<<BSP_BUTTON_0)
+#define BSP_BUTTON_1_MASK (1<<BSP_BUTTON_1)
+
+#define BUTTONS_MASK   (BSP_BUTTON_0_MASK|BSP_BUTTON_1_MASK)
+
+#define RX_PIN_NUMBER  11
+#define TX_PIN_NUMBER  9
+#define CTS_PIN_NUMBER 10
+#define RTS_PIN_NUMBER 8
+#define HWFC           true
+
+#if 0
+#define SPIS_MISO_PIN  28    // SPI MISO signal. 
+#define SPIS_CSN_PIN   12    // SPI CSN signal. 
+#define SPIS_MOSI_PIN  25    // SPI MOSI signal. 
+#define SPIS_SCK_PIN   29    // SPI SCK signal. 
+
+#define SPIM0_SCK_PIN       4     /**< SPI clock GPIO pin number. */
+#define SPIM0_MOSI_PIN      1     /**< SPI Master Out Slave In GPIO pin number. */
+#define SPIM0_MISO_PIN      3     /**< SPI Master In Slave Out GPIO pin number. */
+#define SPIM0_SS_PIN        2     /**< SPI Slave Select GPIO pin number. */
+
+#define SPIM1_SCK_PIN       15     /**< SPI clock GPIO pin number. */
+#define SPIM1_MOSI_PIN      12     /**< SPI Master Out Slave In GPIO pin number. */
+#define SPIM1_MISO_PIN      14     /**< SPI Master In Slave Out GPIO pin number. */
+#define SPIM1_SS_PIN        13     /**< SPI Slave Select GPIO pin number. */
+
+// serialization APPLICATION board
+#define SER_APP_RX_PIN              12    // UART RX pin number.
+#define SER_APP_TX_PIN              13    // UART TX pin number.
+#define SER_APP_CTS_PIN             15    // UART Clear To Send pin number.
+#define SER_APP_RTS_PIN             14    // UART Request To Send pin number.
+
+#define SER_APP_SPIM0_SCK_PIN       29     // SPI clock GPIO pin number.
+#define SER_APP_SPIM0_MOSI_PIN      25     // SPI Master Out Slave In GPIO pin number
+#define SER_APP_SPIM0_MISO_PIN      28     // SPI Master In Slave Out GPIO pin number
+#define SER_APP_SPIM0_SS_PIN        12     // SPI Slave Select GPIO pin number
+#define SER_APP_SPIM0_RDY_PIN       14     // SPI READY GPIO pin number
+#define SER_APP_SPIM0_REQ_PIN       13     // SPI REQUEST GPIO pin number
+
+// serialization CONNECTIVITY board
+#define SER_CON_RX_PIN              13    // UART RX pin number.
+#define SER_CON_TX_PIN              12    // UART TX pin number.
+#define SER_CON_CTS_PIN             14    // UART Clear To Send pin number. Not used if HWFC is set to false.
+#define SER_CON_RTS_PIN             15    // UART Request To Send pin number. Not used if HWFC is set to false.
+
+
+#define SER_CON_SPIS_SCK_PIN        29    // SPI SCK signal.
+#define SER_CON_SPIS_MOSI_PIN       25    // SPI MOSI signal.
+#define SER_CON_SPIS_MISO_PIN       28    // SPI MISO signal.
+#define SER_CON_SPIS_CSN_PIN        12    // SPI CSN signal.
+#define SER_CON_SPIS_RDY_PIN        14    // SPI READY GPIO pin number.
+#define SER_CON_SPIS_REQ_PIN        13    // SPI REQUEST GPIO pin number.
+#endif
+
+#endif // BLE400_H
diff --git a/bsp/boards.h b/bsp/boards.h
new file mode 100644
index 0000000..51d9ad1
--- /dev/null
+++ b/bsp/boards.h
@@ -0,0 +1,60 @@
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+#ifndef BOARDS_H
+#define BOARDS_H
+
+#include <sdk/drivers_nrf/hal/nrf_gpio.h>
+
+#if defined(BOARD_NRF6310)
+  #include "nrf6310.h"
+#elif defined(BOARD_PCA10000)
+  #include "pca10000.h"
+#elif defined(BOARD_PCA10001)
+  #include "pca10001.h"
+#elif defined(BOARD_PCA10002)
+  #include "pca10000.h"
+#elif defined(BOARD_PCA10003)
+  #include "pca10003.h"
+#elif defined(BOARD_PCA20006)
+  #include "pca20006.h"
+#elif defined(BOARD_PCA10028)
+  #include "pca10028.h"
+#elif defined(BOARD_PCA10031)
+  #include "pca10031.h"
+#elif defined(BOARD_WT51822)
+  #include "wt51822.h"
+#elif defined(BOARD_BLE400)
+  #include "ble400.h"
+#elif defined(BOARD_CUSTOM)
+  #include "custom_board.h"
+#else
+#error "Board is not defined"
+#endif
+
+#define LEDS_OFF(leds_mask) do {  NRF_GPIO->OUTSET = (leds_mask) & (LEDS_MASK & LEDS_INV_MASK); \
+                            NRF_GPIO->OUTCLR = (leds_mask) & (LEDS_MASK & ~LEDS_INV_MASK); } while (0)
+
+#define LEDS_ON(leds_mask) do {  NRF_GPIO->OUTCLR = (leds_mask) & (LEDS_MASK & LEDS_INV_MASK); \
+                           NRF_GPIO->OUTSET = (leds_mask) & (LEDS_MASK & ~LEDS_INV_MASK); } while (0)
+
+#define LED_IS_ON(leds_mask) ((leds_mask) & (NRF_GPIO->OUT ^ LEDS_INV_MASK) )
+
+#define LEDS_INVERT(leds_mask) do { uint32_t gpio_state = NRF_GPIO->OUT;      \
+                              NRF_GPIO->OUTSET = ((leds_mask) & ~gpio_state); \
+                              NRF_GPIO->OUTCLR = ((leds_mask) & gpio_state); } while (0)
+
+#define LEDS_CONFIGURE(leds_mask) do { uint32_t pin;                  \
+                                  for (pin = 0; pin < 32; pin++) \
+                                      if ( (leds_mask) & (1 << pin) )   \
+                                          nrf_gpio_cfg_output(pin); } while (0)
+
+#endif
diff --git a/bsp/bsp.h b/bsp/bsp.h
new file mode 100644
index 0000000..d2e61e8
--- /dev/null
+++ b/bsp/bsp.h
@@ -0,0 +1,330 @@
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+
+/**@file
+ *
+ * @defgroup bsp Board Support Package
+ * @{
+ * @ingroup app_common
+ *
+ * @brief BSP module.
+ * @details This module provides a layer of abstraction from the board.
+ *          It allows the user to indicate certain states on LEDs in a simple way.
+ *          Module functionality can be modified by additional defines:
+ *          - BSP_SIMPLE reduces functionality of this module to enable 
+ *            and read state of the buttons
+ *          - BSP_UART_SUPPORT enables support for UART
+ */
+
+#ifndef BSP_H__
+#define BSP_H__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "boards.h"
+
+#if !defined(BSP_DEFINES_ONLY) && !defined(BSP_SIMPLE)
+#include <sdk/libraries/button/app_button.h>
+
+#define BSP_BUTTON_ACTION_PUSH      (APP_BUTTON_PUSH)    /**< Represents pushing a button. See @ref bsp_button_action_t. */
+#define BSP_BUTTON_ACTION_RELEASE   (APP_BUTTON_RELEASE) /**< Represents releasing a button. See @ref bsp_button_action_t. */
+#define BSP_BUTTON_ACTION_LONG_PUSH (2)                  /**< Represents pushing and holding a button for @ref BSP_LONG_PUSH_TIMEOUT_MS milliseconds. See also @ref bsp_button_action_t. */
+#endif
+
+/* BSP_UART_SUPPORT
+ * This define enables UART support module.
+ */
+#ifdef BSP_UART_SUPPORT
+#include <sdk/drivers_nrf/uart/app_uart.h>
+#endif // BSP_UART_SUPPORT
+
+#define BUTTON_ERASE_BONDING BSP_BUTTON_0_MASK
+#define BUTTON_ERASE_ALL     BSP_BUTTON_1_MASK
+#define BUTTON_ADVERTISE     BSP_BUTTON_0_MASK
+#define BUTTON_CLEAR_EVT     BSP_BUTTON_1_MASK
+#define BUTTON_CAPSLOCK      BSP_BUTTON_2_MASK
+#define BSP_BUTTONS_ALL      0xFFFFFFFF
+#define BSP_BUTTONS_NONE     0
+
+#if (LEDS_NUMBER > 0) && !defined(BSP_SIMPLE)
+    #define BSP_LED_APP_TIMERS_NUMBER 2
+#else
+    #define BSP_APP_APP_TIMERS_NUMBER 0
+#endif // LEDS_NUMBER > 0
+
+#if (BUTTONS_NUMBER > 0) && !defined(BSP_SIMPLE)
+    #define BSP_BUTTONS_APP_TIMERS_NUMBER 1
+#else
+    #define BSP_BUTTONS_APP_TIMERS_NUMBER 0
+#endif // LEDS_NUMBER > 0
+
+/**@def BSP_APP_TIMERS_NUMBER
+ * Number of @ref app_timer instances required by the BSP module.
+ */
+#define BSP_APP_TIMERS_NUMBER (BSP_LED_APP_TIMERS_NUMBER + BSP_BUTTONS_APP_TIMERS_NUMBER)
+
+/**@brief Types of BSP initialization.
+ */
+#define BSP_INIT_NONE    0        /**< This define specifies the type of initialization without support for LEDs and buttons (@ref bsp_init).*/
+#define BSP_INIT_LED     (1 << 0) /**< This bit enables LEDs during initialization (@ref bsp_init).*/
+#define BSP_INIT_BUTTONS (1 << 1) /**< This bit enables buttons during initialization (@ref bsp_init).*/
+#define BSP_INIT_UART    (1 << 2) /**< This bit enables UART during initialization (@ref bsp_init).*/
+
+#define BSP_LONG_PUSH_TIMEOUT_MS (1000) /**< The time to hold for a long push (in milliseconds). */
+
+typedef uint8_t bsp_button_action_t; /**< The different actions that can be performed on a button. */
+
+#define BSP_INDICATIONS_LIST {                    \
+        "BSP_INDICATE_IDLE\n\r",                  \
+        "BSP_INDICATE_SCANNING\n\r",              \
+        "BSP_INDICATE_ADVERTISING\n\r",           \
+        "BSP_INDICATE_ADVERTISING_WHITELIST\n\r", \
+        "BSP_INDICATE_ADVERTISING_SLOW\n\r",      \
+        "BSP_INDICATE_ADVERTISING_DIRECTED\n\r",  \
+        "BSP_INDICATE_BONDING\n\r",               \
+        "BSP_INDICATE_CONNECTED\n\r",             \
+        "BSP_INDICATE_SENT_OK\n\r",               \
+        "BSP_INDICATE_SEND_ERROR\n\r",            \
+        "BSP_INDICATE_RCV_OK\n\r",                \
+        "BSP_INDICATE_RCV_ERROR\n\r",             \
+        "BSP_INDICATE_FATAL_ERROR\n\r",           \
+        "BSP_INDICATE_ALERT_0\n\r",               \
+        "BSP_INDICATE_ALERT_1\n\r",               \
+        "BSP_INDICATE_ALERT_2\n\r",               \
+        "BSP_INDICATE_ALERT_3\n\r",               \
+        "BSP_INDICATE_ALERT_OFF\n\r",             \
+        "BSP_INDICATE_USER_STATE_OFF\n\r",        \
+        "BSP_INDICATE_USER_STATE_0\n\r",          \
+        "BSP_INDICATE_USER_STATE_1\n\r",          \
+        "BSP_INDICATE_USER_STATE_2\n\r",          \
+        "BSP_INDICATE_USER_STATE_3\n\r",          \
+        "BSP_INDICATE_USER_STATE_ON\n\r"          \
+} /**< See @ref examples_bsp_states for a list of how these states are indicated for the PCA10028 board and the PCA10031 dongle.*/
+
+
+/**@brief BSP indication states.
+ *
+ * @details See @ref examples_bsp_states for a list of how these states are indicated for the PCA10028 board and the PCA10031 dongle.
+ */
+typedef enum
+{
+    BSP_INDICATE_FIRST = 0,
+    BSP_INDICATE_IDLE  = BSP_INDICATE_FIRST, /**< See \ref BSP_INDICATE_IDLE.*/
+    BSP_INDICATE_SCANNING,                   /**< See \ref BSP_INDICATE_SCANNING.*/
+    BSP_INDICATE_ADVERTISING,                /**< See \ref BSP_INDICATE_ADVERTISING.*/
+    BSP_INDICATE_ADVERTISING_WHITELIST,      /**< See \ref BSP_INDICATE_ADVERTISING_WHITELIST.*/
+    BSP_INDICATE_ADVERTISING_SLOW,           /**< See \ref BSP_INDICATE_ADVERTISING_SLOW.*/
+    BSP_INDICATE_ADVERTISING_DIRECTED,       /**< See \ref BSP_INDICATE_ADVERTISING_DIRECTED.*/
+    BSP_INDICATE_BONDING,                    /**< See \ref BSP_INDICATE_BONDING.*/
+    BSP_INDICATE_CONNECTED,                  /**< See \ref BSP_INDICATE_CONNECTED.*/
+    BSP_INDICATE_SENT_OK,                    /**< See \ref BSP_INDICATE_SENT_OK.*/
+    BSP_INDICATE_SEND_ERROR,                 /**< See \ref BSP_INDICATE_SEND_ERROR.*/
+    BSP_INDICATE_RCV_OK,                     /**< See \ref BSP_INDICATE_RCV_OK.*/
+    BSP_INDICATE_RCV_ERROR,                  /**< See \ref BSP_INDICATE_RCV_ERROR.*/
+    BSP_INDICATE_FATAL_ERROR,                /**< See \ref BSP_INDICATE_FATAL_ERROR.*/
+    BSP_INDICATE_ALERT_0,                    /**< See \ref BSP_INDICATE_ALERT_0.*/
+    BSP_INDICATE_ALERT_1,                    /**< See \ref BSP_INDICATE_ALERT_1.*/
+    BSP_INDICATE_ALERT_2,                    /**< See \ref BSP_INDICATE_ALERT_2.*/
+    BSP_INDICATE_ALERT_3,                    /**< See \ref BSP_INDICATE_ALERT_3.*/
+    BSP_INDICATE_ALERT_OFF,                  /**< See \ref BSP_INDICATE_ALERT_OFF.*/
+    BSP_INDICATE_USER_STATE_OFF,             /**< See \ref BSP_INDICATE_USER_STATE_OFF.*/
+    BSP_INDICATE_USER_STATE_0,               /**< See \ref BSP_INDICATE_USER_STATE_0.*/
+    BSP_INDICATE_USER_STATE_1,               /**< See \ref BSP_INDICATE_USER_STATE_1.*/
+    BSP_INDICATE_USER_STATE_2,               /**< See \ref BSP_INDICATE_USER_STATE_2.*/
+    BSP_INDICATE_USER_STATE_3,               /**< See \ref BSP_INDICATE_USER_STATE_3.*/
+    BSP_INDICATE_USER_STATE_ON,              /**< See \ref BSP_INDICATE_USER_STATE_ON.*/
+    BSP_INDICATE_LAST = BSP_INDICATE_USER_STATE_ON
+} bsp_indication_t;
+
+/**@brief BSP events.
+ *
+ * @note Events from BSP_EVENT_KEY_0 to BSP_EVENT_KEY_LAST are by default assigned to buttons.
+ */
+typedef enum
+{
+    BSP_EVENT_NOTHING = 0,                  /**< Assign this event to an action to prevent the action from generating an event (disable the action). */
+    BSP_EVENT_DEFAULT,                      /**< Assign this event to an action to assign the default event to the action. */
+    BSP_EVENT_CLEAR_BONDING_DATA,           /**< Persistent bonding data should be erased. */
+    BSP_EVENT_CLEAR_ALERT,                  /**< An alert should be cleared. */
+    BSP_EVENT_DISCONNECT,                   /**< A link should be disconnected. */
+    BSP_EVENT_ADVERTISING_START,            /**< The device should start advertising. */
+    BSP_EVENT_ADVERTISING_STOP,             /**< The device should stop advertising. */
+    BSP_EVENT_WHITELIST_OFF,                /**< The device should remove its advertising whitelist. */
+    BSP_EVENT_BOND,                         /**< The device should bond to the currently connected peer. */
+    BSP_EVENT_RESET,                        /**< The device should reset. */
+    BSP_EVENT_SLEEP,                        /**< The device should enter sleep mode. */
+    BSP_EVENT_WAKEUP,                       /**< The device should wake up from sleep mode. */
+    BSP_EVENT_DFU,                          /**< The device should enter DFU mode. */
+    BSP_EVENT_KEY_0,                        /**< Default event of the push action of BSP_BUTTON_0 (only if this button is present). */
+    BSP_EVENT_KEY_1,                        /**< Default event of the push action of BSP_BUTTON_1 (only if this button is present). */
+    BSP_EVENT_KEY_2,                        /**< Default event of the push action of BSP_BUTTON_2 (only if this button is present). */
+    BSP_EVENT_KEY_3,                        /**< Default event of the push action of BSP_BUTTON_3 (only if this button is present). */
+    BSP_EVENT_KEY_4,                        /**< Default event of the push action of BSP_BUTTON_4 (only if this button is present). */
+    BSP_EVENT_KEY_5,                        /**< Default event of the push action of BSP_BUTTON_5 (only if this button is present). */
+    BSP_EVENT_KEY_6,                        /**< Default event of the push action of BSP_BUTTON_6 (only if this button is present). */
+    BSP_EVENT_KEY_7,                        /**< Default event of the push action of BSP_BUTTON_7 (only if this button is present). */
+    BSP_EVENT_KEY_LAST = BSP_EVENT_KEY_7,
+} bsp_event_t;
+
+
+typedef struct
+{
+    bsp_event_t push_event;      /**< The event to fire on regular button press. */
+    bsp_event_t long_push_event; /**< The event to fire on long button press. */
+    bsp_event_t release_event;   /**< The event to fire on button release. */
+} bsp_button_event_cfg_t;
+
+/**@brief BSP module event callback function type.
+ *
+ * @details     Upon an event in the BSP module, this callback function will be called to notify
+ *              the application about the event.
+ *
+ * @param[in]   bsp_event_t BSP event type.
+ */
+typedef void (* bsp_event_callback_t)(bsp_event_t);
+
+/**@brief       Function for initializing BSP.
+ *
+ * @details     The function initializes the board support package to allow state indication and
+ *              button reaction. Default events are assigned to buttons.
+ * @note        Before calling this function, you must initiate the following required modules:
+ *              - @ref app_timer for LED support
+ *              - @ref app_gpiote for button support
+ *              - @ref app_uart for UART support
+ *
+ * @param[in]   type               Type of peripherals used.
+ * @param[in]   ticks_per_100ms    Number of RTC ticks for 100 ms.
+ * @param[in]   callback           Function to be called when button press/event is detected.
+ *
+ * @retval      NRF_SUCCESS               If the BSP module was successfully initialized.
+ * @retval      NRF_ERROR_INVALID_STATE   If the application timer module has not been initialized.
+ * @retval      NRF_ERROR_NO_MEM          If the maximum number of timers has already been reached.
+ * @retval      NRF_ERROR_INVALID_PARAM   If GPIOTE has too many users.
+ * @retval      NRF_ERROR_INVALID_STATE   If button or GPIOTE has not been initialized.
+ */
+uint32_t bsp_init(uint32_t type, uint32_t ticks_per_100ms, bsp_event_callback_t callback);
+
+/**@brief       Function for getting buttons states.
+ *
+ * @details     This function allows to get the state of all buttons.
+ *
+ * @param[in]   p_buttons_state          This variable will store buttons state. Button 0 state is
+ *                                       represented by bit 0 (1=pressed), Button 1 state by bit 1,
+ *                                       and so on.
+ *
+ * @retval      NRF_SUCCESS              If buttons state was successfully read.
+ */
+uint32_t bsp_buttons_state_get(uint32_t * p_buttons_state);
+
+/**@brief       Function for checking buttons states.
+ *
+ * @details     This function checks if the button is pressed. If the button ID iss out of range,
+ *              the function returns false.
+ *
+ * @param[in]   button                   Button ID to check.
+ * @param[in]   p_state                  This variable will store the information whether the
+ *                                       specified button is pressed (true) or not.
+ *
+ * @retval      NRF_SUCCESS              If the button state was successfully read.
+ */
+uint32_t bsp_button_is_pressed(uint32_t button, bool * p_state);
+
+/**@brief       Function for assigning a specific event to a button.
+ *
+ * @details     This function allows redefinition of standard events assigned to buttons.
+ *              To unassign events, provide the event @ ref BSP_EVENT_NOTHING.
+ *
+ * @param[in]   button                   Button ID to be redefined.
+ * @param[in]   action                   Button action to assign event to.
+ * @param[in]   event                    Event to be assigned to button.
+ *
+ * @retval      NRF_SUCCESS              If the event was successfully assigned to button.
+ * @retval      NRF_ERROR_INVALID_PARAM  If the button ID or button action was invalid.
+ */
+uint32_t bsp_event_to_button_action_assign(uint32_t button, bsp_button_action_t action, bsp_event_t event);
+
+/**@brief       Function for configuring indicators to required state.
+ *
+ * @details     This function indicates the required state by means of LEDs (if enabled).
+ *
+ * @note        Alerts are indicated independently.
+ *
+ * @param[in]   indicate   State to be indicated.
+ *
+ * @retval      NRF_SUCCESS               If the state was successfully indicated.
+ * @retval      NRF_ERROR_NO_MEM          If the internal timer operations queue was full.
+ * @retval      NRF_ERROR_INVALID_STATE   If the application timer module has not been initialized,
+ *                                        or internal timer has not been created.
+ */
+uint32_t bsp_indication_set(bsp_indication_t indicate);
+
+/**@brief       Function for configuring indicators to required state.
+ *
+ * @details     This function indicates the required state by means of LEDs (if enabled)
+ *              and UART (if enabled).
+ *
+ * @note        Alerts are indicated independently.
+ *
+ * @param[in]   indicate   State to be indicated.
+ * @param[in]   p_text     Text to be output on UART.
+ *
+ * @retval      NRF_SUCCESS               If the state was successfully indicated.
+ * @retval      NRF_ERROR_NO_MEM          If the internal timer operations queue was full.
+ * @retval      NRF_ERROR_INVALID_STATE   If the application timer module has not been initialized,
+ *                                        or timer has not been created.
+ */
+uint32_t bsp_indication_text_set(bsp_indication_t indicate, const char * p_text);
+
+
+/**@brief       Function for enabling all buttons.
+ *
+ * @details     After calling this function, all buttons will generate events when pressed, and
+ *              all buttons will be able to wake the system up from sleep mode.
+ *
+ * @retval      NRF_SUCCESS              If the buttons were successfully enabled.
+ * @retval      NRF_ERROR_NOT_SUPPORTED  If the board has no buttons or BSP_SIMPLE is defined.
+ * @return      A propagated error.
+ */
+uint32_t bsp_buttons_enable(void);
+
+
+/**@brief       Function for disabling all buttons.
+ *
+ * @details     After calling this function, no buttons will generate events when pressed, and
+ *              no buttons will be able to wake the system up from sleep mode.
+ *
+ * @retval      NRF_SUCCESS              If the buttons were successfully disabled.
+ * @retval      NRF_ERROR_NOT_SUPPORTED  If the board has no buttons or BSP_SIMPLE is defined.
+ * @return      A propagated error.
+ */
+uint32_t bsp_buttons_disable(void);
+
+
+/**@brief       Function for configuring wakeup buttons before going into sleep mode.
+ *
+ * @details     After calling this function, only the buttons that are set to 1 in wakeup_buttons
+ *              can be used to wake up the chip. If this function is not called before going to,
+ *              sleep either all or no buttons can wake up the chip.
+ *
+ * This function should only be called immediately before going into sleep.
+ *
+ * @param[in]   wakeup_buttons  Mask describing which buttons should be able to wake up the chip.
+ *
+ * @retval      NRF_SUCCESS              If the buttons were successfully enabled.
+ * @retval      NRF_ERROR_NOT_SUPPORTED  If the board has no buttons or BSP_SIMPLE is defined.
+ */
+uint32_t bsp_wakeup_buttons_set(uint32_t wakeup_buttons);
+
+
+#endif // BSP_H__
+
+/** @} */
diff --git a/bsp/bsp_btn_ble.h b/bsp/bsp_btn_ble.h
new file mode 100644
index 0000000..833e120
--- /dev/null
+++ b/bsp/bsp_btn_ble.h
@@ -0,0 +1,72 @@
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+
+/**@file
+ *
+ * @defgroup bsp_btn_ble Board Support Package: BLE Button Module
+ * @{
+ * @ingroup app_common
+ *
+ * @brief Module for controlling BLE behavior through button actions.
+ *
+ * @details The application must propagate BLE events to the BLE Button Module.
+ * Based on these events, the BLE Button Module configures the Board Support Package
+ * to generate BSP events for certain button actions. These BSP events should then be
+ * handled by the application's BSP event handler.
+ *
+ */
+
+#ifndef BSP_BTN_BLE_H__
+#define BSP_BTN_BLE_H__
+
+#include <stdint.h>
+#include <sdk/softdevice/s130/headers/ble.h>
+#include "bsp.h"
+
+/**@brief BLE Button Module error handler type. */
+typedef void (*bsp_btn_ble_error_handler_t) (uint32_t nrf_error);
+
+/**@brief Function for initializing the BLE Button Module.
+ *
+ * Before calling this function, the BSP module must be initialized with buttons.
+ *
+ * @param[out] error_handler      Error handler to call in case of internal errors in BLE Button
+ *                                Module.
+ * @param[out] p_startup_bsp_evt  If not a NULL pointer, the value is filled with an event
+ *                                (or BSP_EVENT_NOTHING) derived from the buttons pressed on
+ *                                startup. For example, if the bond delete wakeup button was pressed
+ *                                to wake up the device, *p_startup_bsp_evt is set to
+ *                                @ref BSP_EVENT_CLEAR_BONDING_DATA.
+ *
+ * @retval NRF_SUCCESS  If initialization was successful. Otherwise, a propagated error code is
+ *                      returned.
+ */
+uint32_t bsp_btn_ble_init(bsp_btn_ble_error_handler_t error_handler, bsp_event_t * p_startup_bsp_evt);
+
+/**@brief Function for setting up wakeup buttons before going into sleep mode.
+ *
+ * @retval NRF_SUCCESS  If the buttons were prepared successfully. Otherwise, a propagated error
+ *                      code is returned.
+ */
+uint32_t bsp_btn_ble_sleep_mode_prepare(void);
+
+/**@brief Function for handling the application's BLE stack events.
+ *
+ * @details This function handles all events from the BLE stack that are of interest to this module.
+ *
+ * @param[in] p_ble_evt BLE stack event.
+ */
+void bsp_btn_ble_on_ble_evt(ble_evt_t * p_ble_evt);
+
+#endif /* BSP_BTN_BLE_H__ */
+
+/** @} */
diff --git a/bsp/pca10028.h b/bsp/pca10028.h
new file mode 100644
index 0000000..bb2fa52
--- /dev/null
+++ b/bsp/pca10028.h
@@ -0,0 +1,113 @@
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+#ifndef PCA10028_H
+#define PCA10028_H
+
+// LEDs definitions for PCA10028
+#define LEDS_NUMBER    4
+
+#define LED_START      21
+#define LED_1          21
+#define LED_2          22
+#define LED_3          23
+#define LED_4          24
+#define LED_STOP       24
+
+#define LEDS_LIST { LED_1, LED_2, LED_3, LED_4 }
+
+#define BSP_LED_0      LED_1
+#define BSP_LED_1      LED_2
+#define BSP_LED_2      LED_3
+#define BSP_LED_3      LED_4
+
+#define BSP_LED_0_MASK (1<<BSP_LED_0)
+#define BSP_LED_1_MASK (1<<BSP_LED_1)
+#define BSP_LED_2_MASK (1<<BSP_LED_2)
+#define BSP_LED_3_MASK (1<<BSP_LED_3)
+
+#define LEDS_MASK      (BSP_LED_0_MASK | BSP_LED_1_MASK | BSP_LED_2_MASK | BSP_LED_3_MASK)
+/* all LEDs are lit when GPIO is low */
+#define LEDS_INV_MASK  LEDS_MASK
+
+#define BUTTONS_NUMBER 4
+
+#define BUTTON_START   17
+#define BUTTON_1       17
+#define BUTTON_2       18
+#define BUTTON_3       19
+#define BUTTON_4       20
+#define BUTTON_STOP    20
+#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
+
+#define BUTTONS_LIST { BUTTON_1, BUTTON_2, BUTTON_3, BUTTON_4 }
+
+#define BSP_BUTTON_0   BUTTON_1
+#define BSP_BUTTON_1   BUTTON_2
+#define BSP_BUTTON_2   BUTTON_3
+#define BSP_BUTTON_3   BUTTON_4
+
+#define BSP_BUTTON_0_MASK (1<<BSP_BUTTON_0)
+#define BSP_BUTTON_1_MASK (1<<BSP_BUTTON_1)
+#define BSP_BUTTON_2_MASK (1<<BSP_BUTTON_2)
+#define BSP_BUTTON_3_MASK (1<<BSP_BUTTON_3)
+
+#define BUTTONS_MASK   0x001E0000
+
+#define RX_PIN_NUMBER  11
+#define TX_PIN_NUMBER  9
+#define CTS_PIN_NUMBER 10
+#define RTS_PIN_NUMBER 8
+#define HWFC           true
+
+#define SPIS_MISO_PIN  28    // SPI MISO signal. 
+#define SPIS_CSN_PIN   12    // SPI CSN signal. 
+#define SPIS_MOSI_PIN  25    // SPI MOSI signal. 
+#define SPIS_SCK_PIN   29    // SPI SCK signal. 
+
+#define SPIM0_SCK_PIN       4     /**< SPI clock GPIO pin number. */
+#define SPIM0_MOSI_PIN      1     /**< SPI Master Out Slave In GPIO pin number. */
+#define SPIM0_MISO_PIN      3     /**< SPI Master In Slave Out GPIO pin number. */
+#define SPIM0_SS_PIN        2     /**< SPI Slave Select GPIO pin number. */
+
+#define SPIM1_SCK_PIN       15     /**< SPI clock GPIO pin number. */
+#define SPIM1_MOSI_PIN      12     /**< SPI Master Out Slave In GPIO pin number. */
+#define SPIM1_MISO_PIN      14     /**< SPI Master In Slave Out GPIO pin number. */
+#define SPIM1_SS_PIN        13     /**< SPI Slave Select GPIO pin number. */
+
+// serialization APPLICATION board
+#define SER_APP_RX_PIN              12    // UART RX pin number.
+#define SER_APP_TX_PIN              13    // UART TX pin number.
+#define SER_APP_CTS_PIN             15    // UART Clear To Send pin number.
+#define SER_APP_RTS_PIN             14    // UART Request To Send pin number.
+
+#define SER_APP_SPIM0_SCK_PIN       29     // SPI clock GPIO pin number.
+#define SER_APP_SPIM0_MOSI_PIN      25     // SPI Master Out Slave In GPIO pin number
+#define SER_APP_SPIM0_MISO_PIN      28     // SPI Master In Slave Out GPIO pin number
+#define SER_APP_SPIM0_SS_PIN        12     // SPI Slave Select GPIO pin number
+#define SER_APP_SPIM0_RDY_PIN       14     // SPI READY GPIO pin number
+#define SER_APP_SPIM0_REQ_PIN       13     // SPI REQUEST GPIO pin number
+
+// serialization CONNECTIVITY board
+#define SER_CON_RX_PIN              13    // UART RX pin number.
+#define SER_CON_TX_PIN              12    // UART TX pin number.
+#define SER_CON_CTS_PIN             14    // UART Clear To Send pin number. Not used if HWFC is set to false.
+#define SER_CON_RTS_PIN             15    // UART Request To Send pin number. Not used if HWFC is set to false.
+
+
+#define SER_CON_SPIS_SCK_PIN        29    // SPI SCK signal.
+#define SER_CON_SPIS_MOSI_PIN       25    // SPI MOSI signal.
+#define SER_CON_SPIS_MISO_PIN       28    // SPI MISO signal.
+#define SER_CON_SPIS_CSN_PIN        12    // SPI CSN signal.
+#define SER_CON_SPIS_RDY_PIN        14    // SPI READY GPIO pin number.
+#define SER_CON_SPIS_REQ_PIN        13    // SPI REQUEST GPIO pin number.
+
+#endif // PCA10028_H
diff --git a/dfu_ble_svc.c b/dfu_ble_svc.c
new file mode 100644
index 0000000..84c09b1
--- /dev/null
+++ b/dfu_ble_svc.c
@@ -0,0 +1,205 @@
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+
+#include <sdk/libraries/bootloader_dfu/dfu_ble_svc.h>
+#include <string.h>
+#include <sdk/softdevice/s130/headers/nrf_error.h>
+#include <sdk/libraries/crc16/crc16.h>
+
+#if defined ( __CC_ARM )
+static dfu_ble_peer_data_t m_peer_data __attribute__((section("NoInit"), zero_init));            /**< This variable should be placed in a non initialized RAM section in order to be valid upon soft reset from application into bootloader. */
+static uint16_t            m_peer_data_crc __attribute__((section("NoInit"), zero_init));        /**< CRC variable to ensure the integrity of the peer data provided. */
+#elif defined ( __GNUC__ )
+__attribute__((section(".noinit"))) static dfu_ble_peer_data_t m_peer_data;                      /**< This variable should be placed in a non initialized RAM section in order to be valid upon soft reset from application into bootloader. */
+__attribute__((section(".noinit"))) static uint16_t            m_peer_data_crc;                  /**< CRC variable to ensure the integrity of the peer data provided. */
+#elif defined ( __ICCARM__ )
+__no_init static dfu_ble_peer_data_t m_peer_data     @ 0x20003F80;                               /**< This variable should be placed in a non initialized RAM section in order to be valid upon soft reset from application into bootloader. */
+__no_init static uint16_t            m_peer_data_crc @ 0x20003F80 + sizeof(dfu_ble_peer_data_t); /**< CRC variable to ensure the integrity of the peer data provided. */
+#endif
+
+
+/**@brief Function for setting the peer data from application in bootloader before reset.
+ *
+ * @param[in] p_peer_data  Pointer to the peer data containing keys for the connection.
+ *
+ * @retval NRF_SUCCES      The data was set succesfully.
+ * @retval NRF_ERROR_NULL  If a null pointer was passed as argument.
+ */
+static uint32_t dfu_ble_peer_data_set(dfu_ble_peer_data_t * p_peer_data)
+{
+    if (p_peer_data == NULL)
+    {
+        return NRF_ERROR_NULL;
+    }
+
+    uint32_t src = (uint32_t)p_peer_data;
+    uint32_t dst = (uint32_t)&m_peer_data;
+    // Calculating length in order to check if destination is residing inside source.
+    // Source inside the the destination (calculation underflow) is safe a source is read before 
+    // written to destination so that when destination grows into source, the source data is no 
+    // longer needed.
+    uint32_t len = dst - src;
+
+    if (src == dst)
+    {
+        // Do nothing as source and destination are identical, just calculate crc below.
+    }
+    else if (len < sizeof(dfu_ble_peer_data_t))
+    {
+        uint32_t i = 0;
+
+        dst += sizeof(dfu_ble_peer_data_t);
+        src += sizeof(dfu_ble_peer_data_t);
+
+        // Copy byte wise backwards when facing overlapping structures.
+        while (i++ <= sizeof(dfu_ble_peer_data_t))
+        {
+            *((uint8_t *)dst--) = *((uint8_t *)src--);
+        }
+    }
+    else
+    {
+        memcpy((void *)dst, (void *)src, sizeof(dfu_ble_peer_data_t));
+    }
+
+    m_peer_data_crc = crc16_compute((uint8_t *)&m_peer_data, sizeof(m_peer_data), NULL);
+
+    return NRF_SUCCESS;
+}
+
+
+/**@brief   Function for handling second stage of SuperVisor Calls (SVC).
+ *
+ * @details The function will use svc_num to call the corresponding SVC function.
+ *
+ * @param[in] svc_num    SVC number for function to be executed
+ * @param[in] p_svc_args Argument list for the SVC.
+ *
+ * @return This function returns the error value of the SVC return. For further details, please
+ *         refer to the details of the SVC implementation itself.
+ *         @ref NRF_ERROR_SVC_HANDLER_MISSING is returned if no SVC handler is implemented for the
+ *         provided svc_num.
+ */
+void C_SVC_Handler(uint8_t svc_num, uint32_t * p_svc_args)
+{
+    switch (svc_num)
+    {
+        case DFU_BLE_SVC_PEER_DATA_SET:
+            p_svc_args[0] = dfu_ble_peer_data_set((dfu_ble_peer_data_t *)p_svc_args[0]);
+            break;
+
+        default:
+            p_svc_args[0] = NRF_ERROR_SVC_HANDLER_MISSING;
+            break;
+    }
+}
+
+
+/**@brief   Function for handling the first stage of SuperVisor Calls (SVC) in assembly.
+ *
+ * @details The function will use the link register (LR) to determine the stack (PSP or MSP) to be
+ *          used and then decode the SVC number afterwards. After decoding the SVC number then
+ *          @ref C_SVC_Handler is called for further processing of the SVC.
+ */
+#if defined ( __CC_ARM )
+__asm void SVC_Handler(void)
+{
+EXC_RETURN_CMD_PSP  EQU 0xFFFFFFFD  ; EXC_RETURN using PSP for ARM Cortex. If Link register contains this value it indicates the PSP was used before the SVC, otherwise the MSP was used.
+
+    IMPORT C_SVC_Handler
+    LDR   R0, =EXC_RETURN_CMD_PSP   ; Load the EXC_RETURN into R0 to be able to compare against LR to determine stack pointer used. 
+    CMP   R0, LR                    ; Compare the link register with R0. If equal then PSP was used, otherwise MSP was used before SVC.
+    BNE   UseMSP                    ; Branch to code fetching SVC arguments using MSP.
+    MRS   R1, PSP                   ; Move PSP into R1.
+    B     Call_C_SVC_Handler        ; Branch to Call_C_SVC_Handler below.
+UseMSP
+    MRS   R1, MSP                   ; MSP was used, therefore Move MSP into R1.
+Call_C_SVC_Handler
+    LDR   R0, [R1, #24]             ; The arguments for the SVC was stacked. R1 contains Stack Pointer, the values stacked before SVC are R0, R1, R2, R3, R12, LR, PC (Return address), xPSR. 
+                                    ; R1 contains current SP so the PC of the stacked frame is at SP + 6 words (24 bytes). We load the PC into R0.
+    SUBS  R0, #2                    ; The PC before the SVC is in R0. We subtract 2 to get the address prior to the instruction executed where the SVC number is located.
+    LDRB  R0, [R0]                  ; SVC instruction low octet: Load the byte at the address before the PC to fetch the SVC number.
+    LDR   R2, =C_SVC_Handler        ; Load address of C implementation of SVC handler.
+    BX    R2                        ; Branch to C implementation of SVC handler. R0 is now the SVC number, R1 is the StackPointer where the arguments (R0-R3) of the original SVC are located.
+    ALIGN
+}
+#elif defined ( __GNUC__ )
+void __attribute__ (( naked )) SVC_Handler(void)
+{
+    const uint32_t exc_return = 0xFFFFFFFD;      // EXC_RETURN using PSP for ARM Cortex. If Link register contains this value it indicates the PSP was used before the SVC, otherwise the MSP was used.
+    
+    __asm volatile(
+        "cmp   lr, %0\t\n"                       // Compare the link register with argument 0 (%0), which is exc_return. If equal then PSP was used, otherwise MSP was used before SVC.
+        "bne   UseMSP\t\n"                       // Branch to code fetching SVC arguments using MSP.
+        "mrs   r1, psp\t\n"                      // Move PSP into R1.
+        "b     Call_C_SVC_Handler\t\n"           // Branch to Call_C_SVC_Handler below.
+        "UseMSP:  \t\n"                          //
+        "mrs   r1, msp\t\n"                      // MSP was used, therefore Move MSP into R1.
+        "Call_C_SVC_Handler:  \t\n"              //
+        "ldr   r0, [r1, #24]\t\n"                // The arguments for the SVC was stacked. R1 contains Stack Pointer, the values stacked before SVC are R0, R1, R2, R3, R12, LR, PC (Return address), xPSR. 
+                                                 // R1 contains current SP so the PC of the stacked frame is at SP + 6 words (24 bytes). We load the PC into R0.
+        "sub   r0, r0, #2\t\n"                   // The PC before the SVC is in R0. We subtract 2 to get the address prior to the instruction executed where the SVC number is located.
+        "ldrb  r0, [r0]\t\n"                     // SVC instruction low octet: Load the byte at the address before the PC to fetch the SVC number.
+        "bx    %1\t\n"                           // Branch to C implementation of SVC handler, argument 1 (%1). R0 is now the SVC number, R1 is the StackPointer where the arguments (R0-R3) of the original SVC are located.
+        ".align\t\n"
+        :: "r" (exc_return), "r" (C_SVC_Handler) // Argument list for the gcc assembly. exc_return is %0, C_SVC_Handler is %1.
+        : "r0", "r1"                             // List of register maintained manually.
+    );
+}
+#elif defined ( __ICCARM__ )
+void SVC_Handler(void)
+{
+    asm("movs  r0, #0x02\n"                    // Load 0x02 into R6 to prepare for exec return test.
+        "mvns  r0, r0\n"                       // Invert R0 to obtain exec return code using PSP for ARM Cortex.
+        "cmp   lr, r0\n"                       // Compare the link register with argument 0 (%0), which is exc_return. If equal then PSP was used, otherwise MSP was used before SVC.
+        "bne   UseMSP\n"                       // Branch to code fetching SVC arguments using MSP.
+        "mrs   r1, psp\n"                      // Move PSP into R1.
+        "b     Call_C_SVC_Handler\t\n"         // Branch to Call_C_SVC_Handler below.
+        "UseMSP:  \n"                          //
+        "mrs   r1, msp\n"                      // MSP was used, therefore Move MSP into R1.
+        "Call_C_SVC_Handler:  \n"              //
+        "ldr   r0, [r1, #24]\n"                // The arguments for the SVC was stacked. R1 contains Stack Pointer, the values stacked before SVC are R0, R1, R2, R3, R12, LR, PC (Return address), xPSR. 
+                                               // R1 contains current SP so the PC of the stacked frame is at SP + 6 words (24 bytes). We load the PC into R0.
+        "subs  r0, #0x02\n"                    // The PC before the SVC is in R0. We subtract 2 to get the address prior to the instruction executed where the SVC number is located.
+        "ldrb  r0, [r0]\n"                     // SVC instruction low octet: Load the byte at the address before the PC to fetch the SVC number.
+        "bx    %0\n"                           // Branch to C implementation of SVC handler, argument 1 (%1). R0 is now the SVC number, R1 is the StackPointer where the arguments (R0-R3) of the original SVC are located.
+        :: "r" (C_SVC_Handler)                 // Argument list for the gcc assembly. C_SVC_Handler is %0.
+        : "r0", "r1"                           // List of register maintained manually.
+    );
+}
+#else
+#error Compiler not supported.
+#endif
+
+
+uint32_t dfu_ble_peer_data_get(dfu_ble_peer_data_t * p_peer_data)
+{
+    uint16_t crc;
+
+    if (p_peer_data == NULL)
+    {
+        return NRF_ERROR_NULL;
+    }
+
+    crc = crc16_compute((uint8_t *)&m_peer_data, sizeof(m_peer_data), NULL);
+    if (crc != m_peer_data_crc)
+    {
+        return NRF_ERROR_INVALID_DATA;
+    }
+
+    *p_peer_data = m_peer_data;
+
+    // corrupt CRC to invalidate shared information.
+    m_peer_data_crc++;
+
+    return NRF_SUCCESS;
+}
diff --git a/dfu_gcc_nrf51.ld b/dfu_gcc_nrf51.ld
new file mode 100644
index 0000000..cc067dd
--- /dev/null
+++ b/dfu_gcc_nrf51.ld
@@ -0,0 +1,53 @@
+/* Linker script to configure memory regions. */
+
+SEARCH_DIR(.)
+GROUP(-lgcc -lc -lnosys)
+
+MEMORY
+{
+  /** Flash start address for the bootloader. This setting will also be stored in UICR to allow the
+   *  MBR to init the bootloader when starting the system. This value must correspond to 
+   *  BOOTLOADER_REGION_START found in dfu_types.h. The system is prevented from starting up if 
+   *  those values do not match. The check is performed in main.c, see
+   *  APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START);
+   */
+  FLASH (rx) : ORIGIN = 0x3C000, LENGTH = 0x3C00
+
+  /** RAM Region for bootloader. This setting is suitable when used with s110, s120, s130, s310. */
+  RAM (rwx) :  ORIGIN = 0x20002C00, LENGTH = 0x5380
+
+  /** Location of non initialized RAM. Non initialized RAM is used for exchanging bond information
+   *  from application to bootloader when using buttonluss DFU OTA. 
+   */
+  NOINIT (rwx) :  ORIGIN = 0x20007F80, LENGTH = 0x80
+
+  /** Location of bootloader setting in at the last flash page. */
+  BOOTLOADER_SETTINGS (rw) : ORIGIN = 0x0003FC00, LENGTH = 0x0400
+
+  /** Location in UICR where bootloader start address is stored. */
+  UICR_BOOTLOADER (r) : ORIGIN = 0x10001014, LENGTH = 0x04
+}
+
+SECTIONS
+{
+  /* Ensures the bootloader settings are placed at the last flash page. */
+  .bootloaderSettings(NOLOAD) :
+  {
+	
+  } > BOOTLOADER_SETTINGS
+
+  /* Ensures the Bootloader start address in flash is written to UICR when flashing the image. */
+  .uicrBootStartAddress : 
+  {
+    KEEP(*(.uicrBootStartAddress))
+  } > UICR_BOOTLOADER
+
+  /* No init RAM section in bootloader. Used for bond information exchange. */
+  .noinit(NOLOAD) :
+  {
+
+  } > NOINIT
+  /* other placements follow here... */
+}
+
+INCLUDE "sdk/toolchain/gcc/gcc_nrf51_common.ld"
diff --git a/gdb.script b/gdb.script
new file mode 100644
index 0000000..7cf9d09
--- /dev/null
+++ b/gdb.script
@@ -0,0 +1,2 @@
+target remote localhost:3333
+cont
diff --git a/main.c b/main.c
new file mode 100644
index 0000000..c5ee04b
--- /dev/null
+++ b/main.c
@@ -0,0 +1,253 @@
+/* Copyright (c) 2013 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+
+/**@file
+ *
+ * @defgroup ble_sdk_app_bootloader_main main.c
+ * @{
+ * @ingroup dfu_bootloader_api
+ * @brief Bootloader project main file.
+ *
+ * -# Receive start data packet. 
+ * -# Based on start packet, prepare NVM area to store received data. 
+ * -# Receive data packet. 
+ * -# Validate data packet.
+ * -# Write Data packet to NVM.
+ * -# If not finished - Wait for next packet.
+ * -# Receive stop data packet.
+ * -# Activate Image, boot application.
+ *
+ */
+#include <sdk/libraries/bootloader_dfu/dfu_transport.h>
+#include <sdk/libraries/bootloader_dfu/bootloader.h>
+#include <sdk/libraries/bootloader_dfu/bootloader_util.h>
+#include <stdint.h>
+#include <string.h>
+#include <stddef.h>
+#include <sdk/libraries/util/nordic_common.h>
+#include <sdk/device/nrf.h>
+#include <sdk/softdevice/s130/headers/nrf_soc.h>
+#include <sdk/libraries/util/app_error.h>
+#include <sdk/drivers_nrf/hal/nrf_gpio.h>
+#include <sdk/device/nrf51_bitfields.h>
+#include <sdk/softdevice/s130/headers/ble.h>
+#include <sdk/device/nrf51.h>
+#include <sdk/softdevice/s130/headers/ble_hci.h>
+#include <sdk/libraries/scheduler/app_scheduler.h>
+#include <sdk/libraries/timer/app_timer_appsh.h>
+#include <sdk/softdevice/s130/headers/nrf_error.h>
+#include "bsp/bsp.h"
+#include <sdk/softdevice/common/softdevice_handler/softdevice_handler_appsh.h>
+#include <sdk/drivers_nrf/pstorage/config/pstorage_platform.h>
+#include <sdk/softdevice/s130/headers/nrf_mbr.h>
+
+#if BUTTONS_NUMBER < 1
+#error "Not enough buttons on board"
+#endif
+
+#if LEDS_NUMBER < 1
+#error "Not enough LEDs on board"
+#endif
+
+#define IS_SRVC_CHANGED_CHARACT_PRESENT 1                                                       /**< Include the service_changed characteristic. For DFU this should normally be the case. */
+
+#define BOOTLOADER_BUTTON               BSP_BUTTON_1                                            /**< Button used to enter SW update mode. */
+#define UPDATE_IN_PROGRESS_LED          BSP_LED_2                                               /**< Led used to indicate that DFU is active. */
+
+#define APP_TIMER_PRESCALER             0                                                       /**< Value of the RTC1 PRESCALER register. */
+#define APP_TIMER_MAX_TIMERS            3                                                       /**< Maximum number of simultaneously created timers. */
+#define APP_TIMER_OP_QUEUE_SIZE         4                                                       /**< Size of timer operation queues. */
+
+#define SCHED_MAX_EVENT_DATA_SIZE       MAX(APP_TIMER_SCHED_EVT_SIZE, 0)                        /**< Maximum size of scheduler events. */
+
+#define SCHED_QUEUE_SIZE                20                                                      /**< Maximum number of events in the scheduler queue. */
+
+
+/**@brief Callback function for asserts in the SoftDevice.
+ *
+ * @details This function will be called in case of an assert in the SoftDevice.
+ *
+ * @warning This handler is an example only and does not fit a final product. You need to analyze 
+ *          how your product is supposed to react in case of Assert.
+ * @warning On assert from the SoftDevice, the system can only recover on reset.
+ *
+ * @param[in] line_num    Line number of the failing ASSERT call.
+ * @param[in] file_name   File name of the failing ASSERT call.
+ */
+void assert_nrf_callback(uint16_t line_num, const uint8_t * p_file_name)
+{
+    app_error_handler(0xDEADBEEF, line_num, p_file_name);
+}
+
+
+/**@brief Function for initialization of LEDs.
+ */
+static void leds_init(void)
+{
+    nrf_gpio_cfg_output(UPDATE_IN_PROGRESS_LED);
+    nrf_gpio_pin_set(UPDATE_IN_PROGRESS_LED);
+}
+
+
+/**@brief Function for initializing the timer handler module (app_timer).
+ */
+static void timers_init(void)
+{
+    // Initialize timer module, making it use the scheduler.
+    APP_TIMER_APPSH_INIT(APP_TIMER_PRESCALER, APP_TIMER_MAX_TIMERS, APP_TIMER_OP_QUEUE_SIZE, true);
+}
+
+
+/**@brief Function for initializing the button module.
+ */
+static void buttons_init(void)
+{
+    nrf_gpio_cfg_sense_input(BOOTLOADER_BUTTON,
+                             BUTTON_PULL, 
+                             NRF_GPIO_PIN_SENSE_LOW);
+
+}
+
+
+/**@brief Function for dispatching a BLE stack event to all modules with a BLE stack event handler.
+ *
+ * @details This function is called from the scheduler in the main loop after a BLE stack
+ *          event has been received.
+ *
+ * @param[in]   p_ble_evt   Bluetooth stack event.
+ */
+static void sys_evt_dispatch(uint32_t event)
+{
+    pstorage_sys_event_handler(event);
+}
+
+
+/**@brief Function for initializing the BLE stack.
+ *
+ * @details Initializes the SoftDevice and the BLE event interrupt.
+ *
+ * @param[in] init_softdevice  true if SoftDevice should be initialized. The SoftDevice must only 
+ *                             be initialized if a chip reset has occured. Soft reset from 
+ *                             application must not reinitialize the SoftDevice.
+ */
+static void ble_stack_init(bool init_softdevice)
+{
+    uint32_t         err_code;
+    sd_mbr_command_t com = {SD_MBR_COMMAND_INIT_SD, };
+
+    if (init_softdevice)
+    {
+        err_code = sd_mbr_command(&com);
+        APP_ERROR_CHECK(err_code);
+    }
+    
+    err_code = sd_softdevice_vector_table_base_set(BOOTLOADER_REGION_START);
+    APP_ERROR_CHECK(err_code);
+   
+    SOFTDEVICE_HANDLER_APPSH_INIT(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM, true);
+
+    // Enable BLE stack 
+    ble_enable_params_t ble_enable_params;
+    memset(&ble_enable_params, 0, sizeof(ble_enable_params));
+    
+    // Below code line is needed for s130. For s110 is inrrelevant - but executable
+    // can run with both s130 and s110.
+    ble_enable_params.gatts_enable_params.attr_tab_size   = BLE_GATTS_ATTR_TAB_SIZE_DEFAULT;
+
+    ble_enable_params.gatts_enable_params.service_changed = IS_SRVC_CHANGED_CHARACT_PRESENT;
+    err_code = sd_ble_enable(&ble_enable_params);
+    APP_ERROR_CHECK(err_code);
+    
+    err_code = softdevice_sys_evt_handler_set(sys_evt_dispatch);
+    APP_ERROR_CHECK(err_code);
+}
+
+
+/**@brief Function for event scheduler initialization.
+ */
+static void scheduler_init(void)
+{
+    APP_SCHED_INIT(SCHED_MAX_EVENT_DATA_SIZE, SCHED_QUEUE_SIZE);
+}
+
+
+/**@brief Function for bootloader main entry.
+ */
+int main(void)
+{
+    uint32_t err_code;
+    bool     dfu_start = false;
+    bool     app_reset = (NRF_POWER->GPREGRET == BOOTLOADER_DFU_START);
+
+    if (app_reset)
+    {
+        NRF_POWER->GPREGRET = 0;
+    }
+    
+    leds_init();
+
+    // This check ensures that the defined fields in the bootloader corresponds with actual
+    // setting in the nRF51 chip.
+    APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START);
+    APP_ERROR_CHECK_BOOL(NRF_FICR->CODEPAGESIZE == CODE_PAGE_SIZE);
+
+    // Initialize.
+    timers_init();
+    buttons_init();
+
+    (void)bootloader_init();
+
+    if (bootloader_dfu_sd_in_progress())
+    {
+        nrf_gpio_pin_clear(UPDATE_IN_PROGRESS_LED);
+
+        err_code = bootloader_dfu_sd_update_continue();
+        APP_ERROR_CHECK(err_code);
+
+        ble_stack_init(!app_reset);
+        scheduler_init();
+
+        err_code = bootloader_dfu_sd_update_finalize();
+        APP_ERROR_CHECK(err_code);
+
+        nrf_gpio_pin_set(UPDATE_IN_PROGRESS_LED);
+    }
+    else
+    {
+        // If stack is present then continue initialization of bootloader.
+        ble_stack_init(!app_reset);
+        scheduler_init();
+    }
+
+    dfu_start  = app_reset;
+    dfu_start |= ((nrf_gpio_pin_read(BOOTLOADER_BUTTON) == 0) ? true: false);
+    
+    if (dfu_start || (!bootloader_app_is_valid(DFU_BANK_0_REGION_START)))
+    {
+        nrf_gpio_pin_clear(UPDATE_IN_PROGRESS_LED);
+
+        // Initiate an update of the firmware.
+        err_code = bootloader_dfu_start();
+        APP_ERROR_CHECK(err_code);
+
+        nrf_gpio_pin_set(UPDATE_IN_PROGRESS_LED);
+    }
+
+    if (bootloader_app_is_valid(DFU_BANK_0_REGION_START) && !bootloader_dfu_sd_in_progress())
+    {
+        // Select a bank region to use as application region.
+        // @note: Only applications running from DFU_BANK_0_REGION_START is supported.
+        bootloader_app_start(DFU_BANK_0_REGION_START);
+    }
+    
+    NVIC_SystemReset();
+}
diff --git a/openocd.cfg b/openocd.cfg
new file mode 100644
index 0000000..0ade377
--- /dev/null
+++ b/openocd.cfg
@@ -0,0 +1,12 @@
+# nF51822 Target
+source [find interface/stlink-v2.cfg]
+
+#source [find interface/jlink.cfg]
+#transport select swd
+
+
+set WORKAREASIZE 0x4000
+source [find target/nrf51.cfg]
+
+# use hardware reset, connect under reset
+#reset_config srst_only srst_nogate
diff --git a/sdk-9.0.0 b/sdk-9.0.0
new file mode 160000
index 0000000..d96e8db
--- /dev/null
+++ b/sdk-9.0.0
@@ -0,0 +1 @@
+Subproject commit d96e8db9d9a551fb861ca53c3a3ada99dd19c575
diff --git a/sdk-config/sdk/drivers_nrf/config/nrf_drv_config.h b/sdk-config/sdk/drivers_nrf/config/nrf_drv_config.h
new file mode 100644
index 0000000..5303a33
--- /dev/null
+++ b/sdk-config/sdk/drivers_nrf/config/nrf_drv_config.h
@@ -0,0 +1,137 @@
+/* Copyright (c) 2015 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+
+#ifndef NRF_DRV_CONFIG_H
+#define NRF_DRV_CONFIG_H
+
+/* CLOCK */
+#define CLOCK_CONFIG_XTAL_FREQ          NRF_CLOCK_XTALFREQ_16MHz
+#define CLOCK_CONFIG_LF_SRC             NRF_CLOCK_LF_SRC_Xtal
+#define CLOCK_CONFIG_LF_RC_CAL_INTERVAL RC_2000MS_CALIBRATION_INTERVAL
+#define CLOCK_CONFIG_IRQ_PRIORITY       APP_IRQ_PRIORITY_LOW
+
+/* GPIOTE */
+#define GPIOTE_ENABLED 1
+
+#if (GPIOTE_ENABLED == 1)
+#define GPIOTE_CONFIG_USE_SWI_EGU false
+#define GPIOTE_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_HIGH
+#define GPIOTE_CONFIG_NUM_OF_LOW_POWER_EVENTS 1
+#endif
+
+/* TIMER */
+#define TIMER0_ENABLED 0
+
+#if (TIMER0_ENABLED == 1)
+#define TIMER0_CONFIG_FREQUENCY    NRF_TIMER_FREQ_16MHz
+#define TIMER0_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER0_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_32Bit
+#define TIMER0_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER0_INSTANCE_INDEX      0
+#endif
+
+#define TIMER1_ENABLED 0
+
+#if (TIMER1_ENABLED == 1)
+#define TIMER1_CONFIG_FREQUENCY    NRF_TIMER_FREQ_16MHz
+#define TIMER1_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER1_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_16Bit
+#define TIMER1_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER1_INSTANCE_INDEX      (TIMER0_ENABLED)
+#endif
+ 
+#define TIMER2_ENABLED 0
+
+#if (TIMER2_ENABLED == 1)
+#define TIMER2_CONFIG_FREQUENCY    NRF_TIMER_FREQ_16MHz
+#define TIMER2_CONFIG_MODE         TIMER_MODE_MODE_Timer
+#define TIMER2_CONFIG_BIT_WIDTH    TIMER_BITMODE_BITMODE_16Bit
+#define TIMER2_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+
+#define TIMER2_INSTANCE_INDEX      (TIMER1_ENABLED+TIMER0_ENABLED)
+#endif
+
+#define TIMER_COUNT (TIMER0_ENABLED + TIMER1_ENABLED + TIMER2_ENABLED)
+
+/* RTC */
+#define RTC0_ENABLED 0
+
+#if (RTC0_ENABLED == 1)
+#define RTC0_CONFIG_FREQUENCY    32678
+#define RTC0_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define RTC0_CONFIG_RELIABLE     false
+
+#define RTC0_INSTANCE_INDEX      0
+#endif
+
+#define RTC1_ENABLED 0
+
+#if (RTC1_ENABLED == 1)
+#define RTC1_CONFIG_FREQUENCY    32768
+#define RTC1_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define RTC1_CONFIG_RELIABLE     false
+
+#define RTC1_INSTANCE_INDEX      (RTC0_ENABLED)
+#endif
+
+#define RTC_COUNT                (RTC0_ENABLED+RTC1_ENABLED)
+
+#define NRF_MAXIMUM_LATENCY_US 2000
+
+/* RNG */
+#define RNG_ENABLED 0
+
+#if (RNG_ENABLED == 1)
+#define RNG_CONFIG_ERROR_CORRECTION true
+#define RNG_CONFIG_POOL_SIZE        8
+#define RNG_CONFIG_IRQ_PRIORITY     APP_IRQ_PRIORITY_LOW
+#endif
+
+
+/* QDEC */
+#define QDEC_ENABLED 0
+
+#if (QDEC_ENABLED == 1)
+#define QDEC_CONFIG_REPORTPER    NRF_QDEC_REPORTPER_10
+#define QDEC_CONFIG_SAMPLEPER    NRF_QDEC_SAMPLEPER_16384us
+#define QDEC_CONFIG_PIO_A        1
+#define QDEC_CONFIG_PIO_B        2
+#define QDEC_CONFIG_PIO_LED      3
+#define QDEC_CONFIG_LEDPRE       511
+#define QDEC_CONFIG_LEDPOL       NRF_QDEC_LEPOL_ACTIVE_HIGH
+#define QDEC_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define QDEC_CONFIG_DBFEN        false
+#define QDEC_CONFIG_SAMPLE_INTEN false
+#endif
+
+/* LPCOMP */
+#define LPCOMP_ENABLED 0
+
+#if (LPCOMP_ENABLED == 1)
+#define LPCOMP_CONFIG_REFERENCE    NRF_LPCOMP_REF_SUPPLY_FOUR_EIGHT
+#define LPCOMP_CONFIG_DETECTION    NRF_LPCOMP_DETECT_DOWN
+#define LPCOMP_CONFIG_IRQ_PRIORITY APP_IRQ_PRIORITY_LOW
+#define LPCOMP_CONFIG_INPUT        NRF_LPCOMP_INPUT_0
+#endif
+
+/* WDT */
+#define WDT_ENABLED 0
+
+#if (WDT_ENABLED == 1)
+#define WDT_CONFIG_BEHAVIOUR     NRF_WDT_BEHAVIOUR_RUN_SLEEP
+#define WDT_CONFIG_RELOAD_VALUE  2000
+#define WDT_CONFIG_IRQ_PRIORITY  APP_IRQ_PRIORITY_HIGH
+#endif
+
+#endif // NRF_DRV_CONFIG_H
diff --git a/sdk-config/sdk/drivers_nrf/pstorage/config/pstorage_platform.h b/sdk-config/sdk/drivers_nrf/pstorage/config/pstorage_platform.h
new file mode 100644
index 0000000..e77678c
--- /dev/null
+++ b/sdk-config/sdk/drivers_nrf/pstorage/config/pstorage_platform.h
@@ -0,0 +1,65 @@
+/* Copyright (c)  2013 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+
+ /** @cond To make doxygen skip this file */
+
+/** @file
+ *  This header contains defines with respect persistent storage that are specific to
+ *  persistent storage implementation and application use case.
+ */
+#ifndef PSTORAGE_PL_H__
+#define PSTORAGE_PL_H__
+
+#include <stdint.h>
+
+#define PSTORAGE_FLASH_PAGE_SIZE    ((uint16_t)NRF_FICR->CODEPAGESIZE)                          /**< Size of one flash page. */
+#define PSTORAGE_FLASH_EMPTY_MASK   0xFFFFFFFF                                                  /**< Bit mask that defines an empty address in flash. */
+
+#define PSTORAGE_FLASH_PAGE_END     NRF_FICR->CODESIZE
+
+
+#define PSTORAGE_NUM_OF_PAGES       2                                                           /**< Number of flash pages allocated for the pstorage module excluding the swap page, configurable based on system requirements. */
+#define PSTORAGE_MIN_BLOCK_SIZE     0x0010                                                      /**< Minimum size of block that can be registered with the module. Should be configured based on system requirements, recommendation is not have this value to be at least size of word. */
+
+#define PSTORAGE_DATA_START_ADDR    ((PSTORAGE_FLASH_PAGE_END - PSTORAGE_NUM_OF_PAGES) \
+                                    * PSTORAGE_FLASH_PAGE_SIZE)                                 /**< Start address for persistent data, configurable according to system requirements. */
+#define PSTORAGE_DATA_END_ADDR      (PSTORAGE_FLASH_PAGE_END * PSTORAGE_FLASH_PAGE_SIZE)        /**< End address for persistent data, configurable according to system requirements. */
+#define PSTORAGE_SWAP_ADDR          PSTORAGE_DATA_END_ADDR
+
+#define PSTORAGE_MAX_BLOCK_SIZE     PSTORAGE_FLASH_PAGE_SIZE                                    /**< Maximum size of block that can be registered with the module. Should be configured based on system requirements. And should be greater than or equal to the minimum size. */
+#define PSTORAGE_CMD_QUEUE_SIZE     10                                                          /**< Maximum number of flash access commands that can be maintained by the module for all applications. Configurable. */
+
+/**@breif Define this flag in case Raw access to persistent memory is to be enabled. Raw mode
+ * unlike the data mode is for uses other than storing data from various mode. This mode is
+ * employed when unpdating firmware or similar uses. Therefore, this mode shall be enabled
+ * only for these special usecases and typically disabled.
+ */
+#define PSTORAGE_RAW_MODE_ENABLE
+
+/** Abstracts persistently memory block identifier. */
+typedef uint32_t pstorage_block_t;
+
+typedef struct
+{
+    uint32_t            module_id;      /**< Module ID.*/
+    pstorage_block_t    block_id;       /**< Block ID.*/
+} pstorage_handle_t;
+
+typedef uint32_t pstorage_size_t;      /** Size of length and offset fields. */
+
+/**@brief Handles Flash Access Result Events. To be called in the system event dispatcher of the application. */
+void pstorage_sys_event_handler (uint32_t sys_evt);
+
+#endif // PSTORAGE_PL_H__
+
+/** @} */
+/** @endcond */
diff --git a/sdk-config/sdk/libraries/hci/config/hci_mem_pool_internal.h b/sdk-config/sdk/libraries/hci/config/hci_mem_pool_internal.h
new file mode 100644
index 0000000..945365e
--- /dev/null
+++ b/sdk-config/sdk/libraries/hci/config/hci_mem_pool_internal.h
@@ -0,0 +1,32 @@
+/* Copyright (c) 2013 Nordic Semiconductor. All Rights Reserved.
+ *
+ * The information contained herein is property of Nordic Semiconductor ASA.
+ * Terms and conditions of usage are described in detail in NORDIC
+ * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
+ *
+ * Licensees are granted free, non-transferable use of the information. NO
+ * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
+ * the file.
+ *
+ */
+ 
+/** @file
+ *
+ * @defgroup memory_pool_internal Memory Pool Internal
+ * @{
+ * @ingroup memory_pool
+ *
+ * @brief Memory pool internal definitions
+ */
+ 
+#ifndef MEM_POOL_INTERNAL_H__
+#define MEM_POOL_INTERNAL_H__
+
+#define TX_BUF_SIZE       4u    /**< TX buffer size in bytes. */
+#define RX_BUF_SIZE       32u   /**< RX buffer size in bytes. */
+
+#define RX_BUF_QUEUE_SIZE 8u    /**< RX buffer element size. */
+
+#endif // MEM_POOL_INTERNAL_H__
+ 
+/** @} */
-- 
cgit v1.2.3