Skip to content

Commit 513253b

Browse files
Bernhard Bosertannewt
Bernhard Boser
authored and
tannewt
committed
moved logic to shared-module and added documentation
1 parent 748472d commit 513253b

7 files changed

Lines changed: 439 additions & 345 deletions

File tree

‎ports/nrf/mpconfigport.mk‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ MCU_SUB_VARIANT = nrf52840
5252
# Fits on nrf52840 but space is tight on nrf52833.
5353
CIRCUITPY_AESIO ?= 1
5454

55-
CIRCUITPY_MSGPACK ?= 1
56-
5755
SD ?= s140
5856
SOFTDEV_VERSION ?= 6.1.0
5957

‎py/circuitpy_defns.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@ SRC_SHARED_MODULE_ALL = \
465465
memorymonitor/AllocationAlarm.c \
466466
memorymonitor/AllocationSize.c \
467467
network/__init__.c \
468+
msgpack/__init__.c \
468469
os/__init__.c \
469470
random/__init__.c \
470471
rgbmatrix/RGBMatrix.c \

‎py/circuitpy_mpconfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,6 +815,7 @@ extern const struct _mp_obj_module_t msgpack_module;
815815
_EVE_MODULE \
816816
MEMORYMONITOR_MODULE \
817817
MICROCONTROLLER_MODULE \
818+
MSGPACK_MODULE \
818819
NEOPIXEL_WRITE_MODULE \
819820
NETWORK_MODULE \
820821
SOCKET_MODULE \
@@ -846,7 +847,6 @@ extern const struct _mp_obj_module_t msgpack_module;
846847
USTACK_MODULE \
847848
WATCHDOG_MODULE \
848849
WIFI_MODULE \
849-
MSGPACK_MODULE \
850850

851851
// If weak links are enabled, just include strong links in the main list of modules,
852852
// and also include the underscore alternate names.

‎py/circuitpy_mpconfig.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,5 +297,5 @@ CFLAGS += -DCIRCUITPY_WIFI=$(CIRCUITPY_WIFI)
297297
CIRCUITPY_ENABLE_MPY_NATIVE ?= 0
298298
CFLAGS += -DCIRCUITPY_ENABLE_MPY_NATIVE=$(CIRCUITPY_ENABLE_MPY_NATIVE)
299299

300-
CIRCUITPY_MSGPACK ?= 0
300+
CIRCUITPY_MSGPACK ?= $(CIRCUITPY_FULL_BUILD)
301301
CFLAGS += -DCIRCUITPY_MSGPACK=$(CIRCUITPY_MSGPACK)

0 commit comments

Comments
 (0)