diff --git a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51.c b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51.c index cb98405feb..76857bb161 100644 --- a/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51.c +++ b/libraries/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51.c @@ -83,7 +83,7 @@ void SystemInit(void) // Start the external 32khz crystal oscillator. -#if defined(TARGET_DELTA_DFCM_NNN40) || defined(TARGET_HRM1017) +#if defined(TARGET_DELTA_DFCM_NNN40) || defined(TARGET_HRM1017) || defined(TARGET_NRF_LFCLK_RC) NRF_CLOCK->LFCLKSRC = (CLOCK_LFCLKSRC_SRC_RC << CLOCK_LFCLKSRC_SRC_Pos); #else NRF_CLOCK->LFCLKSRC = (CLOCK_LFCLKSRC_SRC_Xtal << CLOCK_LFCLKSRC_SRC_Pos); diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h new file mode 100644 index 0000000000..ac930c2ddd --- /dev/null +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/PinNames.h @@ -0,0 +1,198 @@ +/* mbed Microcontroller Library + * Copyright (c) 2013 Nordic Semiconductor + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MBED_PINNAMES_H +#define MBED_PINNAMES_H + +#include "cmsis.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + PIN_INPUT, + PIN_OUTPUT +} PinDirection; + +#define PORT_SHIFT 3 + +typedef enum { + p0 = 0, + p1 = 1, + p2 = 2, + p3 = 3, + p4 = 4, + p5 = 5, + p6 = 6, + p7 = 7, + p8 = 8, + p9 = 9, + p10 = 10, + p11 = 11, + p12 = 12, + p13 = 13, + p14 = 14, + p15 = 15, + p16 = 16, + p17 = 17, + p18 = 18, + p19 = 19, + p20 = 20, + p21 = 21, + p22 = 22, + p23 = 23, + p24 = 24, + p25 = 25, + p26 = 26, + p27 = 27, + p28 = 28, + p29 = 29, + p30 = 30, + + //NORMAL PINS... + P0_0 = p0, + P0_1 = p1, + P0_2 = p2, + P0_3 = p3, + P0_4 = p4, + P0_5 = p5, + P0_6 = p6, + P0_7 = p7, + + P0_8 = p8, + P0_9 = p9, + P0_10 = p10, + P0_11 = p11, + P0_12 = p12, + P0_13 = p13, + P0_14 = p14, + P0_15 = p15, + + P0_16 = p16, + P0_17 = p17, + P0_18 = p18, + P0_19 = p19, + P0_20 = p20, + P0_21 = p21, + P0_22 = p22, + P0_23 = p23, + + P0_24 = p24, + P0_25 = p25, + P0_26 = p26, + P0_27 = p27, + P0_28 = p28, + P0_29 = p29, + P0_30 = p30, + + //PADS + PAD3 = p1, + PAD2 = p2, + PAD1 = p3, + + + //LED MATRIX COLS + COL1 = p4, + COL2 = p5, + COL3 = p6, + COL4 = p7, + COL5 = p8, + COL6 = p9, + COL7 = p10, + COL8 = p11, + COL9 = p12, + + //LED MATRIX ROWS + ROW1 = p13, + ROW2 = p14, + ROW3 = p15, + + //NORMAL PIN (NO SPECIFIED FUNCTIONALITY) + //PIN_16 + + // BUTTON A + BUTTON_A = p17, + + + //NORMAL PIN (NO SPECIFIED FUNCTIONALITY) + //PIN_18 + + //TARGET RESET + TGT_NRESET = p19, + + //NORMAL PIN (NO SPECIFIED FUNCTIONALITY) + //PIN_20 + + //MASTER OUT SLAVE IN + MOSI = p21, + + //MASTER IN SLAVE OUT + MISO = p22, + + //SERIAL CLOCK + SCK = p23, + + // RX AND TX PINS + TGT_TX = p24, + TGT_RX = p25, + + //BUTTON B + BUTTON_B = p26, + + //ACCEL INTERRUPT PINS (MMA8653FC) + ACCEL_INT2 = p27, + ACCEL_INT1 = p28, + + //MAGENETOMETER INTERRUPT PIN (MAG3110) + MAG_INT1 = p29, + + // Not connected + NC = (int)0xFFFFFFFF, + + RX_PIN_NUMBER = TGT_RX, + TX_PIN_NUMBER = TGT_TX, + CTS_PIN_NUMBER = 31, //unused ** REQUIRES A PROPER FIX ** + RTS_PIN_NUMBER = 31, //unused + + // mBed interface Pins + USBTX = TX_PIN_NUMBER, + USBRX = RX_PIN_NUMBER, + + LED1 = PAD1, + LED2 = PAD2, + LED3 = PAD3, + LED4 = P0_16, + + //SDA (SERIAL DATA LINE) + I2C_SDA0 = p30, + + //SCL (SERIAL CLOCK LINE) + I2C_SCL0 = p0 + +} PinName; + +typedef enum { + PullNone = 0, + PullDown = 1, + PullUp = 3, + PullDefault = PullUp +} PinMode; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/device.h b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/device.h new file mode 100644 index 0000000000..9d5a5e2109 --- /dev/null +++ b/libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/TARGET_NRF51_MICROBIT/device.h @@ -0,0 +1,57 @@ +/* mbed Microcontroller Library + * Copyright (c) 2006-2013 ARM Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MBED_DEVICE_H +#define MBED_DEVICE_H + +#define DEVICE_PORTIN 1 +#define DEVICE_PORTOUT 1 +#define DEVICE_PORTINOUT 1 + +#define DEVICE_INTERRUPTIN 1 + +#define DEVICE_ANALOGIN 1 +#define DEVICE_ANALOGOUT 0 + +#define DEVICE_SERIAL 1 + +#define DEVICE_I2C 1 +#define DEVICE_I2CSLAVE 0 + +#define DEVICE_SPI 1 +#define DEVICE_SPISLAVE 1 + +#define DEVICE_CAN 0 + +#define DEVICE_RTC 0 + +#define DEVICE_ETHERNET 0 + +#define DEVICE_PWMOUT 1 + +#define DEVICE_SEMIHOST 0 +#define DEVICE_LOCALFILESYSTEM 0 + +#define DEVICE_SLEEP 1 + +#define DEVICE_DEBUG_AWARENESS 0 + +#define DEVICE_STDIO_MESSAGES 0 + +#define DEVICE_ERROR_PATTERN 1 + +#include "objects.h" + +#endif diff --git a/workspace_tools/build_release.py b/workspace_tools/build_release.py index 1ea1765749..6eea308dbf 100755 --- a/workspace_tools/build_release.py +++ b/workspace_tools/build_release.py @@ -85,6 +85,7 @@ OFFICIAL_MBED_LIBRARY_BUILD = ( ('NRF51_DK', ('ARM', 'GCC_ARM', 'IAR')), ('NRF51_DONGLE', ('ARM', 'GCC_ARM', 'IAR')), ('HRM1017', ('ARM', 'GCC_ARM', 'IAR')), + ('NRF51_MICROBIT', ('ARM')), ('ARCH_BLE', ('ARM', 'GCC_ARM', 'IAR')), ('SEEED_TINY_BLE', ('ARM', 'GCC_ARM', 'IAR')), ('RBLAB_NRF51822', ('ARM', 'GCC_ARM')), diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py index 3c57e91da8..78d4b1670f 100755 --- a/workspace_tools/targets.py +++ b/workspace_tools/targets.py @@ -1247,6 +1247,53 @@ class NRF51_DONGLE_OTA(MCU_NRF51_32K_OTA): self.extra_labels = ['NRF51_DONGLE'] self.macros += ['TARGET_NRF51_DONGLE'] +class NRF51_MICROBIT(MCU_NRF51_16K): + def __init__(self): + MCU_NRF51_16K.__init__(self) + self.EXPECTED_SOFTDEVICES_WITH_OFFSETS = [ + { + 'name' : 's110_nrf51822_8.0.0_softdevice.hex', + 'boot' : 's110_nrf51822_8.0.0_bootloader.hex', + 'offset' : 0x18000 + }, + { + 'name' : 's110_nrf51822_7.1.0_softdevice.hex', + 'boot' : 's110_nrf51822_7.1.0_bootloader.hex', + 'offset' : 0x16000 + } + ] + self.macros += ['TARGET_NRF_LFCLK_RC'] + +class NRF51_MICROBIT_BOOT(MCU_NRF51_16K_BOOT): + def __init__(self): + MCU_NRF51_16K_BOOT.__init__(self) + self.extra_labels += ['NRF51_MICROBIT'] + self.macros += ['TARGET_NRF51_MICROBIT', 'TARGET_NRF_LFCLK_RC'] + +class NRF51_MICROBIT_OTA(MCU_NRF51_16K_OTA): + def __init__(self): + MCU_NRF51_16K_OTA.__init__(self) + self.extra_labels += ['NRF51_MICROBIT'] + self.macros += ['TARGET_NRF51_MICROBIT', 'TARGET_NRF_LFCLK_RC'] + +class NRF51_MICROBIT_B(MCU_NRF51_16K): + def __init__(self): + MCU_NRF51_16K.__init__(self) + self.extra_labels += ['NRF51_MICROBIT'] + self.macros += ['TARGET_NRF51_MICROBIT', 'TARGET_NRF_LFCLK_RC'] + +class NRF51_MICROBIT_B_BOOT(MCU_NRF51_16K_BOOT): + def __init__(self): + MCU_NRF51_16K_BOOT.__init__(self) + self.extra_labels += ['NRF51_MICROBIT'] + self.macros += ['TARGET_NRF51_MICROBIT', 'TARGET_NRF_LFCLK_RC'] + +class NRF51_MICROBIT_B_OTA(MCU_NRF51_16K_OTA): + def __init__(self): + MCU_NRF51_16K_OTA.__init__(self) + self.extra_labels += ['NRF51_MICROBIT'] + self.macros += ['TARGET_NRF51_MICROBIT', 'TARGET_NRF_LFCLK_RC'] + ### ARM ### @@ -1547,6 +1594,9 @@ TARGETS = [ NRF51_DONGLE(), # nRF51_32K NRF51_DONGLE_BOOT(), # nRF51_32K NRF51_DONGLE_OTA(), # nRF51_32K + NRF51_MICROBIT(), # nRF51_16K - S110 + NRF51_MICROBIT_B(), # nRF51_16K - default + ### ARM ### ARM_MPS2_M0(),