Skip to content

Commit 7a983c7

Browse files
authored
Merge v1.4-branch into release_2.4-1.4 (#51)
2 parents d4aa9a5 + 5335054 commit 7a983c7

File tree

43 files changed

+802
-207
lines changed

Some content is hidden

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

43 files changed

+802
-207
lines changed

config/esp32/components/chip/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ endif()
143143

144144
if(CONFIG_ENABLE_ICD_SERVER)
145145
chip_gn_arg_append("chip_enable_icd_server" "true")
146-
if(CONFIG_ICD_ENFORCE_SIT_SLOW_POLL_LIMIT)
147-
chip_gn_arg_append("icd_enforce_sit_slow_poll_limit" "true")
148-
endif()
149146
if(CONFIG_ICD_REPORT_ON_ACTIVE_MODE)
150147
chip_gn_arg_append("chip_icd_report_on_active_mode" "true")
151148
endif()

config/esp32/components/chip/Kconfig

+1-8
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ menu "CHIP Core"
3232
default 8
3333
help
3434
The maximum number of simultaneously active CHIP exchange contexts.
35-
35+
3636
An exchange context object is used to track the state of an ongoing CHIP message
3737
exchange (conversation) with a peer, e.g. a cloud service, a mobile application, or
3838
another device.
@@ -410,13 +410,6 @@ menu "CHIP Device Layer"
410410
help
411411
Enables or Disables ICD server
412412

413-
config ICD_ENFORCE_SIT_SLOW_POLL_LIMIT
414-
bool "Enforce SIT Slow Polling Max value to 15 seconds"
415-
depends on ENABLE_ICD_SERVER
416-
default n
417-
help
418-
Set to true to enforce SIT Slow Polling Max value to 15seconds
419-
420413
config ICD_REPORT_ON_ACTIVE_MODE
421414
bool "Emit a report on entering active mode"
422415
depends on ENABLE_ICD_SERVER

config/esp32/components/chip/idf_component.yml

+8
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ dependencies:
2626
- if: "idf_version >=5.0"
2727
- if: "target != esp32h2"
2828

29+
# This matches the dependency of esp_insights
30+
espressif/esp_diag_data_store:
31+
version: "1.0.1"
32+
require: public
33+
rules:
34+
- if: "idf_version >=5.0"
35+
- if: "target != esp32h2"
36+
2937
espressif/esp_rcp_update:
3038
version: "1.2.0"
3139
rules:

config/nrfconnect/chip-module/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ if (CONFIG_CHIP_ENABLE_ICD_SUPPORT)
156156
matter_add_gn_arg_bool ("chip_enable_icd_checkin" CONFIG_CHIP_ICD_CHECK_IN_SUPPORT)
157157
matter_add_gn_arg_bool ("chip_enable_icd_user_active_mode_trigger" CONFIG_CHIP_ICD_UAT_SUPPORT)
158158
matter_add_gn_arg_bool ("chip_enable_icd_dsls" CONFIG_CHIP_ICD_DSLS_SUPPORT)
159-
matter_add_gn_arg_bool ("icd_enforce_sit_slow_poll_limit" TRUE)
160159
endif()
161160

162161
if (CONFIG_CHIP_FACTORY_DATA OR CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)

docs/guides/ti/matter-users-guide/enabling_icd_on_ti_devices.md

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ Trigger Support, set the following parameter to true:
2424
chip_enable_icd_lit = true
2525
```
2626

27-
TI examples have only been tested with the ICD Server configuration. To enable
28-
the client configuration, set `chip_enable_icd_client` to true.
29-
3027
Persistent subscriptions allow devices to attempt resuming existing
3128
subscriptions following a device reset. To enable persistent subscriptions, set
3229
the following parameter to true:

examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/provisioning/DeviceProvisioningFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ class DeviceProvisioningFragment : Fragment() {
289289
override fun onICDRegistrationInfoRequired() {
290290
Log.d(TAG, "onICDRegistrationInfoRequired")
291291
deviceController.updateCommissioningICDRegistrationInfo(
292-
ICDRegistrationInfo.newBuilder().build()
292+
ICDRegistrationInfo.newBuilder().setICDStayActiveDurationMsec(30000L).build()
293293
)
294294
}
295295

examples/contact-sensor-app/nxp/k32w0/args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ chip_generate_link_map_file = true
2828

2929
chip_enable_icd_server = true
3030
chip_enable_icd_lit = false
31-
icd_enforce_sit_slow_poll_limit = true
3231
chip_persist_subscriptions = true
3332
chip_subscription_timeout_resumption = true
3433

examples/contact-sensor-app/nxp/k32w1/args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ chip_with_lwip = false
3232
chip_enable_icd_server = true
3333
chip_enable_icd_lit = false
3434
chip_enable_icd_dsls = false
35-
icd_enforce_sit_slow_poll_limit = true
3635
chip_persist_subscriptions = true
3736
chip_subscription_timeout_resumption = true
3837

examples/contact-sensor-app/nxp/mcxw71/args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ chip_with_lwip = false
3030

3131
chip_enable_icd_server = true
3232
chip_enable_icd_lit = false
33-
icd_enforce_sit_slow_poll_limit = true
3433
chip_persist_subscriptions = true
3534
chip_subscription_timeout_resumption = true
3635

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3222,7 +3222,7 @@ endpoint 2 {
32223222
callback attribute generatedCommandList;
32233223
callback attribute acceptedCommandList;
32243224
callback attribute attributeList;
3225-
ram attribute featureMap default = 2;
3225+
ram attribute featureMap default = 6;
32263226
ram attribute clusterRevision default = 2;
32273227
}
32283228
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5587,7 +5587,7 @@
55875587
"storageOption": "RAM",
55885588
"singleton": 0,
55895589
"bounded": 0,
5590-
"defaultValue": "2",
5590+
"defaultValue": "6",
55915591
"reportable": 1,
55925592
"minInterval": 1,
55935593
"maxInterval": 65534,

examples/lit-icd-app/silabs/build_for_wifi_args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ sl_enable_test_event_trigger = true
2929
chip_enable_icd_server = true
3030
chip_subscription_timeout_resumption = false
3131
sl_use_subscription_syncing = true
32-
icd_enforce_sit_slow_poll_limit = true
3332
chip_enable_icd_lit = true
3433

3534
# ICD Matter Configuration flags

examples/lit-icd-app/silabs/openthread.gni

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ sl_enable_test_event_trigger = true
3232
chip_enable_icd_server = true
3333
chip_subscription_timeout_resumption = false
3434
sl_use_subscription_syncing = true
35-
icd_enforce_sit_slow_poll_limit = true
3635
chip_icd_report_on_active_mode = true
3736
chip_enable_icd_lit = true
3837

examples/lock-app/nxp/k32w1/args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ chip_with_lwip = false
3030

3131
chip_enable_icd_server = true
3232
chip_enable_icd_lit = false
33-
icd_enforce_sit_slow_poll_limit = true
3433
chip_persist_subscriptions = true
3534
chip_subscription_timeout_resumption = true
3635

examples/lock-app/nxp/mcxw71/args.gni

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ chip_with_lwip = false
3030

3131
chip_enable_icd_server = true
3232
chip_enable_icd_lit = false
33-
icd_enforce_sit_slow_poll_limit = true
3433
chip_persist_subscriptions = true
3534
chip_subscription_timeout_resumption = true
3635

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
/*
2+
*
3+
* Copyright (c) 2020 Project CHIP Authors
4+
* Copyright (c) 2019 Google LLC.
5+
* All rights reserved.
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
20+
#include "sl_board_control.h"
21+
#include "sl_i2cspm_instances.h"
22+
#include "sl_si70xx.h"
23+
#include <Si70xxSensor.h>
24+
#include <lib/support/CodeUtils.h>
25+
26+
namespace {
27+
28+
constexpr uint16_t kSensorTemperatureOffset = 475;
29+
bool initialized = false;
30+
31+
} // namespace
32+
33+
namespace Si70xxSensor {
34+
35+
sl_status_t Init()
36+
{
37+
sl_status_t status = SL_STATUS_OK;
38+
39+
status = sl_board_enable_sensor(SL_BOARD_SENSOR_RHT);
40+
VerifyOrReturnError(status == SL_STATUS_OK, status);
41+
42+
status = sl_si70xx_init(sl_i2cspm_sensor, SI7021_ADDR);
43+
VerifyOrReturnError(status == SL_STATUS_OK, status);
44+
45+
initialized = true;
46+
return status;
47+
}
48+
49+
sl_status_t GetSensorData(uint16_t & relativeHumidity, int16_t & temperature)
50+
{
51+
VerifyOrReturnError(initialized, SL_STATUS_NOT_INITIALIZED);
52+
53+
sl_status_t status = SL_STATUS_OK;
54+
int32_t tempTemperature = 0;
55+
uint32_t tempHumidity = 0;
56+
57+
status = sl_si70xx_measure_rh_and_temp(sl_i2cspm_sensor, SI7021_ADDR, &tempHumidity, &tempTemperature);
58+
VerifyOrReturnError(status == SL_STATUS_OK, status);
59+
60+
// Sensor precision is milliX. We need to reduce to change the precision to centiX to fit with the cluster attributes presicion.
61+
temperature = static_cast<int16_t>(tempTemperature / 10) - kSensorTemperatureOffset;
62+
relativeHumidity = static_cast<uint16_t>(tempHumidity / 10);
63+
64+
return status;
65+
}
66+
67+
}; // namespace Si70xxSensor
+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
*
3+
* Copyright (c) 2020 Project CHIP Authors
4+
* Copyright (c) 2019 Google LLC.
5+
* All rights reserved.
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
20+
#pragma once
21+
22+
#include "sl_status.h"
23+
#include <stdint.h>
24+
25+
namespace Si70xxSensor {
26+
27+
/**
28+
* @brief Initialises the Si70xx Sensor.
29+
*
30+
* @return sl_status_t SL_STATUS_OK if there were no errors occured during initialisation.
31+
* Error if an underlying platform error occured
32+
*/
33+
sl_status_t Init();
34+
35+
/**
36+
* @brief Reads Humidity and temperature values from the Si70xx sensor.
37+
* The init function must be called before calling the GetSensorData.
38+
*
39+
* @param[out] relativeHumidity Relative humidity percentage in centi-pourcentage (1000 == 10.00%)
40+
* @param[out] temperature Ambiant temperature in centi-celsium (1000 == 10.00C)
41+
*
42+
* @return sl_status_t SL_STATUS_OK if there were no errors occured during initialisation.
43+
* SL_STATUS_NOT_INITIALIZED if the sensor was not initialised
44+
* Error if an underlying platform error occured
45+
*/
46+
sl_status_t GetSensorData(uint16_t & relativeHumidity, int16_t & temperature);
47+
48+
}; // namespace Si70xxSensor

examples/platform/silabs/SiWx917/BUILD.gn

+7
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,13 @@ source_set("siwx917-common") {
252252
public_deps += [ ":test-event-trigger" ]
253253
}
254254

255+
if (sl_enable_si70xx_sensor) {
256+
sources += [
257+
"${silabs_common_plat_dir}/Si70xxSensor.cpp",
258+
"${silabs_common_plat_dir}/Si70xxSensor.h",
259+
]
260+
}
261+
255262
if (app_data_model != "") {
256263
public_deps += [ app_data_model ]
257264
}

examples/platform/silabs/TemperatureSensor.cpp

-62
This file was deleted.

examples/platform/silabs/TemperatureSensor.h

-28
This file was deleted.

examples/platform/silabs/display/demo-ui.c

-1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,5 @@ void demoUIClearMainScreen(uint8_t * name)
167167
{
168168
GLIB_clear(&glibContext);
169169
demoUIDisplayHeader((char *) name);
170-
demoUIDisplayApp(false);
171170
demoUIDisplayProtocols();
172171
}

examples/platform/silabs/display/lcd.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class SilabsLCD
6565
int DrawPixel(void * pContext, int32_t x, int32_t y);
6666
int Update(void);
6767
void WriteDemoUI(bool state);
68+
void WriteDemoUI();
6869
void SetCustomUI(customUICB cb);
6970

7071
void GetScreen(Screen_e & screen);
@@ -85,8 +86,6 @@ class SilabsLCD
8586
bool protocol1 = false; /* data */
8687
} DemoState_t;
8788

88-
void WriteDemoUI();
89-
9089
#ifdef QR_CODE_ENABLED
9190
void WriteQRCode();
9291
void LCDFillRect(uint8_t x, uint8_t y, uint8_t w, uint8_t h);

0 commit comments

Comments
 (0)