Merge remote-tracking branch 'upstream/master' into fixes

nrf/.gitignore

@@ -1 +1,8 @@
+# Nordic files
+#####################
+drivers/bluetooth/s1*/
+
+# Build files
+#####################
 build-*/
+

nrf/boards/dvk_bl652/mpconfigboard.h

@@ -0,0 +1,78 @@
+/*
+ * This file is part of the Micro Python project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define DVK_BL652
+
+#define MICROPY_HW_BOARD_NAME       "DVK-BL652"
+#define MICROPY_HW_MCU_NAME         "NRF52832"
+#define MICROPY_PY_SYS_PLATFORM     "bl652"
+
+#define MICROPY_PY_MACHINE_PWM      (1)
+#define MICROPY_PY_MACHINE_HW_SPI   (1)
+#define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_PY_MACHINE_RTC      (1)
+#define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_ADC      (1)
+#define MICROPY_PY_MACHINE_TEMP     (1)
+
+#define MICROPY_HW_HAS_LED          (1)
+#define MICROPY_HW_HAS_SWITCH       (0)
+#define MICROPY_HW_HAS_FLASH        (0)
+#define MICROPY_HW_HAS_SDCARD       (0)
+#define MICROPY_HW_HAS_MMA7660      (0)
+#define MICROPY_HW_HAS_LIS3DSH      (0)
+#define MICROPY_HW_HAS_LCD          (0)
+#define MICROPY_HW_ENABLE_RNG       (0)
+#define MICROPY_HW_ENABLE_RTC       (0)
+#define MICROPY_HW_ENABLE_TIMER     (0)
+#define MICROPY_HW_ENABLE_SERVO     (0)
+#define MICROPY_HW_ENABLE_DAC       (0)
+#define MICROPY_HW_ENABLE_CAN       (0)
+
+#define MICROPY_HW_LED_COUNT        (2)
+#define MICROPY_HW_LED_PULLUP       (0)
+
+#define MICROPY_HW_LED1             (17) // LED1
+#define MICROPY_HW_LED2             (19) // LED2
+
+// UART config
+#define MICROPY_HW_UART1_RX         (pin_A8)
+#define MICROPY_HW_UART1_TX         (pin_A6)
+#define MICROPY_HW_UART1_CTS        (pin_A7)
+#define MICROPY_HW_UART1_RTS        (pin_A5)
+#define MICROPY_HW_UART1_HWFC       (1)
+
+// SPI0 config
+#define MICROPY_HW_SPI0_NAME        "SPI0"
+#define MICROPY_HW_SPI0_SCK         (pin_A25)
+#define MICROPY_HW_SPI0_MOSI        (pin_A23)
+#define MICROPY_HW_SPI0_MISO        (pin_A24)
+
+#define MICROPY_HW_PWM0_NAME        "PWM0"
+#define MICROPY_HW_PWM1_NAME        "PWM1"
+#define MICROPY_HW_PWM2_NAME        "PWM2"
+
+#define HELP_TEXT_BOARD_LED         "1,2"

nrf/boards/dvk_bl652/mpconfigboard.mk

@@ -0,0 +1,6 @@
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52832
+LD_FILE = boards/nrf52832_512k_64k.ld
+
+NRF_DEFINES += -DNRF52832_XXAA

nrf/boards/dvk_bl652/mpconfigboard_s132.mk

@@ -0,0 +1,10 @@
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52832
+SOFTDEV_VERSION = 3.0.0
+
+LD_FILE = boards/nrf52832_512k_64k_s132_$(SOFTDEV_VERSION).ld
+
+NRF_DEFINES += -DNRF52832_XXAA
+CFLAGS += -DBLUETOOTH_LFCLK_RC
+

nrf/boards/dvk_bl652/nrf52_hal_conf.h

@@ -0,0 +1,17 @@
+#ifndef NRF52_HAL_CONF_H__
+#define NRF52_HAL_CONF_H__
+
+#define HAL_UART_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIME_MODULE_ENABLED
+#define HAL_PWM_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_TIMER_MODULE_ENABLED
+#define HAL_TWI_MODULE_ENABLED
+#define HAL_ADCE_MODULE_ENABLED
+#define HAL_TEMP_MODULE_ENABLED
+// #define HAL_UARTE_MODULE_ENABLED
+// #define HAL_SPIE_MODULE_ENABLED
+// #define HAL_TWIE_MODULE_ENABLED
+
+#endif // NRF52_HAL_CONF_H__

nrf/boards/dvk_bl652/pins.csv

@@ -0,0 +1,31 @@
+PA2,PA2
+PA3,PA3
+PA4,PA4
+UART_RTS,PA5
+UART_TX,PA6
+UART_CTS,PA7
+UART_RX,PA8
+PA9,PA9
+PA10,PA10
+PA11,PA11
+PA12,PA12
+PA13,PA13
+PA14,PA14
+PA15,PA15
+PA16,PA16
+PA17,PA17
+PA18,PA18
+PA19,PA19
+PA20,PA20
+PA21,PA21
+PA22,PA22
+PA23,PA23
+PA24,PA24
+PA25,PA25
+PA26,PA26
+PA27,PA27
+PA28,PA28
+PA29,PA29
+PA30,PA30
+PA31,PA31
+

nrf/drivers/bluetooth/ble_drv.c

@@ -122,6 +122,14 @@ uint32_t ble_drv_stack_enable(void) {
     uint32_t err_code = sd_softdevice_enable(NRF_CLOCK_LFCLKSRC_XTAL_20_PPM,
                                              softdevice_assert_handler);
 #endif // BLUETOOTH_LFCLK_RC
+#else
+#if BLUETOOTH_LFCLK_RC
+    nrf_clock_lf_cfg_t clock_config = {
+        .source = NRF_CLOCK_LF_SRC_RC,
+        .rc_ctiv = 16,
+        .rc_temp_ctiv = 2,
+        .xtal_accuracy = 0
+    };
 #else
     nrf_clock_lf_cfg_t clock_config = {
         .source = NRF_CLOCK_LF_SRC_XTAL,
@@ -129,7 +137,7 @@ uint32_t ble_drv_stack_enable(void) {
         .rc_temp_ctiv = 0,
         .xtal_accuracy = NRF_CLOCK_LF_XTAL_ACCURACY_20_PPM
     };
-
+#endif
     uint32_t err_code = sd_softdevice_enable(&clock_config,
                                              softdevice_assert_handler);
 #endif