Skip to content

Commit b88fb47

Browse files
DogushCDogushC
authored
Merge branch 'espressif:master' into master
2 parents 32396bf + 2a2b81a commit b88fb47

File tree

8 files changed

+63
-14
lines changed

8 files changed

+63
-14
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Arduino ESP32 Gitter Channel
4-
url: https://gitter.im/espressif/arduino-esp32
5-
about: Community channel for questions and help
3+
- name: Arduino Core for Espressif Discord Server
4+
url: https://discord.gg/8xY6e9crwv
5+
about: Community Discord server for questions and help
66
- name: ESP32 Forum - Arduino
77
url: https://esp32.com/viewforum.php?f=19
88
about: Official Forum for questions

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
[![External Libraries Test](https://img.shields.io/github/actions/workflow/status/espressif/arduino-esp32/lib.yml?branch=master&event=schedule&label=External%20Libraries%20Test)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md)
66
[![Runtime Tests](https://github.com/espressif/arduino-esp32/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
77

8-
### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
8+
### Need help or have a question? Join the chat at [Discord](https://discord.gg/8xY6e9crwv) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
9+
10+
[![Discord invite](https://img.shields.io/discord/1327272229427216425?logo=discord&logoColor=white&logoSize=auto&label=Discord)](https://discord.gg/8xY6e9crwv)
911

1012
## Contents
1113

‎boards.txt

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -450,15 +450,24 @@ esp32h2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
450450
#esp32h2.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
451451
#esp32h2.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
452452
#esp32h2.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
453-
esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
454-
esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee
455-
esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
456453
esp32h2.menu.PartitionScheme.zigbee_2MB=Zigbee 2MB with spiffs
457454
esp32h2.menu.PartitionScheme.zigbee_2MB.build.partitions=zigbee_2MB
458455
esp32h2.menu.PartitionScheme.zigbee_2MB.upload.maximum_size=1310720
456+
esp32h2.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
457+
esp32h2.menu.PartitionScheme.zigbee.build.partitions=zigbee
458+
esp32h2.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
459+
esp32h2.menu.PartitionScheme.zigbee_8MB=Zigbee 8MB with spiffs
460+
esp32h2.menu.PartitionScheme.zigbee_8MB.build.partitions=zigbee_8MB
461+
esp32h2.menu.PartitionScheme.zigbee_8MB.upload.maximum_size=3407872
462+
esp32h2.menu.PartitionScheme.zigbee_zczr_2MB=Zigbee ZCZR 2MB with spiffs
463+
esp32h2.menu.PartitionScheme.zigbee_zczr_2MB.build.partitions=zigbee_zczr_2MB
464+
esp32h2.menu.PartitionScheme.zigbee_zczr_2MB.upload.maximum_size=1310720
459465
esp32h2.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
460466
esp32h2.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
461467
esp32h2.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
468+
esp32h2.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
469+
esp32h2.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
470+
esp32h2.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
462471
esp32h2.menu.PartitionScheme.custom=Custom
463472
esp32h2.menu.PartitionScheme.custom.build.partitions=
464473
esp32h2.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -645,15 +654,24 @@ esp32c6.menu.PartitionScheme.rainmaker_4MB.upload.maximum_size=4038656
645654
esp32c6.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
646655
esp32c6.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
647656
esp32c6.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
648-
esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
649-
esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
650-
esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
651657
esp32c6.menu.PartitionScheme.zigbee_2MB=Zigbee 2MB with spiffs
652658
esp32c6.menu.PartitionScheme.zigbee_2MB.build.partitions=zigbee_2MB
653659
esp32c6.menu.PartitionScheme.zigbee_2MB.upload.maximum_size=1310720
660+
esp32c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
661+
esp32c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
662+
esp32c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
663+
esp32c6.menu.PartitionScheme.zigbee_8MB=Zigbee 8MB with spiffs
664+
esp32c6.menu.PartitionScheme.zigbee_8MB.build.partitions=zigbee_8MB
665+
esp32c6.menu.PartitionScheme.zigbee_8MB.upload.maximum_size=3407872
666+
esp32c6.menu.PartitionScheme.zigbee_zczr_2MB=Zigbee ZCZR 2MB with spiffs
667+
esp32c6.menu.PartitionScheme.zigbee_zczr_2MB.build.partitions=zigbee_zczr_2MB
668+
esp32c6.menu.PartitionScheme.zigbee_zczr_2MB.upload.maximum_size=1310720
654669
esp32c6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
655670
esp32c6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
656671
esp32c6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
672+
esp32c6.menu.PartitionScheme.zigbee_zczr_8MB=Zigbee ZCZR 8MB with spiffs
673+
esp32c6.menu.PartitionScheme.zigbee_zczr_8MB.build.partitions=zigbee_zczr_8MB
674+
esp32c6.menu.PartitionScheme.zigbee_zczr_8MB.upload.maximum_size=3407872
657675
esp32c6.menu.PartitionScheme.custom=Custom
658676
esp32c6.menu.PartitionScheme.custom.build.partitions=
659677
esp32c6.menu.PartitionScheme.custom.upload.maximum_size=16777216

‎docs/en/getting_started.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ Here are some community channels where you may find information and ask for some
102102
- `ESP32 Forum`_: Official Espressif Forum.
103103
- `ESP32 Forum - Arduino`_: Official Espressif Forum for Arduino related discussions.
104104
- `ESP32 Forum - Hardware`_: Official Espressif Forum for Hardware related discussions.
105-
- `Gitter`_
105+
- `Espressif Developer Portal`_: Official Espressif Developer Portal with tutorials, examples, workshops, and more.
106+
- `Arduino Core for Espressif (Discord)`_: Official Espressif Discord channel for the Arduino Core.
106107
- `Espressif MCUs (Discord)`_
107108
- `ESP32 on Reddit`_
108109

@@ -148,12 +149,13 @@ Resources
148149

149150
.. _Espressif Systems: https://www.espressif.com
150151
.. _Espressif Product Selector: https://products.espressif.com/
152+
.. _Espressif Developer Portal: https://developer.espressif.com/
151153
.. _Arduino.cc: https://www.arduino.cc/en/Main/Software
152154
.. _Arduino Reference: https://www.arduino.cc/reference/en/
153155
.. _ESP32 Forum: https://esp32.com
154156
.. _ESP32 Forum - Arduino: https://esp32.com/viewforum.php?f=19
155157
.. _ESP32 Forum - Hardware: https://esp32.com/viewforum.php?f=12
156-
.. _Gitter: https://gitter.im/espressif/arduino-esp32
158+
.. _Arduino Core for Espressif (Discord): https://discord.gg/8xY6e9crwv
157159
.. _Adafruit (Discord): https://discord.gg/adafruit
158-
.. _Espressif MCUs (Discord): https://discord.gg/nKxMTnkD
160+
.. _Espressif MCUs (Discord): https://discord.com/invite/XqnZPbF
159161
.. _ESP32 on Reddit: https://www.reddit.com/r/esp32

‎tools/partitions/zigbee_2MB.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Name, Type, SubType, Offset, Size, Flags
22
nvs, data, nvs, 0x9000, 0x5000,
3-
factory, app, factory, 0x10000, 0x140000,
3+
factory, app, factory, 0x10000, 0x140000,
44
spiffs, data, spiffs, 0x150000,0x9B000,
55
zb_storage, data, fat, 0x1EB000,0x4000,
66
zb_fct, data, fat, 0x1EF000,0x1000,

‎tools/partitions/zigbee_8MB.csv

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xe000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0x340000,
5+
app1, app, ota_1, 0x350000,0x340000,
6+
spiffs, data, spiffs, 0x690000,0x15B000,
7+
zb_storage, data, fat, 0x7EB000,0x4000,
8+
zb_fct, data, fat, 0x7EF000,0x1000,
9+
coredump, data, coredump,0x7F0000,0x10000,

‎tools/partitions/zigbee_zczr_2MB.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
factory, app, factory, 0x10000, 0x140000,
4+
spiffs, data, spiffs, 0x150000,0x9A000,
5+
zb_storage, data, fat, 0x1EA000,0x4000,
6+
zb_fct, data, fat, 0x1EE000,0x1000,
7+
rcp_fw, data, spiffs, 0x1EF000,0x1000,
8+
coredump, data, coredump,0x1F0000,0x10000,

‎tools/partitions/zigbee_zczr_8MB.csv

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xe000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0x340000,
5+
app1, app, ota_1, 0x350000,0x340000,
6+
spiffs, data, spiffs, 0x690000,0x15A000,
7+
zb_storage, data, fat, 0x7EA000,0x4000,
8+
zb_fct, data, fat, 0x7EE000,0x1000,
9+
rcp_fw, data, spiffs, 0x7EF000,0x1000,
10+
coredump, data, coredump,0x7F0000,0x10000,

0 commit comments

Comments
 (0)