Skip to content

Commit 03ed91e

Browse files
shgutteshgutte
authored
Merge branch 'project-chip:master' into bugfix/ble_tx_timeout_issues
2 parents 05c6527 + 21b998a commit 03ed91e

File tree

659 files changed

+52988
-289417
lines changed

Some content is hidden

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

659 files changed

+52988
-289417
lines changed

‎.github/.wordlist.txt

+1
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ GPL
634634
GPLv
635635
Gradle
636636
gradlew
637+
graphviz
637638
Groupcast
638639
GroupId
639640
GroupKeyManagement

‎.github/workflows/darwin-tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
run: |
107107
./scripts/run_in_build_env.sh \
108108
"./scripts/tests/run_test_suite.py \
109+
--runner darwin_framework_tool_python \
109110
--chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
110111
--target-skip-glob '{TestAccessControlConstraints}' \
111112
run \

‎.github/workflows/issue-labeler.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
triage:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: github/issue-labeler@v3.3 #May not be the latest version
14+
- uses: github/issue-labeler@v3.4 #May not be the latest version
1515
with:
1616
configuration-path: .github/issue-labeler.yml
1717
not-before: 2020-01-15T02:54:32Z

‎.github/workflows/kotlin-style.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@v4
2323

2424
- name: "detekt"
25-
uses: natiginfo/action-detekt-all@1.23.4
25+
uses: natiginfo/action-detekt-all@1.23.5
2626
# Detekt seems not to like circular symlinks, so we set up
2727
# explicit paths below
2828
with:

‎.github/workflows/tests.yaml

+25-21
Large diffs are not rendered by default.

‎BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
1717
import("//build_overrides/mbedtls.gni")
1818
import("//build_overrides/nlassert.gni")
19-
import("//build_overrides/nlio.gni")
2019
import("//build_overrides/nlunit_test.gni")
2120
import("//build_overrides/pigweed.gni")
2221

@@ -136,7 +135,6 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
136135
"${chip_root}/src/system",
137136
"${chip_root}/src/transport",
138137
"${nlassert_root}:nlassert",
139-
"${nlio_root}:nlio",
140138
"${nlunit_test_root}:nlunit-test",
141139
]
142140

‎config/esp32/components/chip/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,12 @@ if ((CONFIG_BT_ENABLED) AND (CONFIG_ENABLE_CHIPOBLE))
185185
endif()
186186
endif()
187187

188+
if (CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS)
189+
chip_gn_arg_append("chip_persist_subscriptions" "true")
190+
else()
191+
chip_gn_arg_append("chip_persist_subscriptions" "false")
192+
endif()
193+
188194
if (CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
189195
chip_gn_arg_append("chip_enable_ble_controller" "true")
190196
endif()

‎config/esp32/components/chip/Kconfig

+20
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,13 @@ menu "CHIP Core"
130130
help
131131
Some device types don't require the read client. Enabling this option may save some flash/ram.
132132

133+
config ENABLE_PERSIST_SUBSCRIPTIONS
134+
bool "Enable persist subscriptions"
135+
default y
136+
help
137+
Enable persist subscriptions to make the device resume the subscriptions from the persist
138+
subscriptions information after reboot.
139+
133140
config BUILD_CHIP_TESTS
134141
bool "Build CHIP tests"
135142
default n
@@ -202,6 +209,13 @@ menu "CHIP Core"
202209
help
203210
Enable this option to use LwIP default IPv6 route hook for Route Information Option(RIO) feature.
204211

212+
config ENABLE_ENDPOINT_QUEUE_FILTER
213+
bool "Enable UDP Endpoint queue filter for mDNS Broadcast packets"
214+
depends on USE_MINIMAL_MDNS
215+
default y
216+
help
217+
Enable this option to start a UDP Endpoint queue filter for mDNS Broadcast packets
218+
205219
config ENABLE_LWIP_THREAD_SAFETY
206220
bool "Enable LwIP Thread safety options"
207221
default y
@@ -1038,6 +1052,12 @@ menu "CHIP Device Layer"
10381052

10391053
endmenu
10401054

1055+
config CHIP_ENABLE_BDX_LOG_TRANSFER
1056+
bool "Enable BDX log transfer"
1057+
default n
1058+
help
1059+
Enables the BDX protocol for diagnostics log transfer
1060+
10411061
menu "Matter OTA Image"
10421062

10431063
config CHIP_OTA_IMAGE_BUILD

‎config/telink/chip-module/Kconfig

+4
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ config CHIP_ENABLE_POWER_ON_FACTORY_RESET
216216
first 5 seconds after power on and this sequence repeated 5 times - factory
217217
reset will be involved.
218218

219+
config CHIP_TASK_STACK_SIZE
220+
int
221+
default 8192
222+
219223
config CHIP_USE_MARS_SENSOR
220224
bool "Use Mars board sensor"
221225
depends on SOC_SERIES_RISCV_TELINK_B9X && (BOARD_TLSR9518ADK80D || BOARD_TLSR9518ADK80D_RETENTION)

‎config/telink/chip-module/Kconfig.defaults

+4-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ config SETTINGS_NVS_SECTOR_SIZE_MULT
211211

212212
# Set sector counter of NVS
213213
config SETTINGS_NVS_SECTOR_COUNT
214-
default 10
214+
default 12
215215

216216
# Enable OpenThread
217217

@@ -329,4 +329,7 @@ config PWM_SHELL
329329
config OPENTHREAD_SHELL
330330
default n
331331

332+
config CHIP_TASK_STACK_SIZE
333+
default 4864 if PM
334+
332335
endif

‎docs/clusters.md

+2
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,14 @@ Generally regenerate using one of:
7777
| 114 | 0x72 | ActivatedCarbonFilterMonitoring |
7878
| 128 | 0x80 | BooleanStateConfiguration |
7979
| 129 | 0x81 | ValveConfigurationAndControl |
80+
| 144 | 0x90 | ElectricalPowerMeasurement |
8081
| 145 | 0x91 | ElectricalEnergyMeasurement |
8182
| 150 | 0x96 | DemandResponseLoadControl |
8283
| 151 | 0x97 | Messages |
8384
| 152 | 0x98 | DeviceEnergyManagement |
8485
| 153 | 0x99 | EnergyEvse |
8586
| 155 | 0x9B | EnergyPreference |
87+
| 156 | 0x9C | PowerTopology |
8688
| 157 | 0x9D | EnergyEvseMode |
8789
| 159 | 0x9F | DeviceEnergyManagementMode |
8890
| 257 | 0x101 | DoorLock |

‎docs/guides/BUILDING.md

+27
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,33 @@ Complete the following steps:
9494
9595
1. Reboot your Raspberry Pi after installing `pi-bluetooth`.
9696
97+
#### Enable experimental Bluetooth support in BlueZ
98+
99+
The Matter application on Linux uses BlueZ to communicate with the Bluetooth
100+
controller. The BlueZ version that comes with Ubuntu 22.04 does not support all
101+
the features required by the Matter application by default. To enable these
102+
features, you need to enable experimental Bluetooth support in BlueZ.
103+
104+
1. Edit the `bluetooth.service` unit by running the following command:
105+
106+
```sh
107+
sudo systemctl edit bluetooth.service
108+
```
109+
110+
1. Add the following content to the override file:
111+
112+
```ini
113+
[Service]
114+
ExecStart=
115+
ExecStart=/usr/lib/bluetooth/bluetoothd -E
116+
```
117+
118+
1. Restart the Bluetooth service by running the following command:
119+
120+
```sh
121+
sudo systemctl restart bluetooth.service
122+
```
123+
97124
#### Configuring wpa_supplicant for storing permanent changes
98125
99126
By default, wpa_supplicant is not allowed to update (overwrite) configuration.

0 commit comments

Comments
 (0)