10000 TO BE REMOVED: squash of PR 6235. · micropython/micropython@8feee9a · GitHub
[go: up one dir, main page]
Skip to content

Commit 8feee9a

Browse files
glennrubglennrub
committed
TO BE REMOVED: squash of PR 6235.
1 parent ae3dfce commit 8feee9a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#define MICROPY_PY_MACHINE_HW_PWM (0)
3535
#define MICROPY_PY_MACHINE_HW_SPI (1)
3636
#define MICROPY_PY_MACHINE_TIMER (0)
37-
#define MICROPY_PY_MACHINE_RTCOUNTER (0)
37+
#define MICROPY_PY_MACHINE_RTCOUNTER (1)
3838
#define MICROPY_PY_MACHINE_I2C (1)
3939
#define MICROPY_PY_MACHINE_ADC (0)
4040
#define MICROPY_PY_MACHINE_TEMP (0)

‎ports/nrf/nrfx_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
#define NRFX_RTC_ENABLED (MICROPY_PY_MACHINE_RTCOUNTER)
131131
#define NRFX_RTC0_ENABLED 1
132132
#define NRFX_RTC1_ENABLED 1
133-
#define NRFX_RTC2_ENABLED (!NRF51)
133+
#define NRFX_RTC2_ENABLED (!NRF51) && (!NRF9160_XXAA)
134134

135135
#define NRFX_TIMER_ENABLED (MICROPY_PY_MACHINE_TIMER)
136136
#define NRFX_TIMER0_ENABLED 1

0 commit comments

Comments
 (0)
0