Skip to content

Commit f171c44

Browse files
committed
Fix module registration and bindings
Fixes missing lines for adding source to the makefile, and fixes subsequent overlooked errors in shared-bindings. Aligns the module compliation flag with the module name.
1 parent 4604c6e commit f171c44

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

ports/espressif/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -422,11 +422,7 @@ CFLAGS += -isystem esp-camera/driver/include
422422
CFLAGS += -isystem esp-camera/conversions/include
423423
endif
424424

425-
ifneq ($(CIRCUITPY_MICROROS),0)
426-
SRC_MICROROS := \
427-
$(wildcard common-hal/rclcpy/*.c) \
428-
$(wildcard shared-bindings/rclcpy/*.c)
429-
SRC_C += $(SRC_MICROROS)
425+
ifneq ($(CIRCUITPY_RCLCPY),0)
430426
CFLAGS += -isystem microros-lib/include
431427
CFLAGS += -isystem microros-lib/include/rcl
432428
CFLAGS += -isystem microros-lib/include/statistics_msgs
@@ -717,7 +713,7 @@ ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp-camera/libesp-camera
717713
#$(error $(ESP_IDF_COMPONENTS_EXPANDED))
718714
endif
719715

720-
ifeq ($(CIRCUITPY_MICROROS),1)
716+
ifneq ($(CIRCUITPY_RCLCPY),0)
721717
ifeq ($(IDF_TARGET),esp32)
722718
BINARY_BLOBS += microros-lib/esp32/libmicroros.a
723719
else ifeq ($(IDF_TARGET),esp32s2)

ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CIRCUITPY_ESP_FLASH_MODE = qio
99
CIRCUITPY_ESP_FLASH_FREQ = 80m
1010
CIRCUITPY_ESP_FLASH_SIZE = 8MB
1111
CIRCUITPY_ESPCAMERA = 0
12-
CIRCUITPY_MICROROS = 1
12+
CIRCUITPY_RCLCPY = 1
1313

1414
CIRCUITPY_GIFIO = 1
1515
CIRCUITPY_MAX3421E = 0

ports/espressif/mpconfigport.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ CIRCUITPY_HASHLIB ?= 1
6666
CIRCUITPY_I2CTARGET ?= 0
6767
CIRCUITPY_MAX3421E ?= 1
6868
CIRCUITPY_MEMORYMAP ?= 1
69-
CIRCUITPY_MICROROS ?= 1
69+
CIRCUITPY_RCLCPY ?= 0
7070
CIRCUITPY_NVM ?= 1
7171
CIRCUITPY_PARALLELDISPLAYBUS ?= 1
7272
CIRCUITPY_PS2IO ?= 1

0 commit comments

Comments
 (0)