fish

8 files changed, 3 insertions, 790 deletions

diff --git a/.gitmodules b/.gitmodules
index 8a224a7..f593d55 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "bootloader/sdk-9.0.0"]
 	path = bootloader/sdk-9.0.0
 	url = ssh://git@git.panaceas.org/git/nRF51/sdk-9.0.0
+[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/bootloader/bsp/ble400.h b/bootloader/bsp/ble400.h
deleted file mode 100644
index 4c8866b..0000000
--- a/bootloader/bsp/ble400.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* 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/bootloader/bsp/boards.h b/bootloader/bsp/boards.h
deleted file mode 100644
index 1470007..0000000
--- a/bootloader/bsp/boards.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* 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_BRACELET)

-  #include "bracelet.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/bootloader/bsp/bracelet.h b/bootloader/bsp/bracelet.h
deleted file mode 100644
index 1e41865..0000000
--- a/bootloader/bsp/bracelet.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* 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    1

-

-#define LED_START      22

-#define LED_0          22

-#define LED_STOP       22

-

-#define LEDS_LIST { LED_0 }

-

-#define BSP_LED_0      LED_0

-

-#define BSP_LED_0_MASK (1<<BSP_LED_0)

-

-#define LEDS_MASK      (BSP_LED_0_MASK)

-

-/* all LEDs are lit when GPIO is low */

-#define LEDS_INV_MASK  LEDS_MASK

-

-#define BUTTONS_NUMBER 2

-

-#define BUTTON_START   3

-#define BUTTON_1       3

-#define BUTTON_2       4

-#define BUTTON_STOP    4

-#define BUTTON_PULL    NRF_GPIO_PIN_NOPULL~

-

-#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  18

-#define TX_PIN_NUMBER  19

-//#define CTS_PIN_NUMBER 10

-//#define RTS_PIN_NUMBER 8

-#define HWFC           false

-

-#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/bootloader/bsp/bsp.h b/bootloader/bsp/bsp.h
deleted file mode 100644
index d2e61e8..0000000
--- a/bootloader/bsp/bsp.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/* 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/bootloader/bsp/bsp_btn_ble.h b/bootloader/bsp/bsp_btn_ble.h
deleted file mode 100644
index 833e120..0000000
--- a/bootloader/bsp/bsp_btn_ble.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 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/bootloader/bsp/pca10028.h b/bootloader/bsp/pca10028.h
deleted file mode 100644
index bb2fa52..0000000
--- a/bootloader/bsp/pca10028.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 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/sdk-9.0.0 b/sdk-9.0.0
new file mode 160000
+Subproject d96e8db9d9a551fb861ca53c3a3ada99dd19c57