Skip to content

Commit c555529

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 0f07ab9 commit c555529

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

ports/espressif/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,7 @@ CFLAGS += -isystem esp-camera/driver/include
436436
CFLAGS += -isystem esp-camera/conversions/include
437437
endif
438438

439-
ifneq ($(CIRCUITPY_MICROROS),0)
440-
SRC_MICROROS := \
441-
$(wildcard common-hal/rclcpy/*.c) \
442-
$(wildcard shared-bindings/rclcpy/*.c)
443-
SRC_C += $(SRC_MICROROS)
439+
ifneq ($(CIRCUITPY_RCLCPY),0)
444440
CFLAGS += -isystem microros-lib/include
445441
CFLAGS += -isystem microros-lib/include/rcl
446442
CFLAGS += -isystem microros-lib/include/statistics_msgs
@@ -727,7 +723,7 @@ ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/esp-camera/libesp-camera
727723
#$(error $(ESP_IDF_COMPONENTS_EXPANDED))
728724
endif
729725

730-
ifeq ($(CIRCUITPY_MICROROS),1)
726+
ifneq ($(CIRCUITPY_RCLCPY),0)
731727
ifeq ($(IDF_TARGET),esp32)
732728
BINARY_BLOBS += microros-lib/esp32/libmicroros.a
733729
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
@@ -64,7 +64,7 @@ CIRCUITPY_HASHLIB ?= 1
6464
CIRCUITPY_I2CTARGET ?= 0
6565
CIRCUITPY_MAX3421E ?= 1
6666
CIRCUITPY_MEMORYMAP ?= 1
67-
CIRCUITPY_MICROROS ?= 1
67+
CIRCUITPY_RCLCPY ?= 0
6868
CIRCUITPY_NVM ?= 1
6969
CIRCUITPY_PARALLELDISPLAYBUS ?= 1
7070
CIRCUITPY_PS2IO ?= 1

0 commit comments

Comments
 (0)