8000 Merge pull request #2869 from simmel-project/simmel · mubes/circuitpython@6c5874c · GitHub
[go: up one dir, main page]
Skip to content

Commit 6c5874c

Browse files
tannewttannewt
authored
Merge pull request adafruit#2869 from simmel-project/simmel
NRF: Minor Simmel fixes
2 parents 62b835a + ffaeeda commit 6c5874c

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

‎ports/nrf/boards/simmel/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#endif
4141

4242
#define CIRCUITPY_INTERNAL_NVM_SIZE 0
43-
#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (84*1024)
43+
#define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (80*1024)
4444

4545
#define BOOTLOADER_SIZE (0x4000) // 12 kiB
4646
#define CIRCUITPY_BLE_CONFIG_SIZE (12*1024)

‎ports/nrf/boards/simmel/mpconfigboard.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ MCU_CHIP = nrf52833
1111

1212
INTERNAL_FLASH_FILESYSTEM = 1
1313

14+
CIRCUITPY_AESIO = 1
1415
CIRCUITPY_AUDIOMP3 = 0
1516
CIRCUITPY_BUSIO = 1
1617
CIRCUITPY_DISPLAYIO = 0
@@ -29,4 +30,4 @@ CIRCUITPY_ULAB = 0
2930

3031
# These defines must be overridden before mpconfigboard.h is included, which is
3132
# why they are passed on the command line.
32-
CFLAGS += -DSPIM3_BUFFER_SIZE=0 -DSOFTDEVICE_RAM_SIZE='(32*1024)'
33+
CFLAGS += -DSPIM3_BUFFER_SIZE=0 -DSOFTDEVICE_RAM_SIZE='(32*1024)' -DNRFX_SPIM3_ENABLED=0

‎ports/nrf/boards/simmel/pins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

33
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_SPI_CSN), MP_ROM_PTR(&pin_P0_06) },
4+
{ MP_ROM_QSTR(MP_QSTR_SPI_CSN), MP_ROM_PTR(&pin_P1_06) },
55
{ MP_ROM_QSTR(MP_QSTR_SPI_MISO), MP_ROM_PTR(&pin_P1_04) },
66
{ MP_ROM_QSTR(MP_QSTR_SPI_MOSI), MP_ROM_PTR(&pin_P0_09) },
77
{ MP_ROM_QSTR(MP_QSTR_SPI_SCK), MP_ROM_PTR(&pin_P0_10) },

‎ports/nrf/nrfx_config.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@
4141
#define NRFX_SPIM1_ENABLED 1
4242
#endif
4343
#define NRFX_SPIM2_ENABLED 1
44+
#ifndef NRFX_SPIM3_ENABLED
4445
#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA)
4546
#define NRFX_SPIM_EXTENDED_ENABLED 1
4647
#define NRFX_SPIM3_ENABLED 1
4748
#elif CIRCUITPY_NRF_NUM_I2C == 2
4849
#define NRFX_SPIM3_ENABLED 0
4950
#endif
51+
#endif
5052

5153

5254
#define NRFX_SPIM_DEFAULT_CONFIG_IRQ_PRIORITY 7

0 commit comments

Comments
 (0)
0