Skip to content

Commit 4962468

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#1011 from arturo182/nrf_cleanup
nrf: More cleanup and porting
2 parents e875f4e + eab00ff commit 4962468

24 files changed

Lines changed: 15 additions & 1493 deletions

File tree

‎ports/nrf/Makefile‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ INC += -I$(BUILD)
4343
INC += -I$(BUILD)/genhdr
4444
INC += -I./../../lib/cmsis/inc
4545
INC += -I./boards/$(BOARD)
46-
INC += -I./hal
4746
INC += -I./modules/ubluepy
48-
INC += -I./modules/random
4947
INC += -I./modules/ble
5048
INC += -I./nrfx
5149
INC += -I./nrfx/hal
@@ -63,7 +61,6 @@ CFLAGS += $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(COPT) $(NRF_DEFINES)
6361
CFLAGS += -fno-strict-aliasing
6462
CFLAGS += -fstack-usage -fno-builtin -fshort-enums
6563
CFLAGS += -fdata-sections -ffunction-sections
66-
CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
6764
CFLAGS += -D__START=main
6865

6966
LDFLAGS = $(CFLAGS)
@@ -89,11 +86,6 @@ LIBS := -L $(dir $(LIBM_FILE_NAME)) -lm
8986
LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc
9087
LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
9188

92-
SRC_HAL = $(addprefix hal/,\
93-
hal_time.c \
94-
hal_rng.c \
95-
)
96-
9789
SRC_NRFX = $(addprefix nrfx/,\
9890
drivers/src/nrfx_spim.c \
9991
drivers/src/nrfx_twim.c \
@@ -103,10 +95,7 @@ SRC_NRFX = $(addprefix nrfx/,\
10395
SRC_C += \
10496
mphalport.c \
10597
fatfs_port.c \
106-
fifo.c \
10798
tick.c \
108-
drivers/softpwm.c \
109-
drivers/ticker.c \
11099
drivers/bluetooth/ble_drv.c \
111100
drivers/bluetooth/ble_uart.c \
112101
boards/$(BOARD)/board.c \
@@ -136,7 +125,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
136125
ubluepy/ubluepy_scanner.c \
137126
ubluepy/ubluepy_scan_entry.c \
138127
ble/modble.c \
139-
random/modrandom.c \
140128
)
141129

142130
SRC_COMMON_HAL += \
@@ -202,7 +190,8 @@ SRC_SHARED_BINDINGS = \
202190
bitbangio/__init__.c \
203191
bitbangio/I2C.c \
204192
bitbangio/SPI.c \
205-
bitbangio/OneWire.c
193+
bitbangio/OneWire.c \
194+
random/__init__.c
206195

207196

208197
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_BINDINGS)) \
@@ -215,7 +204,6 @@ FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
215204

216205
OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
217206
OBJ += $(BUILD)/pins_gen.o
218-
OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o))
219207
OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX:.c=.o))
220208
OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
221209
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))

‎ports/nrf/boards/feather52832/nrf52_hal_conf.h‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ports/nrf/boards/feather52840/nrf52_hal_conf.h‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ports/nrf/boards/pca10040/nrf52_hal_conf.h‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ports/nrf/boards/pca10056/nrf52_hal_conf.h‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎ports/nrf/common-hal/time/__init__.c‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,12 @@
2626

2727
#include "py/mphal.h"
2828

29-
#include "shared-bindings/time/__init__.h"
3029
#include "tick.h"
3130

32-
#include "nrfx_glue.h"
33-
34-
inline uint64_t common_hal_time_monotonic(void) {
31+
uint64_t common_hal_time_monotonic(void) {
3532
return ticks_ms;
3633
}
3734

3835
void common_hal_time_delay_ms(uint32_t delay) {
39-
NRFX_DELAY_US(delay);
36+
mp_hal_delay_ms(delay);
4037
}

‎ports/nrf/drivers/bluetooth/ble_uart.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <string.h>
3030
#include "ble_uart.h"
3131
#include "ringbuffer.h"
32-
#include "hal/hal_time.h"
3332
#include "lib/utils/interrupt_char.h"
3433

3534
#if MICROPY_PY_BLE_NUS

0 commit comments

Comments
 (0)