Skip to content

Commit 11adcb5

Browse files
authored
Merge branch 'master' into bugfix/removing_password_logs
2 parents cc52243 + a2e2c8a commit 11adcb5

File tree

87 files changed

+1790
-547
lines changed

Some content is hidden

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

87 files changed

+1790
-547
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"mounts": [
1515
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
1616
],
17-
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
17+
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
1818
"image": "matter-dev-environment:local",
1919
"remoteUser": "vscode",
2020
"customizations": {

.github/.wordlist.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ epochStartTime
523523
eq
524524
errorValue
525525
esd
526+
espcoredump
526527
ESPPORT
527528
Espressif
528529
esptool
@@ -1621,4 +1622,4 @@ zephyrproject
16211622
zhengyaohan
16221623
Zigbee
16231624
zigbeealliance
1624-
zigbeethread
1625+
zigbeethread

.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
--target darwin-x64-bridge-${BUILD_VARIANT} \
101101
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
102102
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
103+
--target darwin-x64-rvc-${BUILD_VARIANT} \
103104
build \
104105
--copy-artifacts-to objdir-clone \
105106
"
@@ -120,6 +121,7 @@ jobs:
120121
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
121122
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
122123
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
124+
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
123125
"
124126
- name: Run OTA Test
125127
run: |

.github/workflows/lint.yml

-14
Original file line numberDiff line numberDiff line change
@@ -93,35 +93,25 @@ jobs:
9393
--known-failure app/AttributeAccessInterface.h \
9494
--known-failure app/AttributeAccessToken.h \
9595
--known-failure app/att-storage.h \
96-
--known-failure app/BufferedReadCallback.h \
9796
--known-failure app/CommandHandler.h \
9897
--known-failure app/CommandHandlerInterface.h \
99-
--known-failure app/CommandPathParams.h \
100-
--known-failure app/CommandPathRegistry.h \
101-
--known-failure app/CommandResponseSender.h \
10298
--known-failure app/CommandSender.h \
10399
--known-failure app/CommandSenderLegacyCallback.h \
104100
--known-failure app/CompatEnumNames.h \
105-
--known-failure app/ConcreteAttributePath.h \
106-
--known-failure app/ConcreteCommandPath.h \
107101
--known-failure app/data-model/ListLargeSystemExtensions.h \
108102
--known-failure app/EventHeader.h \
109103
--known-failure app/EventLoggingDelegate.h \
110104
--known-failure app/EventLogging.h \
111105
--known-failure app/EventLoggingTypes.h \
112-
--known-failure app/EventManagement.h \
113106
--known-failure app/InteractionModelHelper.h \
114-
--known-failure app/ObjectList.h \
115107
--known-failure app/ReadClient.h \
116108
--known-failure app/ReadHandler.h \
117109
--known-failure app/ReadPrepareParams.h \
118110
--known-failure app/reporting/tests/MockReportScheduler.cpp \
119111
--known-failure app/reporting/tests/MockReportScheduler.h \
120-
--known-failure app/server/AppDelegate.h \
121112
--known-failure app/TestEventTriggerDelegate.h \
122113
--known-failure app/util/af.h \
123114
--known-failure app/util/af-types.h \
124-
--known-failure app/util/attribute-metadata.h \
125115
--known-failure app/util/attribute-storage.cpp \
126116
--known-failure app/util/attribute-storage.h \
127117
--known-failure app/util/attribute-storage-null-handling.h \
@@ -141,11 +131,7 @@ jobs:
141131
--known-failure app/util/im-client-callbacks.h \
142132
--known-failure app/util/MatterCallbacks.h \
143133
--known-failure app/util/message.cpp \
144-
--known-failure app/util/mock/Constants.h \
145-
--known-failure app/util/mock/Functions.h \
146-
--known-failure app/util/mock/MockNodeConfig.h \
147134
--known-failure app/util/odd-sized-integers.h \
148-
--known-failure app/util/types_stub.h \
149135
--known-failure app/util/util.cpp \
150136
--known-failure app/util/util.h \
151137
--known-failure app/WriteClient.h \

.github/workflows/tests.yaml

+16-2
Large diffs are not rendered by default.

BUILD.gn

+12
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,10 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
363363
enable_linux_lit_icd_app_build =
364364
enable_default_builds && (host_os == "linux" || host_os == "mac")
365365

366+
# Build the Linux RVC app example.
367+
enable_linux_rvc_app_build =
368+
enable_default_builds && (host_os == "linux" || host_os == "mac")
369+
366370
# Build the cc13x2x7_26x2x7 lock app example.
367371
enable_cc13x2x7_26x2x7_lock_app_build = enable_ti_simplelink_builds
368372

@@ -744,6 +748,14 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
744748
extra_build_deps += [ ":genio_shell_app" ]
745749
}
746750

751+
if (enable_linux_rvc_app_build) {
752+
group("linux_rvc_app") {
753+
deps = [ "${chip_root}/examples/rvc-app/linux(${standalone_toolchain})" ]
754+
}
755+
756+
extra_build_deps += [ ":linux_rvc_app" ]
757+
}
758+
747759
group("default") {
748760
deps = extra_build_deps + builds
749761
}

examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt

+12-3
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,19 @@ class ClusterDetailFragment : Fragment() {
199199

200200
private fun castStringToType(data: String, type: Class<*>, underlyingType: Class<*>): Any? {
201201
return when (type) {
202-
Int::class.java -> data.toInt()
203-
Boolean::class.java -> data.toBoolean()
202+
Int::class.java,
203+
java.lang.Integer::class.java -> data.toInt()
204+
Boolean::class.java,
205+
java.lang.Boolean::class.java -> data.toBoolean()
204206
ByteArray::class.java -> data.encodeToByteArray()
205-
Long::class.java -> data.toLong()
207+
Long::class.java,
208+
java.lang.Long::class.java -> data.toLong()
209+
Short::class.java,
210+
java.lang.Short::class.java -> data.toShort()
211+
Double::class.java,
212+
java.lang.Double::class.java -> data.toDouble()
213+
Float::class.java,
214+
java.lang.Float::class.java -> data.toFloat()
206215
Optional::class.java ->
207216
if (data.isEmpty()) Optional.empty()
208217
else Optional.of(castStringToType(data, underlyingType, underlyingType)!!)

examples/temperature-measurement-app/esp32/README.md

+31-1
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,39 @@ chip-tool pairing ble-wifi 1 SSID PASSPHRASE 20202021 3840
5151
chip-tool diagnosticlogs retrieve-logs-request 0 0 1 0
5252
5353
# Read network diagnostic using BDX protocol
54-
chip-tool diagnosticlogs retrieve-logs-request 1 0 1 0 --TransferFileDesignator network-diag.log
54+
chip-tool interactive start
55+
> diagnosticlogs retrieve-logs-request 1 1 1 0 --TransferFileDesignator network-diag.log
56+
# Retrieve crash over BDX
57+
> diagnosticlogs retrieve-logs-request 1 1 1 0 --TransferFileDesignator crash.bin
5558
```
5659

60+
esp-idf supports storing and retrieving
61+
[core dump in flash](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/core_dump.html#core-dump-to-flash).
62+
63+
To support that, application needs to add core dump partition's entry in
64+
[partitons.csv](partitions.csv#7) and we need to enable few menuconfig options.
65+
66+
```
67+
CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH=y
68+
CONFIG_ESP32_COREDUMP_DATA_FORMAT_ELF=y
69+
```
70+
71+
This example's partition table and sdkconfig.default are already modified
72+
73+
- Retrieve the core dump using diagnostic logs cluster
74+
75+
```
76+
# Read crash logs over BDX
77+
chip-tool interactive start
78+
> diagnosticlogs retrieve-logs-request 1 1 1 0 --TransferFileDesignator crash.bin
79+
```
80+
81+
- Decode the crash logs, using espcoredump.py
82+
```
83+
espcoredump.py --chip (CHIP) info_corefile --core /tmp/crash.bin \
84+
--core-format elf build/chip-temperature-measurement-app.elf
85+
```
86+
5787
## Optimization
5888
5989
Optimization related to WiFi, BLuetooth, Asserts etc are the part of this

examples/temperature-measurement-app/esp32/main/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ set(SRC_DIRS_LIST
5555
"${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
5656
)
5757

58-
set(PRIV_REQUIRES_LIST chip QRCode bt nvs_flash)
58+
set(PRIV_REQUIRES_LIST chip QRCode bt nvs_flash bootloader_support espcoredump)
5959

6060
if (CONFIG_ENABLE_PW_RPC)
6161
# Append additional directories for RPC build
@@ -83,7 +83,7 @@ endif (CONFIG_ENABLE_PW_RPC)
8383
idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
8484
SRC_DIRS ${SRC_DIRS_LIST}
8585
PRIV_REQUIRES ${PRIV_REQUIRES_LIST}
86-
EMBED_FILES diagnostic_logs/end_user_support.log diagnostic_logs/network_diag.log diagnostic_logs/crash.log)
86+
EMBED_FILES diagnostic_logs/end_user_support.log diagnostic_logs/network_diag.log)
8787

8888
include("${CHIP_ROOT}/build/chip/esp32/esp32_codegen.cmake")
8989
chip_app_component_codegen("${CHIP_ROOT}/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter")

0 commit comments

Comments
 (0)