Skip to content

Commit 760bd8d

Browse files
tannewttannewt
committed
share fourwire and make nrf compile
1 parent 2d136d5 commit 760bd8d

20 files changed

Lines changed: 180 additions & 139 deletions

File tree

‎ports/atmel-samd/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ SRC_COMMON_HAL = \
305305
busio/UART.c \
306306
digitalio/__init__.c \
307307
digitalio/DigitalInOut.c \
308-
displayio/FourWire.c \
309308
displayio/ParallelBus.c \
310309
i2cslave/__init__.c \
311310
i2cslave/I2CSlave.c \
@@ -380,6 +379,7 @@ SRC_SHARED_MODULE = \
380379
displayio/Bitmap.c \
381380
displayio/ColorConverter.c \
382381
displayio/Display.c \
382+
displayio/FourWire.c \
383383
displayio/Group.c \
384384
displayio/OnDiskBitmap.c \
385385
displayio/Palette.c \

‎ports/nrf/Makefile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ SRC_C += \
118118
fatfs_port.c \
119119
mphalport.c \
120120
tick.c \
121-
board_busses.c \
122121
boards/$(BOARD)/board.c \
123122
boards/$(BOARD)/pins.c \
124123
device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \
@@ -156,6 +155,7 @@ SRC_COMMON_HAL += \
156155
busio/__init__.c\
157156
digitalio/DigitalInOut.c \
158157
digitalio/__init__.c \
158+
displayio/ParallelBus.c \
159159
microcontroller/Pin.c \
160160
microcontroller/Processor.c \
161161
microcontroller/__init__.c \
@@ -214,6 +214,16 @@ SRC_SHARED_MODULE = \
214214
bitbangio/OneWire.c \
215215
bitbangio/SPI.c \
216216
busio/OneWire.c \
217+
displayio/__init__.c \
218+
displayio/Bitmap.c \
219+
displayio/ColorConverter.c \
220+
displayio/Display.c \
221+
displayio/FourWire.c \
222+
displayio/Group.c \
223+
displayio/OnDiskBitmap.c \
224+
displayio/Palette.c \
225+
displayio/Shape.c \
226+
displayio/Sprite.c \
217227
storage/__init__.c
218228

219229
# uheap/__init__.c \

‎ports/nrf/board_busses.c‎

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) },
@@ -44,7 +44,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4444
{ MP_ROM_QSTR(MP_QSTR_L), MP_ROM_PTR(&pin_P1_15) },
4545
{ MP_ROM_QSTR(MP_QSTR_RED_LED), MP_ROM_PTR(&pin_P1_15) },
4646
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_P1_15) },
47-
47+
4848
{ MP_ROM_QSTR(MP_QSTR_BLUE_LED), MP_ROM_PTR(&pin_P1_10) },
4949
};
5050

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

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

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) },

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

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

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) },

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

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

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) },

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

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

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) },

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

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

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) },

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

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

3-
#include "board_busses.h"
3+
#include "supervisor/shared/board_busses.h"
44

55
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
66
{ MP_ROM_QSTR(MP_QSTR_P0_00), MP_ROM_PTR(&pin_P0_00) },

0 commit comments

Comments
 (0)