djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix default crystal value; fix include order

Browse Source
This commit is contained in:
Dan Halbert 2019-08-22 09:01:05 -04:00
parent acc6df4959
commit 0b7291d767
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h
View File

@ -61,8 +61,6 @@
#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE) #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
#define BOARD_HAS_CRYSTAL 1
#define DEFAULT_I2C_BUS_SCL (&pin_P0_04) #define DEFAULT_I2C_BUS_SCL (&pin_P0_04)
#define DEFAULT_I2C_BUS_SDA (&pin_P0_05) #define DEFAULT_I2C_BUS_SDA (&pin_P0_05)

4
ports/nrf/common-hal/bleio/Adapter.c
View File

@ -51,12 +51,12 @@ STATIC uint32_t ble_stack_enable(void) {
.source = NRF_CLOCK_LF_SRC_XTAL, .source = NRF_CLOCK_LF_SRC_XTAL,
.rc_ctiv = 0, .rc_ctiv = 0,
.rc_temp_ctiv = 0, .rc_temp_ctiv = 0,
.accuracy = NRF_CLOCK_LF_ACCURACY_20_PPM .accuracy = NRF_CLOCK_LF_ACCURACY_20_PPM,
#else #else
.source = NRF_CLOCK_LF_SRC_RC, .source = NRF_CLOCK_LF_SRC_RC,
.rc_ctiv = 16, .rc_ctiv = 16,
.rc_temp_ctiv = 2, .rc_temp_ctiv = 2,
.accuracy = NRF_CLOCK_LF_ACCURACY_250_PPM .accuracy = NRF_CLOCK_LF_ACCURACY_250_PPM,
#endif #endif
}; };

10
ports/nrf/mpconfigport.h
View File

@ -38,11 +38,6 @@
#define MICROPY_PY_UBINASCII (1) #define MICROPY_PY_UBINASCII (1)
#define MICROPY_PY_UJSON (1) #define MICROPY_PY_UJSON (1)
#ifndef BOARD_HAS_32KHZ_XTAL
// Assume crystal is present, which is the most common case.
#define BOARD_HAS_32KHZ_XTAL (0)
#endif
// TODO this is old BLE stuff // TODO this is old BLE stuff
#if BLUETOOTH_SD #if BLUETOOTH_SD
#define MICROPY_PY_BLEIO (1) #define MICROPY_PY_BLEIO (1)
@ -58,6 +53,11 @@
#include "py/circuitpy_mpconfig.h" #include "py/circuitpy_mpconfig.h"
#ifndef BOARD_HAS_32KHZ_XTAL
// Assume crystal is present, which is the most common case.
#define BOARD_HAS_32KHZ_XTAL (1)
#endif
#define MICROPY_PORT_ROOT_POINTERS \ #define MICROPY_PORT_ROOT_POINTERS \
CIRCUITPY_COMMON_ROOT_POINTERS \ CIRCUITPY_COMMON_ROOT_POINTERS \
ble_drv_evt_handler_entry_t* ble_drv_evt_handler_entries; \ ble_drv_evt_handler_entry_t* ble_drv_evt_handler_entries; \

2
ports/nrf/peripherals/nrf/clocks.c
View File

@ -26,7 +26,7 @@
*/ */
#include "nrfx.h" #include "nrfx.h"
#include "mpconfigboard.h" #include "mpconfigport.h"
void nrf_peripherals_clocks_init(void) { void nrf_peripherals_clocks_init(void) {