Skip to content

Commit 62b6340

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
authored
Merge branch 'master' into feat/zigbee-ias-re-enroll
2 parents 8ae3d70 + 0b6e560 commit 62b6340

File tree

70 files changed

+3613
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3613
-57
lines changed

‎.github/ISSUE_TEMPLATE/Issue-report.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ body:
4343
- latest stable Release (if not listed below)
4444
- latest development Release Candidate (RC-X)
4545
- latest master (checkout manually)
46+
- v3.3.3
4647
- v3.3.2
4748
- v3.3.1
4849
- v3.3.0

‎.gitlab/workflows/common.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ stages:
1313

1414
variables:
1515
ESP_IDF_VERSION: "5.5"
16-
ESP_ARDUINO_VERSION: "3.3.2"
16+
ESP_ARDUINO_VERSION: "3.3.3"
1717

1818
#############
1919
# `default` #

‎boards.txt‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52955,3 +52955,149 @@ soldered_nula_mini_esp32c6.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_
5295552955
soldered_nula_mini_esp32c6.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api.zczr -lzboss_stack.zczr -lzboss_port.native
5295652956

5295752957
##############################################################
52958+
52959+
arduino_nesso_n1.name=Arduino Nesso N1
52960+
52961+
arduino_nesso_n1.bootloader.tool=esptool_py
52962+
arduino_nesso_n1.bootloader.tool.default=esptool_py
52963+
52964+
arduino_nesso_n1.upload.tool=esptool_py
52965+
arduino_nesso_n1.upload.tool.default=esptool_py
52966+
arduino_nesso_n1.upload.tool.network=esp_ota
52967+
52968+
arduino_nesso_n1.upload.maximum_size=1310720
52969+
arduino_nesso_n1.upload.maximum_data_size=327680
52970+
arduino_nesso_n1.upload.flags=
52971+
arduino_nesso_n1.upload.extra_flags=
52972+
arduino_nesso_n1.upload.use_1200bps_touch=false
52973+
arduino_nesso_n1.upload.wait_for_upload_port=false
52974+
52975+
arduino_nesso_n1.serial.disableDTR=false
52976+
arduino_nesso_n1.serial.disableRTS=false
52977+
52978+
arduino_nesso_n1.build.tarch=riscv32
52979+
arduino_nesso_n1.build.target=esp
52980+
arduino_nesso_n1.build.mcu=esp32c6
52981+
arduino_nesso_n1.build.core=esp32
52982+
arduino_nesso_n1.build.variant=arduino_nesso_n1
52983+
arduino_nesso_n1.build.board=ARDUINO_NESSO_N1
52984+
arduino_nesso_n1.build.bootloader_addr=0x0
52985+
52986+
arduino_nesso_n1.build.cdc_on_boot=1
52987+
arduino_nesso_n1.build.f_cpu=160000000L
52988+
arduino_nesso_n1.build.flash_size=16MB
52989+
arduino_nesso_n1.build.flash_freq=80m
52990+
arduino_nesso_n1.build.flash_mode=qio
52991+
arduino_nesso_n1.build.boot=qio
52992+
arduino_nesso_n1.build.partitions=default
52993+
arduino_nesso_n1.build.defines=
52994+
52995+
## IDE 2.0 Seems to not update the value
52996+
arduino_nesso_n1.menu.JTAGAdapter.default=Disabled
52997+
arduino_nesso_n1.menu.JTAGAdapter.default.build.copy_jtag_files=0
52998+
arduino_nesso_n1.menu.JTAGAdapter.builtin=Integrated USB JTAG
52999+
arduino_nesso_n1.menu.JTAGAdapter.builtin.build.openocdscript=esp32c6-builtin.cfg
53000+
arduino_nesso_n1.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
53001+
arduino_nesso_n1.menu.JTAGAdapter.external=FTDI Adapter
53002+
arduino_nesso_n1.menu.JTAGAdapter.external.build.openocdscript=esp32c6-ftdi.cfg
53003+
arduino_nesso_n1.menu.JTAGAdapter.external.build.copy_jtag_files=1
53004+
arduino_nesso_n1.menu.JTAGAdapter.bridge=ESP USB Bridge
53005+
arduino_nesso_n1.menu.JTAGAdapter.bridge.build.openocdscript=esp32c6-bridge.cfg
53006+
arduino_nesso_n1.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
53007+
53008+
arduino_nesso_n1.menu.CDCOnBoot.default=Enabled
53009+
arduino_nesso_n1.menu.CDCOnBoot.default.build.cdc_on_boot=1
53010+
arduino_nesso_n1.menu.CDCOnBoot.cdc=Disabled
53011+
arduino_nesso_n1.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
53012+
53013+
arduino_nesso_n1.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
53014+
arduino_nesso_n1.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
53015+
arduino_nesso_n1.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
53016+
arduino_nesso_n1.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
53017+
arduino_nesso_n1.menu.PartitionScheme.default.build.partitions=default
53018+
arduino_nesso_n1.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
53019+
arduino_nesso_n1.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
53020+
arduino_nesso_n1.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
53021+
arduino_nesso_n1.menu.PartitionScheme.no_ota.build.partitions=no_ota
53022+
arduino_nesso_n1.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
53023+
arduino_nesso_n1.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
53024+
arduino_nesso_n1.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
53025+
arduino_nesso_n1.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
53026+
arduino_nesso_n1.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
53027+
arduino_nesso_n1.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
53028+
arduino_nesso_n1.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
53029+
arduino_nesso_n1.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
53030+
arduino_nesso_n1.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
53031+
arduino_nesso_n1.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
53032+
arduino_nesso_n1.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
53033+
arduino_nesso_n1.menu.PartitionScheme.huge_app.build.partitions=huge_app
53034+
arduino_nesso_n1.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
53035+
arduino_nesso_n1.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
53036+
arduino_nesso_n1.menu.PartitionScheme.zigbee.build.partitions=zigbee
53037+
arduino_nesso_n1.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
53038+
arduino_nesso_n1.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
53039+
arduino_nesso_n1.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
53040+
arduino_nesso_n1.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
53041+
53042+
arduino_nesso_n1.menu.CPUFreq.160=160MHz (WiFi)
53043+
arduino_nesso_n1.menu.CPUFreq.160.build.f_cpu=160000000L
53044+
arduino_nesso_n1.menu.CPUFreq.80=80MHz (WiFi)
53045+
arduino_nesso_n1.menu.CPUFreq.80.build.f_cpu=80000000L
53046+
arduino_nesso_n1.menu.CPUFreq.40=40MHz
53047+
arduino_nesso_n1.menu.CPUFreq.40.build.f_cpu=40000000L
53048+
arduino_nesso_n1.menu.CPUFreq.20=20MHz
53049+
arduino_nesso_n1.menu.CPUFreq.20.build.f_cpu=20000000L
53050+
arduino_nesso_n1.menu.CPUFreq.10=10MHz
53051+
arduino_nesso_n1.menu.CPUFreq.10.build.f_cpu=10000000L
53052+
53053+
arduino_nesso_n1.menu.FlashMode.qio=QIO
53054+
arduino_nesso_n1.menu.FlashMode.qio.build.flash_mode=dio
53055+
arduino_nesso_n1.menu.FlashMode.qio.build.boot=qio
53056+
arduino_nesso_n1.menu.FlashMode.dio=DIO
53057+
arduino_nesso_n1.menu.FlashMode.dio.build.flash_mode=dio
53058+
arduino_nesso_n1.menu.FlashMode.dio.build.boot=dio
53059+
53060+
arduino_nesso_n1.menu.UploadSpeed.921600=921600
53061+
arduino_nesso_n1.menu.UploadSpeed.921600.upload.speed=921600
53062+
arduino_nesso_n1.menu.UploadSpeed.115200=115200
53063+
arduino_nesso_n1.menu.UploadSpeed.115200.upload.speed=115200
53064+
arduino_nesso_n1.menu.UploadSpeed.256000.windows=256000
53065+
arduino_nesso_n1.menu.UploadSpeed.256000.upload.speed=256000
53066+
arduino_nesso_n1.menu.UploadSpeed.230400.windows.upload.speed=256000
53067+
arduino_nesso_n1.menu.UploadSpeed.230400=230400
53068+
arduino_nesso_n1.menu.UploadSpeed.230400.upload.speed=230400
53069+
arduino_nesso_n1.menu.UploadSpeed.460800.linux=460800
53070+
arduino_nesso_n1.menu.UploadSpeed.460800.macosx=460800
53071+
arduino_nesso_n1.menu.UploadSpeed.460800.upload.speed=460800
53072+
arduino_nesso_n1.menu.UploadSpeed.512000.windows=512000
53073+
arduino_nesso_n1.menu.UploadSpeed.512000.upload.speed=512000
53074+
53075+
arduino_nesso_n1.menu.DebugLevel.none=None
53076+
arduino_nesso_n1.menu.DebugLevel.none.build.code_debug=0
53077+
arduino_nesso_n1.menu.DebugLevel.error=Error
53078+
arduino_nesso_n1.menu.DebugLevel.error.build.code_debug=1
53079+
arduino_nesso_n1.menu.DebugLevel.warn=Warn
53080+
arduino_nesso_n1.menu.DebugLevel.warn.build.code_debug=2
53081+
arduino_nesso_n1.menu.DebugLevel.info=Info
53082+
arduino_nesso_n1.menu.DebugLevel.info.build.code_debug=3
53083+
arduino_nesso_n1.menu.DebugLevel.debug=Debug
53084+
arduino_nesso_n1.menu.DebugLevel.debug.build.code_debug=4
53085+
arduino_nesso_n1.menu.DebugLevel.verbose=Verbose
53086+
arduino_nesso_n1.menu.DebugLevel.verbose.build.code_debug=5
53087+
53088+
arduino_nesso_n1.menu.EraseFlash.none=Disabled
53089+
arduino_nesso_n1.menu.EraseFlash.none.upload.erase_cmd=
53090+
arduino_nesso_n1.menu.EraseFlash.all=Enabled
53091+
arduino_nesso_n1.menu.EraseFlash.all.upload.erase_cmd=-e
53092+
53093+
arduino_nesso_n1.menu.ZigbeeMode.default=Disabled
53094+
arduino_nesso_n1.menu.ZigbeeMode.default.build.zigbee_mode=
53095+
arduino_nesso_n1.menu.ZigbeeMode.default.build.zigbee_libs=
53096+
arduino_nesso_n1.menu.ZigbeeMode.ed=Zigbee ED (end device)
53097+
arduino_nesso_n1.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
53098+
arduino_nesso_n1.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api.ed -lzboss_stack.ed -lzboss_port.native
53099+
arduino_nesso_n1.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
53100+
arduino_nesso_n1.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
53101+
arduino_nesso_n1.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api.zczr -lzboss_stack.zczr -lzboss_port.native
53102+
53103+
##############################################################

‎cores/esp32/esp_arduino_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern "C" {
2323
/** Minor version number (x.X.x) */
2424
#define ESP_ARDUINO_VERSION_MINOR 3
2525
/** Patch version number (x.x.X) */
26-
#define ESP_ARDUINO_VERSION_PATCH 2
26+
#define ESP_ARDUINO_VERSION_PATCH 3
2727

2828
/**
2929
* Macro to convert ARDUINO version number into an integer

‎docs/conf_common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Used for substituting variables in the documentation
66
rst_prolog = """
7-
.. |version| replace:: 3.3.2
7+
.. |version| replace:: 3.3.3
88
.. |idf_version| replace:: 5.5
99
"""
1010

‎docs/en/libraries.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,17 @@ The Arduino ESP32 offers some unique APIs, described in this section:
9292

9393
api/*
9494

95+
Matter APIs
96+
-----------
97+
98+
.. toctree::
99+
:maxdepth: 1
100+
:glob:
101+
102+
matter/matter
103+
matter/matter_ep
104+
matter/ep_*
105+
95106
Zigbee APIs
96107
-----------
97108

0 commit comments

Comments
 (0)