From b7d4624297ae6bab2a84d30b930c52f95d3a296c Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 7 Nov 2023 11:07:06 +0100 Subject: [PATCH 1/4] add zigbee+zboss to idf_components.yml --- idf_component.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/idf_component.yml b/idf_component.yml index c19e8ec8a93..8caf32d1aa8 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -27,3 +27,5 @@ dependencies: idf: ">=5.1" mdns: "^1.1.0" chmorgan/esp-libhelix-mp3: "1.0.3" + espressif/esp-zboss-lib: "^1.0.1" + espressif/esp-zigbee-lib: "^1.0.1" \ No newline at end of file From 5e59f1c6a00c5719e762d2f6f977d4f59fbf4ec4 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 7 Nov 2023 11:07:25 +0100 Subject: [PATCH 2/4] add zigbee partitions --- tools/partitions/zigbee.csv | 9 +++++++++ tools/partitions/zigbee_zczr.csv | 10 ++++++++++ 2 files changed, 19 insertions(+) create mode 100644 tools/partitions/zigbee.csv create mode 100644 tools/partitions/zigbee_zczr.csv diff --git a/tools/partitions/zigbee.csv b/tools/partitions/zigbee.csv new file mode 100644 index 00000000000..0c899f52ed2 --- /dev/null +++ b/tools/partitions/zigbee.csv @@ -0,0 +1,9 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +app0, app, ota_0, 0x10000, 0x140000, +app1, app, ota_1, 0x150000,0x140000, +spiffs, data, spiffs, 0x290000,0x15B000, +zb_storage, data, fat, 0x3EB000,0x4000, +zb_fct, data, fat, 0x3EF000,0x1000, +coredump, data, coredump,0x3F0000,0x10000, \ No newline at end of file diff --git a/tools/partitions/zigbee_zczr.csv b/tools/partitions/zigbee_zczr.csv new file mode 100644 index 00000000000..984bf0d081f --- /dev/null +++ b/tools/partitions/zigbee_zczr.csv @@ -0,0 +1,10 @@ +# Name, Type, SubType, Offset, Size, Flags +nvs, data, nvs, 0x9000, 0x5000, +otadata, data, ota, 0xe000, 0x2000, +app0, app, ota_0, 0x10000, 0x140000, +app1, app, ota_1, 0x150000,0x140000, +spiffs, data, spiffs, 0x28F000,0x15A000, +zb_storage, data, fat, 0x3EA000,0x4000, +zb_fct, data, fat, 0x3EE000,0x1000, +rcp_fw, data, spiffs, 0x3EF000,0x1000, +coredump, data, coredump,0x3F0000,0x10000, \ No newline at end of file From 59d127d1ca5300c7a36b2b14ef0231a9476a8abf Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 7 Nov 2023 11:08:12 +0100 Subject: [PATCH 3/4] created zigbee mode in tools menu to link proper libs --- boards.txt | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++ platform.txt | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index 1671ec6963d..95f7bcf311a 100644 --- a/boards.txt +++ b/boards.txt @@ -17,6 +17,7 @@ menu.EventsCore=Events Run On menu.MemoryType=Memory Type menu.EraseFlash=Erase All Flash Before Sketch Upload menu.JTAGAdapter=JTAG Adapter +menu.Zigbee=Zigbee Mode # Custom options menu.Revision=Board Revision @@ -122,6 +123,12 @@ esp32h2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 esp32h2.menu.PartitionScheme.rainmaker=RainMaker esp32h2.menu.PartitionScheme.rainmaker.build.partitions=rainmaker esp32h2.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728 +esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs +esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee +esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720 +esp32h2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs +esp32h2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr +esp32h2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720 esp32h2.menu.PartitionScheme.custom=Custom esp32h2.menu.PartitionScheme.custom.build.partitions= esp32h2.menu.PartitionScheme.custom.upload.maximum_size=16777216 @@ -187,6 +194,20 @@ esp32h2.menu.EraseFlash.none.upload.erase_cmd= esp32h2.menu.EraseFlash.all=Enabled esp32h2.menu.EraseFlash.all.upload.erase_cmd=-e +esp32h2.menu.Zigbee.default=Disabled +esp32h2.menu.Zigbee.default.build.zigbee_mode= +esp32h2.menu.Zigbee.default.build.extra_libs= +esp32h2.menu.Zigbee.ed=Zigbee ED (end device) +esp32h2.menu.Zigbee.ed.build.zigbee_mode=-DZIGBEE_MODE_ED +esp32h2.menu.Zigbee.ed.build.extra_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port +esp32h2.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) +esp32h2.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32h2.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32h2.menu.Zigbee.rcp=Zigbee RCP (radio co-processor) +esp32h2.menu.Zigbee.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP +esp32h2.menu.Zigbee.rcp.build.extra_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port + + ############################################################## esp32c6.name=ESP32C6 Dev Module @@ -281,6 +302,12 @@ esp32c6.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 esp32c6.menu.PartitionScheme.rainmaker=RainMaker esp32c6.menu.PartitionScheme.rainmaker.build.partitions=rainmaker esp32c6.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728 +esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs +esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee +esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720 +esp32c6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs +esp32c6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr +esp32c6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720 esp32c6.menu.PartitionScheme.custom=Custom esp32c6.menu.PartitionScheme.custom.build.partitions= esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216 @@ -352,6 +379,19 @@ esp32c6.menu.EraseFlash.none.upload.erase_cmd= esp32c6.menu.EraseFlash.all=Enabled esp32c6.menu.EraseFlash.all.upload.erase_cmd=-e +esp32c6.menu.Zigbee.default=Disabled +esp32c6.menu.Zigbee.default.build.zigbee_mode= +esp32c6.menu.Zigbee.default.build.extra_libs= +esp32c6.menu.Zigbee.ed=Zigbee ED (end device) +esp32c6.menu.Zigbee.ed.build.zigbee_mode=-DZIGBEE_MODE_ED +esp32c6.menu.Zigbee.ed.build.extra_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port +esp32c6.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) +esp32c6.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32c6.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32c6.menu.Zigbee.rcp=Zigbee RCP (radio co-processor) +esp32c6.menu.Zigbee.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP +esp32c6.menu.Zigbee.rcp.build.extra_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port + ############################################################## esp32s3.name=ESP32S3 Dev Module @@ -538,6 +578,9 @@ esp32s3.menu.PartitionScheme.esp_sr_16=ESP SR 16M (3MB APP/7MB SPIFFS/2.9MB MODE esp32s3.menu.PartitionScheme.esp_sr_16.upload.maximum_size=3145728 esp32s3.menu.PartitionScheme.esp_sr_16.upload.extra_flags=0xD10000 {build.path}/srmodels.bin esp32s3.menu.PartitionScheme.esp_sr_16.build.partitions=esp_sr_16 +esp32s3.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs +esp32s3.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr +esp32s3.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720 esp32s3.menu.PartitionScheme.custom=Custom esp32s3.menu.PartitionScheme.custom.build.partitions= esp32s3.menu.PartitionScheme.custom.upload.maximum_size=16777216 @@ -588,6 +631,13 @@ esp32s3.menu.EraseFlash.none.upload.erase_cmd= esp32s3.menu.EraseFlash.all=Enabled esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e +esp32s3.menu.Zigbee.default=Disabled +esp32s3.menu.Zigbee.default.build.zigbee_mode= +esp32s3.menu.Zigbee.default.build.extra_libs= +esp32s3.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) +esp32s3.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32s3.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port + ############################################################## esp32c3.name=ESP32C3 Dev Module @@ -682,6 +732,9 @@ esp32c3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 esp32c3.menu.PartitionScheme.rainmaker=RainMaker esp32c3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker esp32c3.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728 +esp32c3.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs +esp32c3.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr +esp32c3.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720 esp32c3.menu.PartitionScheme.custom=Custom esp32c3.menu.PartitionScheme.custom.build.partitions= esp32c3.menu.PartitionScheme.custom.upload.maximum_size=16777216 @@ -753,6 +806,12 @@ esp32c3.menu.EraseFlash.none.upload.erase_cmd= esp32c3.menu.EraseFlash.all=Enabled esp32c3.menu.EraseFlash.all.upload.erase_cmd=-e +esp32c3.menu.Zigbee.default=Disabled +esp32c3.menu.Zigbee.default.build.zigbee_mode= +esp32c3.menu.Zigbee.default.build.extra_libs= +esp32c3.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) +esp32c3.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32c3.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port ############################################################## esp32s2.name=ESP32S2 Dev Module @@ -868,6 +927,9 @@ esp32s2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 esp32s2.menu.PartitionScheme.rainmaker=RainMaker esp32s2.menu.PartitionScheme.rainmaker.build.partitions=rainmaker esp32s2.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728 +esp32s2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs +esp32s2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr +esp32s2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720 esp32s2.menu.PartitionScheme.custom=Custom esp32s2.menu.PartitionScheme.custom.build.partitions= esp32s2.menu.PartitionScheme.custom.upload.maximum_size=16777216 @@ -941,6 +1003,13 @@ esp32s2.menu.EraseFlash.none.upload.erase_cmd= esp32s2.menu.EraseFlash.all=Enabled esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e +esp32s2.menu.Zigbee.default=Disabled +esp32s2.menu.Zigbee.default.build.zigbee_mode= +esp32s2.menu.Zigbee.default.build.extra_libs= +esp32s2.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) +esp32s2.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32s2.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port + ############################################################## esp32.name=ESP32 Dev Module @@ -1031,6 +1100,9 @@ esp32.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728 esp32.menu.PartitionScheme.rainmaker=RainMaker esp32.menu.PartitionScheme.rainmaker.build.partitions=rainmaker esp32.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728 +esp32.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs +esp32.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr +esp32.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720 esp32.menu.PartitionScheme.custom=Custom esp32.menu.PartitionScheme.custom.build.partitions= esp32.menu.PartitionScheme.custom.upload.maximum_size=16777216 @@ -1118,6 +1190,13 @@ esp32.menu.EraseFlash.none.upload.erase_cmd= esp32.menu.EraseFlash.all=Enabled esp32.menu.EraseFlash.all.upload.erase_cmd=-e +esp32.menu.Zigbee.default=Disabled +esp32.menu.Zigbee.default.build.zigbee_mode= +esp32.menu.Zigbee.default.build.extra_libs= +esp32.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) +esp32.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port + ############################################################## esp32da.name=ESP32-WROOM-DA Module diff --git a/platform.txt b/platform.txt index cd34159372d..2a52917a932 100644 --- a/platform.txt +++ b/platform.txt @@ -98,7 +98,7 @@ build.code_debug=0 build.defines= build.loop_core= build.event_core= -build.extra_flags=-DARDUINO_HOST_OS="{runtime.os}" -DARDUINO_FQBN="{build.fqbn}" -DESP32 -DCORE_DEBUG_LEVEL={build.code_debug} {build.loop_core} {build.event_core} {build.defines} {build.extra_flags.{build.mcu}} +build.extra_flags=-DARDUINO_HOST_OS="{runtime.os}" -DARDUINO_FQBN="{build.fqbn}" -DESP32 -DCORE_DEBUG_LEVEL={build.code_debug} {build.loop_core} {build.event_core} {build.defines} {build.extra_flags.{build.mcu}} {build.zigbee_mode} build.extra_libs= build.memory_type={build.boot}_qspi From d9396acd746d8a845e624e3c704306c165ec8fb0 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Wed, 8 Nov 2023 12:21:09 +0100 Subject: [PATCH 4/4] renamed Zigbee menu and build as suggested --- boards.txt | 98 ++++++++++++++++++++++++++-------------------------- platform.txt | 2 +- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/boards.txt b/boards.txt index 95f7bcf311a..8a8952332a4 100644 --- a/boards.txt +++ b/boards.txt @@ -17,7 +17,7 @@ menu.EventsCore=Events Run On menu.MemoryType=Memory Type menu.EraseFlash=Erase All Flash Before Sketch Upload menu.JTAGAdapter=JTAG Adapter -menu.Zigbee=Zigbee Mode +menu.ZigbeeMode=Zigbee Mode # Custom options menu.Revision=Board Revision @@ -194,18 +194,18 @@ esp32h2.menu.EraseFlash.none.upload.erase_cmd= esp32h2.menu.EraseFlash.all=Enabled esp32h2.menu.EraseFlash.all.upload.erase_cmd=-e -esp32h2.menu.Zigbee.default=Disabled -esp32h2.menu.Zigbee.default.build.zigbee_mode= -esp32h2.menu.Zigbee.default.build.extra_libs= -esp32h2.menu.Zigbee.ed=Zigbee ED (end device) -esp32h2.menu.Zigbee.ed.build.zigbee_mode=-DZIGBEE_MODE_ED -esp32h2.menu.Zigbee.ed.build.extra_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port -esp32h2.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) -esp32h2.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR -esp32h2.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port -esp32h2.menu.Zigbee.rcp=Zigbee RCP (radio co-processor) -esp32h2.menu.Zigbee.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP -esp32h2.menu.Zigbee.rcp.build.extra_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port +esp32h2.menu.ZigbeeMode.default=Disabled +esp32h2.menu.ZigbeeMode.default.build.zigbee_mode= +esp32h2.menu.ZigbeeMode.default.build.zigbee_libs= +esp32h2.menu.ZigbeeMode.ed=Zigbee ED (end device) +esp32h2.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED +esp32h2.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port +esp32h2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator) +esp32h2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32h2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32h2.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor) +esp32h2.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP +esp32h2.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port ############################################################## @@ -379,18 +379,18 @@ esp32c6.menu.EraseFlash.none.upload.erase_cmd= esp32c6.menu.EraseFlash.all=Enabled esp32c6.menu.EraseFlash.all.upload.erase_cmd=-e -esp32c6.menu.Zigbee.default=Disabled -esp32c6.menu.Zigbee.default.build.zigbee_mode= -esp32c6.menu.Zigbee.default.build.extra_libs= -esp32c6.menu.Zigbee.ed=Zigbee ED (end device) -esp32c6.menu.Zigbee.ed.build.zigbee_mode=-DZIGBEE_MODE_ED -esp32c6.menu.Zigbee.ed.build.extra_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port -esp32c6.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) -esp32c6.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR -esp32c6.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port -esp32c6.menu.Zigbee.rcp=Zigbee RCP (radio co-processor) -esp32c6.menu.Zigbee.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP -esp32c6.menu.Zigbee.rcp.build.extra_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port +esp32c6.menu.ZigbeeMode.default=Disabled +esp32c6.menu.ZigbeeMode.default.build.zigbee_mode= +esp32c6.menu.ZigbeeMode.default.build.zigbee_libs= +esp32c6.menu.ZigbeeMode.ed=Zigbee ED (end device) +esp32c6.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED +esp32c6.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port +esp32c6.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator) +esp32c6.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32c6.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32c6.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor) +esp32c6.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP +esp32c6.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port ############################################################## @@ -631,12 +631,12 @@ esp32s3.menu.EraseFlash.none.upload.erase_cmd= esp32s3.menu.EraseFlash.all=Enabled esp32s3.menu.EraseFlash.all.upload.erase_cmd=-e -esp32s3.menu.Zigbee.default=Disabled -esp32s3.menu.Zigbee.default.build.zigbee_mode= -esp32s3.menu.Zigbee.default.build.extra_libs= -esp32s3.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) -esp32s3.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR -esp32s3.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32s3.menu.ZigbeeMode.default=Disabled +esp32s3.menu.ZigbeeMode.default.build.zigbee_mode= +esp32s3.menu.ZigbeeMode.default.build.zigbee_libs= +esp32s3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator) +esp32s3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32s3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port ############################################################## @@ -806,12 +806,12 @@ esp32c3.menu.EraseFlash.none.upload.erase_cmd= esp32c3.menu.EraseFlash.all=Enabled esp32c3.menu.EraseFlash.all.upload.erase_cmd=-e -esp32c3.menu.Zigbee.default=Disabled -esp32c3.menu.Zigbee.default.build.zigbee_mode= -esp32c3.menu.Zigbee.default.build.extra_libs= -esp32c3.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) -esp32c3.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR -esp32c3.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32c3.menu.ZigbeeMode.default=Disabled +esp32c3.menu.ZigbeeMode.default.build.zigbee_mode= +esp32c3.menu.ZigbeeMode.default.build.zigbee_libs= +esp32c3.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator) +esp32c3.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32c3.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port ############################################################## esp32s2.name=ESP32S2 Dev Module @@ -1003,12 +1003,12 @@ esp32s2.menu.EraseFlash.none.upload.erase_cmd= esp32s2.menu.EraseFlash.all=Enabled esp32s2.menu.EraseFlash.all.upload.erase_cmd=-e -esp32s2.menu.Zigbee.default=Disabled -esp32s2.menu.Zigbee.default.build.zigbee_mode= -esp32s2.menu.Zigbee.default.build.extra_libs= -esp32s2.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) -esp32s2.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR -esp32s2.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32s2.menu.ZigbeeMode.default=Disabled +esp32s2.menu.ZigbeeMode.default.build.zigbee_mode= +esp32s2.menu.ZigbeeMode.default.build.zigbee_libs= +esp32s2.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator) +esp32s2.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32s2.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port ############################################################## @@ -1190,12 +1190,12 @@ esp32.menu.EraseFlash.none.upload.erase_cmd= esp32.menu.EraseFlash.all=Enabled esp32.menu.EraseFlash.all.upload.erase_cmd=-e -esp32.menu.Zigbee.default=Disabled -esp32.menu.Zigbee.default.build.zigbee_mode= -esp32.menu.Zigbee.default.build.extra_libs= -esp32.menu.Zigbee.zczr=Zigbee ZCZR (coordinator) -esp32.menu.Zigbee.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR -esp32.menu.Zigbee.zczr.build.extra_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port +esp32.menu.ZigbeeMode.default=Disabled +esp32.menu.ZigbeeMode.default.build.zigbee_mode= +esp32.menu.ZigbeeMode.default.build.zigbee_libs= +esp32.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator) +esp32.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR +esp32.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port ############################################################## diff --git a/platform.txt b/platform.txt index 2a52917a932..d78875bd2ea 100644 --- a/platform.txt +++ b/platform.txt @@ -163,7 +163,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.extra_flags} {c recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}" ## Combine gc-sections, archives, and objects -recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -Wl,--start-group {object_files} "{archive_file_path}" {build.extra_libs} {compiler.c.elf.libs} {compiler.libraries.ldflags} -Wl,--end-group -Wl,-EL -o "{build.path}/{build.project_name}.elf" +recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} -Wl,--start-group {object_files} "{archive_file_path}" {build.extra_libs} {build.zigbee_libs} {compiler.c.elf.libs} {compiler.libraries.ldflags} -Wl,--end-group -Wl,-EL -o "{build.path}/{build.project_name}.elf" ## Create partitions.bin recipe.objcopy.partitions.bin.pattern={tools.gen_esp32part.cmd} -q "{build.path}/partitions.csv" "{build.path}/{build.project_name}.partitions.bin"