Skip to content

Commit 45ee941

Browse files
raul-marquez-csaraul-marquez-csa
authored
Merge branch 'master' into YAML-Updates-2-23-2024
2 parents 3968c0a + bd42fb7 commit 45ee941

File tree

23 files changed

+536
-21
lines changed

23 files changed

+536
-21
lines changed

‎config/nrfconnect/chip-gn/.gn

+10
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import("//build_overrides/build.gni")
1616
import("//build_overrides/chip.gni")
17+
import("//build_overrides/pigweed.gni")
1718

1819
# The location of the build configuration file.
1920
buildconfig = "${build_root}/config/BUILDCONFIG.gn"
@@ -25,5 +26,14 @@ default_args = {
2526
target_cpu = "arm"
2627
target_os = "zephyr"
2728

29+
pw_sys_io_BACKEND = dir_pw_sys_io_stdio
30+
pw_assert_BACKEND = dir_pw_assert_log
31+
pw_log_BACKEND = dir_pw_log_basic
32+
33+
pw_build_LINK_DEPS = [
34+
"$dir_pw_assert:impl",
35+
"$dir_pw_log:impl",
36+
]
37+
2838
import("${chip_root}/config/nrfconnect/chip-gn/args.gni")
2939
}

‎docs/cluster_and_device_type_dev/img/cluster_commands.png

273 KB
Loading

‎examples/light-switch-app/light-switch-common/light-switch-app.matter

+1
Original file line numberDiff line numberDiff line change
@@ -2628,6 +2628,7 @@ endpoint 0 {
26282628
ram attribute clusterRevision default = 1;
26292629

26302630
handle command RetrieveLogsRequest;
2631+
handle command RetrieveLogsResponse;
26312632
}
26322633

26332634
server cluster GeneralDiagnostics {

‎examples/light-switch-app/light-switch-common/light-switch-app.zap

+26
Original file line numberDiff line numberDiff line change
@@ -1581,6 +1581,14 @@
15811581
"source": "client",
15821582
"isIncoming": 1,
15831583
"isEnabled": 1
1584+
},
1585+
{
1586+
"name": "RetrieveLogsResponse",
1587+
"code": 1,
1588+
"mfgCode": null,
1589+
"source": "server",
1590+
"isIncoming": 0,
1591+
"isEnabled": 1
15841592
}
15851593
],
15861594
"attributes": [
@@ -4605,6 +4613,24 @@
46054613
"define": "IDENTIFY_CLUSTER",
46064614
"side": "client",
46074615
"enabled": 1,
4616+
"commands": [
4617+
{
4618+
"name": "Identify",
4619+
"code": 0,
4620+
"mfgCode": null,
4621+
"source": "client",
4622+
"isIncoming": 0,
4623+
"isEnabled": 1
4624+
},
4625+
{
4626+
"name": "TriggerEffect",
4627+
"code": 64,
4628+
"mfgCode": null,
4629+
"source": "client",
4630+
"isIncoming": 0,
4631+
"isEnabled": 1
4632+
}
4633+
],
46084634
"attributes": [
46094635
{
46104636
"name": "ClusterRevision",

‎examples/lock-app/lock-common/lock-app.matter

+1
Original file line numberDiff line numberDiff line change
@@ -2663,6 +2663,7 @@ endpoint 0 {
26632663
ram attribute clusterRevision default = 1;
26642664

26652665
handle command RetrieveLogsRequest;
2666+
handle command RetrieveLogsResponse;
26662667
}
26672668

26682669
server cluster GeneralDiagnostics {

‎examples/lock-app/lock-common/lock-app.zap

+8
Original file line numberDiff line numberDiff line change
@@ -2126,6 +2126,14 @@
21262126
"source": "client",
21272127
"isIncoming": 1,
21282128
"isEnabled": 1
2129+
},
2130+
{
2131+
"name": "RetrieveLogsResponse",
2132+
"code": 1,
2133+
"mfgCode": null,
2134+
"source": "server",
2135+
"isIncoming": 0,
2136+
"isEnabled": 1
21292137
}
21302138
],
21312139
"attributes": [

‎examples/thermostat/thermostat-common/thermostat.matter

+1
Original file line numberDiff line numberDiff line change
@@ -2240,6 +2240,7 @@ endpoint 0 {
22402240
ram attribute clusterRevision default = 1;
22412241

22422242
handle command RetrieveLogsRequest;
2243+
handle command RetrieveLogsResponse;
22432244
}
22442245

22452246
server cluster GeneralDiagnostics {

‎examples/thermostat/thermostat-common/thermostat.zap

+8
Original file line numberDiff line numberDiff line change
@@ -1707,6 +1707,14 @@
17071707
"source": "client",
17081708
"isIncoming": 1,
17091709
"isEnabled": 1
1710+
},
1711+
{
1712+
"name": "RetrieveLogsResponse",
1713+
"code": 1,
1714+
"mfgCode": null,
1715+
"source": "server",
1716+
"isIncoming": 0,
1717+
"isEnabled": 1
17101718
}
17111719
],
17121720
"attributes": [

‎scripts/setup/constraints.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ghapi==1.0.3
9898
# via -r requirements.memory.txt
9999
humanfriendly==10.0
100100
# via coloredlogs
101-
idf-component-manager==1.2.2
101+
idf-component-manager==1.5.2
102102
# via -r requirements.esp32.txt
103103
idna==3.4
104104
# via requests

‎scripts/tools/check_includes_config.py

+3
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@
160160
'src/tracing/json/json_tracing.cpp': {'string', 'sstream'},
161161
'src/tracing/json/json_tracing.h': {'fstream', 'unordered_map'},
162162

163+
# esp32 tracing
164+
'src/tracing/esp32_trace/esp32_tracing.h': {'unordered_map'},
165+
163166
# Not intended for embedded clients
164167
'src/app/PendingResponseTrackerImpl.h': {'unordered_set'},
165168

‎src/BUILD.gn

+2-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ if (chip_build_tests) {
143143
if (chip_monolithic_tests) {
144144
# TODO [PW_MIGRATION] Remove this if after migartion to PW_TEST is completed for all platforms
145145
# TODO [PW_MIGRATION] There will be a list of already migrated platforms
146-
if (chip_device_platform == "esp32") {
146+
if (chip_device_platform == "esp32" ||
147+
chip_device_platform == "nrfconnect") {
147148
deps += [ "${chip_root}/src/lib/support:pw_tests_wrapper" ]
148149
}
149150
build_monolithic_library = true

‎src/app/CommandHandler.cpp

+11-1
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,17 @@ void CommandHandler::AddStatus(const ConcreteCommandPath & aCommandPath, const P
595595
{
596596
// Return early in case of requests targeted to a group, since they should not add a response.
597597
VerifyOrReturn(!IsGroupRequest());
598-
VerifyOrDie(FallibleAddStatus(aCommandPath, aStatus, context) == CHIP_NO_ERROR);
598+
599+
CHIP_ERROR error = FallibleAddStatus(aCommandPath, aStatus, context);
600+
601+
if (error != CHIP_NO_ERROR)
602+
{
603+
ChipLogError(DataManagement, "Failed to add command status: %" CHIP_ERROR_FORMAT, error.Format());
604+
605+
// Do not crash if the status has not been added due to running out of packet buffers or other resources.
606+
// It is better to drop a single response than to go offline and lose all sessions and subscriptions.
607+
VerifyOrDie(error == CHIP_ERROR_NO_MEMORY);
608+
}
599609
}
600610

601611
CHIP_ERROR CommandHandler::FallibleAddStatus(const ConcreteCommandPath & path, const Protocols::InteractionModel::Status status,

‎src/app/zap-templates/zcl/data-model/chip/matter-devices.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ limitations under the License.
7474
<requireAttribute>ACTIVE_LOCALE</requireAttribute>
7575
<requireAttribute>SUPPORTED_LOCALES</requireAttribute>
7676
</include>
77-
<include cluster="Time Format Localization" client="false" server="true" clientLocked="true" serverLocked="false">
77+
<include cluster="Time Format Localization" client="false" server="false" clientLocked="true" serverLocked="false">
7878
<requireAttribute>HOUR_FORMAT</requireAttribute>
7979
</include>
80-
<include cluster="Unit Localization" client="false" server="true" clientLocked="true" serverLocked="false"></include>
80+
<include cluster="Unit Localization" client="false" server="false" clientLocked="true" serverLocked="false"></include>
8181
<include cluster="General Diagnostics" client="false" server="true" clientLocked="true" serverLocked="true">
8282
<requireAttribute>UP_TIME</requireAttribute>
8383
</include>
@@ -1417,7 +1417,6 @@ limitations under the License.
14171417
<requireAttribute>IDENTIFY_TYPE</requireAttribute>
14181418
<requireCommand>Identify</requireCommand>
14191419
<requireCommand>IdentifyQuery</requireCommand>
1420-
<requireCommand>TriggerEffect</requireCommand>
14211420
</include>
14221421
<include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
14231422
<requireAttribute>DEVICE_TYPE_LIST</requireAttribute>
@@ -1475,7 +1474,6 @@ limitations under the License.
14751474
<requireAttribute>IDENTIFY_TYPE</requireAttribute>
14761475
<requireCommand>Identify</requireCommand>
14771476
<requireCommand>IdentifyQuery</requireCommand>
1478-
<requireCommand>TriggerEffect</requireCommand>
14791477
</include>
14801478
<include cluster="Descriptor" client="false" server="true" clientLocked="true" serverLocked="true">
14811479
<requireAttribute>DEVICE_TYPE_LIST</requireAttribute>

‎src/controller/java/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@ kotlin_library("kotlin_matter_controller") {
396396

397397
if (matter_enable_java_compilation) {
398398
deps += [
399-
"${chip_root}/third_party/java_deps:json",
400399
"${chip_root}/third_party/java_deps:kotlin-stdlib",
401400
"${chip_root}/third_party/java_deps:kotlinx-coroutines-core-jvm",
402401
"${chip_root}/third_party/java_deps/stub_src",

‎src/messaging/ReliableMessageProtocolConfig.cpp

+26
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,44 @@ void ClearLocalMRPConfigOverride()
5757
}
5858
#endif
5959

60+
#if CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG
61+
namespace {
62+
63+
// This is not a static member of ReliableMessageProtocolConfig because the free
64+
// function GetLocalMRPConfig() needs access to it.
65+
Optional<ReliableMessageProtocolConfig> sDynamicLocalMPRConfig;
66+
67+
} // anonymous namespace
68+
69+
bool ReliableMessageProtocolConfig::SetLocalMRPConfig(const Optional<ReliableMessageProtocolConfig> & localMRPConfig)
70+
{
71+
auto oldConfig = GetLocalMRPConfig();
72+
sDynamicLocalMPRConfig = localMRPConfig;
73+
return oldConfig != GetLocalMRPConfig();
74+
}
75+
#endif // CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG
76+
6077
ReliableMessageProtocolConfig GetDefaultMRPConfig()
6178
{
6279
// Default MRP intervals are defined in spec <4.12.8. Parameters and Constants>
6380
static constexpr const System::Clock::Milliseconds32 idleRetransTimeout = 500_ms32;
6481
static constexpr const System::Clock::Milliseconds32 activeRetransTimeout = 300_ms32;
6582
static constexpr const System::Clock::Milliseconds16 activeThresholdTime = 4000_ms16;
83+
static_assert(activeThresholdTime == kDefaultActiveTime, "Different active defaults?");
6684
return ReliableMessageProtocolConfig(idleRetransTimeout, activeRetransTimeout, activeThresholdTime);
6785
}
6886

6987
Optional<ReliableMessageProtocolConfig> GetLocalMRPConfig()
7088
{
7189
ReliableMessageProtocolConfig config(CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL, CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL);
90+
91+
#if CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG
92+
if (sDynamicLocalMPRConfig.HasValue())
93+
{
94+
config = sDynamicLocalMPRConfig.Value();
95+
}
96+
#endif // CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG
97+
7298
#if CHIP_CONFIG_ENABLE_ICD_SERVER
7399
// TODO ICD LIT shall not advertise the SII key
74100
// Increase local MRP retry intervals by ICD polling intervals. That is, intervals for

‎src/messaging/ReliableMessageProtocolConfig.h

+23
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,29 @@ struct ReliableMessageProtocolConfig
208208
return mIdleRetransTimeout == that.mIdleRetransTimeout && mActiveRetransTimeout == that.mActiveRetransTimeout &&
209209
mActiveThresholdTime == that.mActiveThresholdTime;
210210
}
211+
212+
#if CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG
213+
/**
214+
* Set the local MRP configuration for the node.
215+
*
216+
* Passing a "no value" optional resets to the compiled-in settings
217+
* (CHIP_CONFIG_MRP_LOCAL_IDLE_RETRY_INTERVAL and
218+
* CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL).
219+
*
220+
* Otherwise the value set via this function is used instead of the
221+
* compiled-in settings, but can still be overridden by ICD configuration
222+
* and other things that would override the compiled-in settings.
223+
*
224+
* Changing the value via this function does not affect any existing
225+
* sessions or exchanges, but does affect the values we communicate to our
226+
* peer during future session establishments.
227+
*
228+
* @return whether the local MRP configuration actually changed as a result
229+
* of this call. If it did, callers may need to reset DNS-SD
230+
* advertising to advertise the updated values.
231+
*/
232+
static bool SetLocalMRPConfig(const Optional<ReliableMessageProtocolConfig> & localMRPConfig);
233+
#endif // CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG
211234
};
212235

213236
/// @brief The default MRP config. The value is defined by spec, and shall be same for all implementations,

‎src/platform/BUILD.gn

+6
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
8080

8181
# Define the default number of ip addresses to discover
8282
chip_max_discovered_ip_addresses = 5
83+
84+
# Allows enabling dynamic setting of the local MRP configuration, for
85+
# devices with multiple radios that have different sleep behavior for
86+
# different radios.
87+
chip_device_config_enable_dynamic_mrp_config = false
8388
}
8489

8590
if (chip_stack_lock_tracking == "auto") {
@@ -131,6 +136,7 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
131136
"CHIP_DISABLE_PLATFORM_KVS=${chip_disable_platform_kvs}",
132137
"CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER=${chip_use_transitional_commissionable_data_provider}",
133138
"CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER=${chip_use_transitional_device_instance_info_provider}",
139+
"CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG=${chip_device_config_enable_dynamic_mrp_config}",
134140
]
135141

136142
if (chip_device_platform == "linux" || chip_device_platform == "darwin" ||

‎src/platform/Zephyr/BLEManagerImpl.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
#include <zephyr/bluetooth/addr.h>
4141
#include <zephyr/bluetooth/gatt.h>
42+
#include <zephyr/bluetooth/hci.h>
4243
#include <zephyr/random/rand32.h>
4344
#include <zephyr/sys/byteorder.h>
4445
#include <zephyr/sys/util.h>

‎src/test_driver/nrfconnect/main/runner.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717

1818
#include <lib/support/CodeUtils.h>
19+
#include <lib/support/UnitTest.h>
1920
#include <lib/support/UnitTestRegistration.h>
2021
#include <platform/CHIPDeviceLayer.h>
2122

@@ -35,6 +36,7 @@ extern "C" int main(void)
3536

3637
LOG_INF("Starting CHIP tests!");
3738
int status = RunRegisteredUnitTests();
39+
status += chip::test::RunAllTests();
3840
LOG_INF("CHIP test status: %d", status);
3941

4042
_exit(status);

0 commit comments

Comments
 (0)