Implement User Directed Commissioning - Phase 1 #8034

chrisdecenzo · 2021-06-30T17:39:27Z

Problem

Address 6789 - User Directed Commissioning (UDC) needs implementation
Broke original PR into smaller parts, this is the first with dependencies for UDC

Change overview

Address mDNS feedback from Andrei
Add caching of instance name and methods to obtain it

Testing

Running from tv-app and lighting-app which utilize all mDNS fields
Some unit tests

src/controller/python/ChipDeviceController-ScriptBinding.cpp

github-actions · 2021-07-01T03:55:46Z

Size increase report for "nrfconnect-example-build" from c3caff0

File	Section	File	VM
chip-lock.elf	datas	-8	-8
chip-lock.elf	[LOAD #3 [RW]]	0	-18
chip-lock.elf	bss	0	-46
chip-lock.elf	rodata	-144	-140
chip-shell.elf	device_handles	4	4
chip-shell.elf	datas	-8	-8
chip-shell.elf	text	-116	-116
chip-shell.elf	rodata	-144	-144

Full report output

BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-lock.elf and ./pull_artifact/chip-lock.elf:

sections,vmsize,filesize
.debug_line,0,241
.debug_str,0,161
.debug_frame,0,32
.debug_aranges,0,8
.shstrtab,0,-1
datas,-8,-8
[LOAD #3 [RW]],-18,0
bss,-46,0
.debug_ranges,0,-48
.strtab,0,-91
.symtab,0,-128
rodata,-140,-144
.debug_loc,0,-633
.debug_abbrev,0,-934
.debug_info,0,-3843

Comparing ./master_artifact/chip-shell.elf and ./pull_artifact/chip-shell.elf:

sections,vmsize,filesize
.debug_line,0,647
device_handles,4,4
.shstrtab,0,-1
datas,-8,-8
.debug_aranges,0,-16
.debug_ranges,0,-16
.debug_frame,0,-48
text,-116,-116
.debug_str,0,-134
rodata,-144,-144
.strtab,0,-163
.symtab,0,-192
.debug_loc,0,-258
.debug_abbrev,0,-747
.debug_info,0,-1268

github-actions · 2021-07-01T03:56:13Z

Size increase report for "gn_qpg6100-example-build" from c3caff0

File	Section	File	VM
chip-qpg6100-lighting-example.out	.heap	0	64
chip-qpg6100-lighting-example.out	.data	-8	-8
chip-qpg6100-lighting-example.out	.bss	0	-56
chip-qpg6100-lighting-example.out	.text	-156	-156

Full report output

BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-qpg6100-lighting-example.out.map and ./pull_artifact/chip-qpg6100-lighting-example.out.map:

BLOAT EXECUTION FAILED WITH CODE 1:
bloaty: unknown file type for file './pull_artifact/chip-qpg6100-lighting-example.out.map'

Comparing ./master_artifact/chip-qpg6100-lighting-example.out and ./pull_artifact/chip-qpg6100-lighting-example.out:

sections,vmsize,filesize
.debug_line,0,460
.debug_str,0,165
[Unmapped],0,156
.debug_abbrev,0,138
.heap,64,0
.debug_ranges,0,24
.data,-8,-8
.debug_aranges,0,-8
.debug_frame,0,-16
.bss,-56,0
.strtab,0,-100
.symtab,0,-112
.text,-156,-156
.debug_loc,0,-325
.debug_info,0,-2318

github-actions · 2021-07-01T04:14:34Z

Size increase report for "esp32-example-build" from c3caff0

File	Section	File	VM
chip-all-clusters-app.elf	.dram0.bss	0	8
chip-all-clusters-app.elf	.flash.text	-4	-4
chip-all-clusters-app.elf	.dram0.data	-8	-8
chip-all-clusters-app.elf	.flash.rodata	-152	-152

Full report output

BLOAT REPORT

Files found only in the build output:
    chip-persistent-storage.elf
    %schip-shell.elf
    %schip-lock-app.elf
    %schip-temperature-measurement-app.elf
    %sreport.csv

Comparing ./master_artifact/chip-all-clusters-app.elf and ./pull_artifact/chip-all-clusters-app.elf:

sections,vmsize,filesize
.debug_loc,0,524
.debug_line,0,252
.debug_str,0,252
[Unmapped],0,160
.xt.prop._ZN4chip8Platform10CopyStringEPcjPKc,0,100
.debug_abbrev,0,83
.xt.lit._ZN4chip8Platform10CopyStringEPcjPKc,0,48
.dram0.bss,8,0
.flash.text,-4,-4
.debug_aranges,0,-8
.dram0.data,-8,-8
.debug_frame,0,-24
.xt.prop._ZN4chip8OptionalIPKcEaSERKS3_,0,-76
.xt.lit._ZN4chip4Mdns31CommissionAdvertisingParameters15SetPairingInstrENS_8OptionalIPKcEE,0,-88
.xt.prop._ZN4chip4Mdns31CommissionAdvertisingParameters15SetPairingInstrENS_8OptionalIPKcEE,0,-100
.symtab,0,-112
.flash.rodata,-152,-152
.strtab,0,-167
.shstrtab,0,-169
.debug_info,0,-3047

Comparing ./master_artifact/chip-pigweed-app.elf and ./pull_artifact/chip-pigweed-app.elf:

sections,vmsize,filesize
.debug_str,0,-9
.debug_line,0,-15
.debug_info,0,-32

bzbarsky-apple · 2021-07-01T03:08:33Z

examples/minimal-mdns/server.cpp

-    mdns::Minimal::QNamePart udpServiceName[]       = { kCommissionableServiceName, kCommissionProtocol, kLocalDomain };
-    mdns::Minimal::QNamePart udpServerServiceName[] = { gOptions.instanceName, kCommissionableServiceName, kCommissionProtocol,
-                                                        kLocalDomain };
+    mdns::Minimal::QNamePart tcpServiceName[]       = { chip::Mdns::kOperationalServiceName, chip::Mdns::kOperationalProtocol,


This whole file is using namespace chip, so I'd think you don't need the chip:: prefix on all of these...

bzbarsky-apple · 2021-07-01T03:09:58Z

src/app/server/Mdns.cpp

@@ -87,6 +88,12 @@ chip::ByteSpan FillMAC(uint8_t (&mac)[8])

 } // namespace

+CHIP_ERROR GetCommissionableInstanceName(char * buffer, size_t bufferLen)
+{
+    auto & mdnsAdvertiser = chip::Mdns::ServiceAdvertiser::Instance();


This is inside namespace Mdns {, so you shouldn't need all the prefixing.

Suggested change

auto & mdnsAdvertiser = chip::Mdns::ServiceAdvertiser::Instance();

auto & mdnsAdvertiser = ServiceAdvertiser::Instance();

its actually chip::app::Mdns so I don't think these can be removed

bzbarsky-apple · 2021-07-01T03:11:00Z

src/app/server/Mdns.h

@@ -42,6 +42,9 @@ void StartServer();

 CHIP_ERROR GenerateRotatingDeviceId(char rotatingDeviceIdHexBuffer[], size_t rotatingDeviceIdHexBufferSize);

+/// Generates the (random) instance name that a CHIP device is to use for pre-commissioning DNS-SD
+CHIP_ERROR GetCommissionableInstanceName(char * buffer, size_t bufferLen);


As a followup, we should change this API to take a MutableSpan<char>...

bzbarsky-apple · 2021-07-01T03:14:28Z

src/controller/python/ChipDeviceController-ScriptBinding.cpp

@@ -252,7 +252,7 @@ CHIP_ERROR pychip_DeviceController_ConnectIP(chip::Controller::DeviceCommissione

 CHIP_ERROR pychip_DeviceController_DiscoverAllCommissionableNodes(chip::Controller::DeviceCommissioner * devCtrl)
 {
-    Mdns::DiscoveryFilter filter(Mdns::DiscoveryFilterType::kNone, 0);
+    Mdns::DiscoveryFilter filter(Mdns::DiscoveryFilterType::kNone, (uint16_t) 0);


Suggested change

Mdns::DiscoveryFilter filter(Mdns::DiscoveryFilterType::kNone, (uint16_t) 0);

Mdns::DiscoveryFilter filter(Mdns::DiscoveryFilterType::kNone, static_cast<uint16_t>(0));

bzbarsky-apple · 2021-07-01T03:20:44Z

src/lib/mdns/Advertiser.h

@@ -179,34 +180,55 @@ class CommissionAdvertisingParameters : public BaseAdvertisingParams<CommissionA
    {
        if (deviceName.HasValue())
        {
-            strncpy(sDeviceName, deviceName.Value(), min(strlen(deviceName.Value()) + 1, sizeof(sDeviceName)));
-            mDeviceName = Optional<const char *>::Value(static_cast<const char *>(sDeviceName));
+            chip::Platform::CopyString(mDeviceName, sizeof(mDeviceName), deviceName.Value());


Suggested change

chip::Platform::CopyString(mDeviceName, sizeof(mDeviceName), deviceName.Value());

Platform::CopyString(mDeviceName, sizeof(mDeviceName), deviceName.Value());

bzbarsky-apple · 2021-07-01T03:21:45Z

src/lib/mdns/Advertiser.h


    CommissionAdvertisingParameters & SetRotatingId(Optional<const char *> rotatingId)
    {
        if (rotatingId.HasValue())
        {
-            strncpy(sRotatingId, rotatingId.Value(), min(strlen(rotatingId.Value()) + 1, sizeof(sRotatingId)));
-            mRotatingId = Optional<const char *>::Value(static_cast<const char *>(sRotatingId));
+            chip::Platform::CopyString(mRotatingId, sizeof(mRotatingId), rotatingId.Value());


Suggested change

chip::Platform::CopyString(mRotatingId, sizeof(mRotatingId), rotatingId.Value());

Platform::CopyString(mRotatingId, sizeof(mRotatingId), rotatingId.Value());

bzbarsky-apple · 2021-07-01T03:22:08Z

src/lib/mdns/Advertiser.h


    CommissionAdvertisingParameters & SetPairingInstr(Optional<const char *> pairingInstr)
    {
        if (pairingInstr.HasValue())
        {
-            strncpy(sPairingInstr, pairingInstr.Value(), min(strlen(pairingInstr.Value()) + 1, sizeof(sPairingInstr)));
-            mPairingInstr = Optional<const char *>::Value(static_cast<const char *>(sPairingInstr));
+            chip::Platform::CopyString(mPairingInstr, sizeof(mPairingInstr), pairingInstr.Value());


Suggested change

chip::Platform::CopyString(mPairingInstr, sizeof(mPairingInstr), pairingInstr.Value());

Platform::CopyString(mPairingInstr, sizeof(mPairingInstr), pairingInstr.Value());

bzbarsky-apple · 2021-07-01T05:38:45Z

src/lib/mdns/Resolver.h

    DiscoveryFilter() : type(DiscoveryFilterType::kNone), code(0) {}
    DiscoveryFilter(DiscoveryFilterType newType, uint16_t newCode) : type(newType), code(newCode) {}
+    DiscoveryFilter(DiscoveryFilterType newType, char * newInstanceName) : type(newType), instanceName(newInstanceName) {}


Oh, one more question. Should newInstanceName (and the instanceName member) be const char * so that string literals can be passed in?

* add electrical measurement cluster to controller-clusters.zap Only a selection of the optional clusters is enabled. mandatory: - measurement type optional: - total active power - rms voltage - rms voltage min - rms voltage max - rms current - rms current min - rms current max - active power - active power min - active power max * add electrical measurement cluster to zap_cluster_list.py * add electrical measurement cluster to all-clusters-app * add electrical measurement cluster to all-cluster-app/esp32 * add app helpers for electrical measurement cluster * fix all cluster app build * regen all * Regenerating * Restyled by whitespace * Restyled by clang-format * Regenerating * Restyled by whitespace * Restyled by google-java-format * [fix] Wrong callback passed to WriteAttribute in Python[TE4] (#8019) * Fix callback typr * Run codegen * Mdns: _chip* -> _matter*, remove 0's on subtypes (#7805) * Mdns: _chip* i-> _matter*, remove 0's on subtypes The second ballot changed the format of the subtypes as well as fixed the service name prefix from _chip* to _matter*. NOTE FOR DEVs: Updating past this change will require updating the devices and controllers as otherwise they will be unable to find each other. * Darwin - use local kLocalDomain var. It includes a . and the one in the ServiceNaming doesn't. * Trying again for Darwin. * Fix host name. * Fix small error on merge * Use a dedicated chip-types.xml file into src/app/zap-templates/zcl (#7873) * Update chip-types.xml * Update gen/ folders * Revert "Mark UDP socket as ready for write in send msg. (#7927)" (#8027) Turns out the code causes that subsequent select()-s never wait so another solution for the original issue must be prepared. This reverts commit 8c55523. * [ZAP] Add isAnalog instead of isDiscreteType to account for string types (#7821) * Mdns: separate query responders for advertisers (#7615) * Mdns: separate query responders for advertisers The current setup uses a single query responder for commissionable and operational and all the records are cleared together and added in a large group. This makes it challenging to run commissionable and operational at the same time since they can't be cleared individually and because there are duplicate records between operational and commissionable. This commit changes the code to use one query responder per advertisement type and gets the ResponseSender to loop through the query responders to filter for answers. * Apply suggestions from code review Co-authored-by: chrisdecenzo <[email protected]> * Restyled by clang-format * Fix tests - they were not testing right. * Restyled by clang-format * Update number of responders Represents 5 multi-admin fabrics for operational, commissionable and commissioner. * Whoops - broke a test with my last "minor" change. * Lighten the stack load for the failing test. Co-authored-by: chrisdecenzo <[email protected]> Co-authored-by: Restyled.io <[email protected]> * [nrfconnect] Stop using cooperative threads (#8025) nRF Connect platform used cooperative threads, that is threads that cannot be preempted, to workaround some synchronization issues in the past, but it's no longer needed and is risky. The latter was revealed by #7927, which caused that `select()` never waits (needs to be fixed in another PR). Signed-off-by: Damian Krolik <[email protected]> * IPV6-only test app for esp32 (examples/ipv6only-app) (#7289) Adds RPCs that conform to NDM/GDM WiFi capabilities. Disables IPV4 DHCP client. Assigns link-local IPV6 address. Starts a UDP echo server on an IPV6 UDP socket. Test: Ran on M5Stack and verified it scanned and connected to wifi, after connected verified it echoed UDP messages. * [ESP32] fix compile error for persistent-storage app (#7940) * [ESP32] fix compile error for persistent-storage app * add CI for all ESP examples * Consolidate error types (#7916) * Consolidate error types #### Problem CHIP currently has `CHIP_ERROR`, `INET_ERROR`, `BLE_ERROR`, `ASN1_ERROR`, `System::Error`. Since they're all integers underneath, there is no type checking, and existing code routinely treats them as interchangeable. There is also existing code that uses `int` and `int32_t`. Each also has a `…_NO_ERROR` code which is independently configurable, but existing code assumes they are equal, and there is exising code that assumes the C convention that the value is 0. #### Change overview Fixes #7688 Unify chip errors This change is largely a mechanical replacement of type and some error code names, with a few cleanups of weak typing. Consolidated error types to one, `CHIP_ERROR`. Removed configurability of `CHIP_NO_ERROR`; it must be 0. Added `CHIP_ERROR_FORMAT` to replace hardcoded `PRI…32` in `printf()` format strings. Added `CHIP_ERROR_SENTINEL` to replace the use of `CHIP_ERROR_MAX` as a sentinel. Renamed or consolidated the following errors, which have the same meaning. Merely similar codes are left alone. This change contains compatibility defintitions to avoid breaking PRs in flight, which will be removed in a followup. | before | after | |:---------------------------------------|:------------------------------------| | ASN1_ERROR | CHIP_ERROR | | ASN1_NO_ERROR | CHIP_NO_ERROR | | BLE_ERROR | CHIP_ERROR | | BLE_NO_ERROR | CHIP_NO_ERROR | | BLE_ERROR_BAD_ARGS | CHIP_ERROR_INVALID_ARGUMENT | | BLE_ERROR_INCORRECT_STATE | CHIP_ERROR_INCORRECT_STATE | | BLE_ERROR_MESSAGE_INCOMPLETE | CHIP_ERROR_MESSAGE_INCOMPLETE | | BLE_ERROR_NOT_IMPLEMENTED | CHIP_ERROR_NOT_IMPLEMENTED | | BLE_ERROR_NO_ENDPOINTS | CHIP_ERROR_ENDPOINT_POOL_FULL | | BLE_ERROR_NO_MEMORY | CHIP_ERROR_NO_MEMORY | | BLE_ERROR_OUTBOUND_MESSAGE_TOO_BIG | CHIP_ERROR_OUTBOUND_MESSAGE_TOO_BIG | | BLE_ERROR_RECEIVED_MESSAGE_TOO_BIG | CHIP_ERROR_INBOUND_MESSAGE_TOO_BIG | | CHIP_SYSTEM_NO_ERROR | CHIP_NO_ERROR | | CHIP_SYSTEM_ERROR_ACCESS_DENIED | CHIP_ERROR_ACCESS_DENIED | | CHIP_SYSTEM_ERROR_BAD_ARGS | CHIP_ERROR_INVALID_ARGUMENT | | CHIP_SYSTEM_ERROR_NOT_SUPPORTED | CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE | | CHIP_SYSTEM_ERROR_NO_MEMORY | CHIP_ERROR_NO_MEMORY | | CHIP_SYSTEM_ERROR_REAL_TIME_NOT_SYNCED | CHIP_ERROR_REAL_TIME_NOT_SYNCED | | CHIP_SYSTEM_ERROR_UNEXPECTED_EVENT | CHIP_ERROR_UNEXPECTED_EVENT | | CHIP_SYSTEM_ERROR_UNEXPECTED_STATE | CHIP_ERROR_INCORRECT_STATE | | INET_ERROR | CHIP_ERROR | | INET_NO_ERROR | CHIP_NO_ERROR | | INET_ERROR_BAD_ARGS | CHIP_ERROR_INVALID_ARGUMENT | | INET_ERROR_INBOUND_MESSAGE_TOO_BIG | CHIP_ERROR_INBOUND_MESSAGE_TOO_BIG | | INET_ERROR_INCORRECT_STATE | CHIP_ERROR_INCORRECT_STATE | | INET_ERROR_MESSAGE_TOO_LONG | CHIP_ERROR_MESSAGE_TOO_LONG | | INET_ERROR_NO_CONNECTION_HANDLER | CHIP_ERROR_NO_CONNECTION_HANDLER | | INET_ERROR_NO_ENDPOINTS | CHIP_ERROR_ENDPOINT_POOL_FULL | | INET_ERROR_NOT_IMPLEMENTED | CHIP_ERROR_NOT_IMPLEMENTED | | INET_ERROR_NOT_SUPPORTED | CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE | | INET_ERROR_NO_MEMORY | CHIP_ERROR_NO_MEMORY | | INET_ERROR_CONNECTION_ABORTED | CHIP_ERROR_CONNECTION_ABORTED | #### Testing Modified some unit tests to account for consolidated error codes. Built locally with `CHIP_ERROR` hardcoded to `int32_t`, `uint32_t`, `int16_t`, and `uint16_t` to shake out mistaken type assumptions. * Build fixes * Darwin * Doxygen * Fixes * Change default CHIP_CONFIG_ERROR_TYPE back to `int32_t`. * Fix CHIP_ERROR_INBOUND_MESSAGE_TOO_BIG message text. * C++-style casts. * fix: CHIPError.h uses stdint.h * zap * fix for Mbed merge * Throw exception instead of return 0 for get-fabricid in case of error (#7884) * Implement User Directed Commissioning - Phase 1 (#8034) * Updated CHIP Certs Implementation to Use Spans instaed of Pointer/Len Pairs. (#7599) Specifically, added the following FixedSpan types: - CertificateKeyId - P256ECDSASignatureSpan - P256PublicKeySpan Also redefined mString member in the ChipRDN structure to be ByteSpan. * Zap use const expr for clusters commands attributes (#7946) * Remove duplicated command ids and attribute ids definitions from the encoder-src.zapt template Add ids/Commands.zapt template Update template to use Commands.h and Clusters.h * Fix XML definitions typos for attributes name * Add ids/Commands.h to the gen folder of src/app/common * Update log messages for session expiry (#8017) * Update log messages for session expiry * update format specifier * Remove client-command-macro.h-aa80d825 from examples/bridge-app/bridge-common/gen (#8026) * Fix Ble endpoint pool FULL on macOS controller (#7806) * * Move naming qpg6100 to qpg (#7936) * Removal Env overrides sdk root and target IC * fix build error in TCP.cpp (#8072) Include <limits> to satisfy the proper use of std::numeric_limits. * Add lighting example for Mbed OS (#8048) * Add back structs, bitmaps and enums of the Messaging cluster into ami… (#8061) * Add back structs, bitmaps and enums of the Messaging cluster into ami.xml * Update gen/ folders * Deprecated ASN1Writer::Finalize() Method. (#8056) * Split KeyValueStoreManager.java into interface and impl, and add Set() in JNI. (#8046) * [Test] Add Test_TC_DM_3_1 (#8067) * Add Test_TC_DM_3_1 to src/app/tests/suites with all tests disabled since the attributes are not present into commissioning.xml * Update generated tests * Followup #7873 - Replace emberAfPutInt8uInResp(ZCL_DEFAULT_RESPONSE_COMMAND_ID) by emberAfPutInt32uInResp(ZCL_DEFAULT_RESPONSE_COMMAND_ID) in src/app/util/util.cpp (#8060) * Remove call-command-handler.cpp from src/controller/data_model/gen/ and from src/darwin/Framework/CHIP.xcodeproj/project.pbxproj (#8021) * Add PID to Darwin/Linux Log Lines (#7657) * Add PID to Darwin/Linux Log Lines Problem: - Debugging test failures that involve multiple instances of applications is difficult when the log lines don't indicate which process/application they're coming from. Solution: - Added PID to the log lines on Darwin & Linux minimally to aid in debugging. Testing: - Ran chip-tool on both platforms. * Restyled by clang-format Co-authored-by: Restyled.io <[email protected]> * Update Darwin framework to use GetConnectedDevice (#8011) * Update Darwin framework to use GetConnectedDevice * address review comments * Add a string circular buffer. (#7475) * Add a string circular buffer. * Update src/lib/support/StringCircularBuffer.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/lib/support/StringCircularBuffer.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/lib/support/StringCircularBuffer.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Resolve comments * Resolve comments * Resolve comments * Resolve comments Co-authored-by: Justin Wood <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]> * [lighting-app] Enable optional Basic Cluster attributes (#8083) * [lighting-app] Enable optional Basic Cluster attributes Enable optional Basic Cluster attributes as requested by Chaintanya, to verify a proper behaviour of the Python controller. * Re-gen code * Add GenerateEventPathList and test (#8014) Summary of Changes: -- Add GenerateEventPathList function in ReadClinet -- Add one event path test and two event path test -- Fix im e2e cirque test in chip_im_responder from PR 7634 since cirque test is not enabled * Have a single loopback transport implementation for tests. (#8045) We have multiple, some with different bells and whistles. Should have one shared thing. Unfortunately, some consumers want to drive things off the loopback (like resending reliable messages) that other consumers can't know about because they are at lower layers of the stack. We just use a virtual hook for that for now. * Don't treat a resolve as done in chip-device-ctrl until we have a CASE connection. (#8012) This ensures that following commands will work instead of racing the CASE connection setup. * Regenerating * Restyled by whitespace * Restyled by google-java-format * Regenerating Co-authored-by: Justin Wood <[email protected]> Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Song Guo <[email protected]> Co-authored-by: C Freeman <[email protected]> Co-authored-by: Vivien Nicolas <[email protected]> Co-authored-by: Damian Królik <[email protected]> Co-authored-by: chrisdecenzo <[email protected]> Co-authored-by: rgoliver <[email protected]> Co-authored-by: Wang Qixiang <[email protected]> Co-authored-by: Kevin Schoedel <[email protected]> Co-authored-by: Yufeng Wang <[email protected]> Co-authored-by: Evgeny Margolis <[email protected]> Co-authored-by: Pankaj Garg <[email protected]> Co-authored-by: krypton36 <[email protected]> Co-authored-by: Timothy Maes <[email protected]> Co-authored-by: CodeChronos <[email protected]> Co-authored-by: Vincent Coubard <[email protected]> Co-authored-by: Austin Hsieh <[email protected]> Co-authored-by: Jerry Johns <[email protected]> Co-authored-by: Zang MingJie <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]> Co-authored-by: yunhanw-google <[email protected]>

* add electrical measurement cluster to controller-clusters.zap Only a selection of the optional clusters is enabled. mandatory: - measurement type optional: - total active power - rms voltage - rms voltage min - rms voltage max - rms current - rms current min - rms current max - active power - active power min - active power max * add electrical measurement cluster to zap_cluster_list.py * add electrical measurement cluster to all-clusters-app * add electrical measurement cluster to all-cluster-app/esp32 * add app helpers for electrical measurement cluster * fix all cluster app build * regen all * Regenerating * Restyled by whitespace * Restyled by clang-format * Regenerating * Restyled by whitespace * Restyled by google-java-format * [fix] Wrong callback passed to WriteAttribute in Python[TE4] (project-chip#8019) * Fix callback typr * Run codegen * Mdns: _chip* -> _matter*, remove 0's on subtypes (project-chip#7805) * Mdns: _chip* i-> _matter*, remove 0's on subtypes The second ballot changed the format of the subtypes as well as fixed the service name prefix from _chip* to _matter*. NOTE FOR DEVs: Updating past this change will require updating the devices and controllers as otherwise they will be unable to find each other. * Darwin - use local kLocalDomain var. It includes a . and the one in the ServiceNaming doesn't. * Trying again for Darwin. * Fix host name. * Fix small error on merge * Use a dedicated chip-types.xml file into src/app/zap-templates/zcl (project-chip#7873) * Update chip-types.xml * Update gen/ folders * Revert "Mark UDP socket as ready for write in send msg. (project-chip#7927)" (project-chip#8027) Turns out the code causes that subsequent select()-s never wait so another solution for the original issue must be prepared. This reverts commit 8c55523. * [ZAP] Add isAnalog instead of isDiscreteType to account for string types (project-chip#7821) * Mdns: separate query responders for advertisers (project-chip#7615) * Mdns: separate query responders for advertisers The current setup uses a single query responder for commissionable and operational and all the records are cleared together and added in a large group. This makes it challenging to run commissionable and operational at the same time since they can't be cleared individually and because there are duplicate records between operational and commissionable. This commit changes the code to use one query responder per advertisement type and gets the ResponseSender to loop through the query responders to filter for answers. * Apply suggestions from code review Co-authored-by: chrisdecenzo <[email protected]> * Restyled by clang-format * Fix tests - they were not testing right. * Restyled by clang-format * Update number of responders Represents 5 multi-admin fabrics for operational, commissionable and commissioner. * Whoops - broke a test with my last "minor" change. * Lighten the stack load for the failing test. Co-authored-by: chrisdecenzo <[email protected]> Co-authored-by: Restyled.io <[email protected]> * [nrfconnect] Stop using cooperative threads (project-chip#8025) nRF Connect platform used cooperative threads, that is threads that cannot be preempted, to workaround some synchronization issues in the past, but it's no longer needed and is risky. The latter was revealed by project-chip#7927, which caused that `select()` never waits (needs to be fixed in another PR). Signed-off-by: Damian Krolik <[email protected]> * IPV6-only test app for esp32 (examples/ipv6only-app) (project-chip#7289) Adds RPCs that conform to NDM/GDM WiFi capabilities. Disables IPV4 DHCP client. Assigns link-local IPV6 address. Starts a UDP echo server on an IPV6 UDP socket. Test: Ran on M5Stack and verified it scanned and connected to wifi, after connected verified it echoed UDP messages. * [ESP32] fix compile error for persistent-storage app (project-chip#7940) * [ESP32] fix compile error for persistent-storage app * add CI for all ESP examples * Consolidate error types (project-chip#7916) * Consolidate error types #### Problem CHIP currently has `CHIP_ERROR`, `INET_ERROR`, `BLE_ERROR`, `ASN1_ERROR`, `System::Error`. Since they're all integers underneath, there is no type checking, and existing code routinely treats them as interchangeable. There is also existing code that uses `int` and `int32_t`. Each also has a `…_NO_ERROR` code which is independently configurable, but existing code assumes they are equal, and there is exising code that assumes the C convention that the value is 0. #### Change overview Fixes project-chip#7688 Unify chip errors This change is largely a mechanical replacement of type and some error code names, with a few cleanups of weak typing. Consolidated error types to one, `CHIP_ERROR`. Removed configurability of `CHIP_NO_ERROR`; it must be 0. Added `CHIP_ERROR_FORMAT` to replace hardcoded `PRI…32` in `printf()` format strings. Added `CHIP_ERROR_SENTINEL` to replace the use of `CHIP_ERROR_MAX` as a sentinel. Renamed or consolidated the following errors, which have the same meaning. Merely similar codes are left alone. This change contains compatibility defintitions to avoid breaking PRs in flight, which will be removed in a followup. | before | after | |:---------------------------------------|:------------------------------------| | ASN1_ERROR | CHIP_ERROR | | ASN1_NO_ERROR | CHIP_NO_ERROR | | BLE_ERROR | CHIP_ERROR | | BLE_NO_ERROR | CHIP_NO_ERROR | | BLE_ERROR_BAD_ARGS | CHIP_ERROR_INVALID_ARGUMENT | | BLE_ERROR_INCORRECT_STATE | CHIP_ERROR_INCORRECT_STATE | | BLE_ERROR_MESSAGE_INCOMPLETE | CHIP_ERROR_MESSAGE_INCOMPLETE | | BLE_ERROR_NOT_IMPLEMENTED | CHIP_ERROR_NOT_IMPLEMENTED | | BLE_ERROR_NO_ENDPOINTS | CHIP_ERROR_ENDPOINT_POOL_FULL | | BLE_ERROR_NO_MEMORY | CHIP_ERROR_NO_MEMORY | | BLE_ERROR_OUTBOUND_MESSAGE_TOO_BIG | CHIP_ERROR_OUTBOUND_MESSAGE_TOO_BIG | | BLE_ERROR_RECEIVED_MESSAGE_TOO_BIG | CHIP_ERROR_INBOUND_MESSAGE_TOO_BIG | | CHIP_SYSTEM_NO_ERROR | CHIP_NO_ERROR | | CHIP_SYSTEM_ERROR_ACCESS_DENIED | CHIP_ERROR_ACCESS_DENIED | | CHIP_SYSTEM_ERROR_BAD_ARGS | CHIP_ERROR_INVALID_ARGUMENT | | CHIP_SYSTEM_ERROR_NOT_SUPPORTED | CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE | | CHIP_SYSTEM_ERROR_NO_MEMORY | CHIP_ERROR_NO_MEMORY | | CHIP_SYSTEM_ERROR_REAL_TIME_NOT_SYNCED | CHIP_ERROR_REAL_TIME_NOT_SYNCED | | CHIP_SYSTEM_ERROR_UNEXPECTED_EVENT | CHIP_ERROR_UNEXPECTED_EVENT | | CHIP_SYSTEM_ERROR_UNEXPECTED_STATE | CHIP_ERROR_INCORRECT_STATE | | INET_ERROR | CHIP_ERROR | | INET_NO_ERROR | CHIP_NO_ERROR | | INET_ERROR_BAD_ARGS | CHIP_ERROR_INVALID_ARGUMENT | | INET_ERROR_INBOUND_MESSAGE_TOO_BIG | CHIP_ERROR_INBOUND_MESSAGE_TOO_BIG | | INET_ERROR_INCORRECT_STATE | CHIP_ERROR_INCORRECT_STATE | | INET_ERROR_MESSAGE_TOO_LONG | CHIP_ERROR_MESSAGE_TOO_LONG | | INET_ERROR_NO_CONNECTION_HANDLER | CHIP_ERROR_NO_CONNECTION_HANDLER | | INET_ERROR_NO_ENDPOINTS | CHIP_ERROR_ENDPOINT_POOL_FULL | | INET_ERROR_NOT_IMPLEMENTED | CHIP_ERROR_NOT_IMPLEMENTED | | INET_ERROR_NOT_SUPPORTED | CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE | | INET_ERROR_NO_MEMORY | CHIP_ERROR_NO_MEMORY | | INET_ERROR_CONNECTION_ABORTED | CHIP_ERROR_CONNECTION_ABORTED | #### Testing Modified some unit tests to account for consolidated error codes. Built locally with `CHIP_ERROR` hardcoded to `int32_t`, `uint32_t`, `int16_t`, and `uint16_t` to shake out mistaken type assumptions. * Build fixes * Darwin * Doxygen * Fixes * Change default CHIP_CONFIG_ERROR_TYPE back to `int32_t`. * Fix CHIP_ERROR_INBOUND_MESSAGE_TOO_BIG message text. * C++-style casts. * fix: CHIPError.h uses stdint.h * zap * fix for Mbed merge * Throw exception instead of return 0 for get-fabricid in case of error (project-chip#7884) * Implement User Directed Commissioning - Phase 1 (project-chip#8034) * Updated CHIP Certs Implementation to Use Spans instaed of Pointer/Len Pairs. (project-chip#7599) Specifically, added the following FixedSpan types: - CertificateKeyId - P256ECDSASignatureSpan - P256PublicKeySpan Also redefined mString member in the ChipRDN structure to be ByteSpan. * Zap use const expr for clusters commands attributes (project-chip#7946) * Remove duplicated command ids and attribute ids definitions from the encoder-src.zapt template Add ids/Commands.zapt template Update template to use Commands.h and Clusters.h * Fix XML definitions typos for attributes name * Add ids/Commands.h to the gen folder of src/app/common * Update log messages for session expiry (project-chip#8017) * Update log messages for session expiry * update format specifier * Remove client-command-macro.h-aa80d825 from examples/bridge-app/bridge-common/gen (project-chip#8026) * Fix Ble endpoint pool FULL on macOS controller (project-chip#7806) * * Move naming qpg6100 to qpg (project-chip#7936) * Removal Env overrides sdk root and target IC * fix build error in TCP.cpp (project-chip#8072) Include <limits> to satisfy the proper use of std::numeric_limits. * Add lighting example for Mbed OS (project-chip#8048) * Add back structs, bitmaps and enums of the Messaging cluster into ami… (project-chip#8061) * Add back structs, bitmaps and enums of the Messaging cluster into ami.xml * Update gen/ folders * Deprecated ASN1Writer::Finalize() Method. (project-chip#8056) * Split KeyValueStoreManager.java into interface and impl, and add Set() in JNI. (project-chip#8046) * [Test] Add Test_TC_DM_3_1 (project-chip#8067) * Add Test_TC_DM_3_1 to src/app/tests/suites with all tests disabled since the attributes are not present into commissioning.xml * Update generated tests * Followup project-chip#7873 - Replace emberAfPutInt8uInResp(ZCL_DEFAULT_RESPONSE_COMMAND_ID) by emberAfPutInt32uInResp(ZCL_DEFAULT_RESPONSE_COMMAND_ID) in src/app/util/util.cpp (project-chip#8060) * Remove call-command-handler.cpp from src/controller/data_model/gen/ and from src/darwin/Framework/CHIP.xcodeproj/project.pbxproj (project-chip#8021) * Add PID to Darwin/Linux Log Lines (project-chip#7657) * Add PID to Darwin/Linux Log Lines Problem: - Debugging test failures that involve multiple instances of applications is difficult when the log lines don't indicate which process/application they're coming from. Solution: - Added PID to the log lines on Darwin & Linux minimally to aid in debugging. Testing: - Ran chip-tool on both platforms. * Restyled by clang-format Co-authored-by: Restyled.io <[email protected]> * Update Darwin framework to use GetConnectedDevice (project-chip#8011) * Update Darwin framework to use GetConnectedDevice * address review comments * Add a string circular buffer. (project-chip#7475) * Add a string circular buffer. * Update src/lib/support/StringCircularBuffer.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/lib/support/StringCircularBuffer.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Update src/lib/support/StringCircularBuffer.cpp Co-authored-by: Boris Zbarsky <[email protected]> * Resolve comments * Resolve comments * Resolve comments * Resolve comments Co-authored-by: Justin Wood <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]> * [lighting-app] Enable optional Basic Cluster attributes (project-chip#8083) * [lighting-app] Enable optional Basic Cluster attributes Enable optional Basic Cluster attributes as requested by Chaintanya, to verify a proper behaviour of the Python controller. * Re-gen code * Add GenerateEventPathList and test (project-chip#8014) Summary of Changes: -- Add GenerateEventPathList function in ReadClinet -- Add one event path test and two event path test -- Fix im e2e cirque test in chip_im_responder from PR 7634 since cirque test is not enabled * Have a single loopback transport implementation for tests. (project-chip#8045) We have multiple, some with different bells and whistles. Should have one shared thing. Unfortunately, some consumers want to drive things off the loopback (like resending reliable messages) that other consumers can't know about because they are at lower layers of the stack. We just use a virtual hook for that for now. * Don't treat a resolve as done in chip-device-ctrl until we have a CASE connection. (project-chip#8012) This ensures that following commands will work instead of racing the CASE connection setup. * Regenerating * Restyled by whitespace * Restyled by google-java-format * Regenerating Co-authored-by: Justin Wood <[email protected]> Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Song Guo <[email protected]> Co-authored-by: C Freeman <[email protected]> Co-authored-by: Vivien Nicolas <[email protected]> Co-authored-by: Damian Królik <[email protected]> Co-authored-by: chrisdecenzo <[email protected]> Co-authored-by: rgoliver <[email protected]> Co-authored-by: Wang Qixiang <[email protected]> Co-authored-by: Kevin Schoedel <[email protected]> Co-authored-by: Yufeng Wang <[email protected]> Co-authored-by: Evgeny Margolis <[email protected]> Co-authored-by: Pankaj Garg <[email protected]> Co-authored-by: krypton36 <[email protected]> Co-authored-by: Timothy Maes <[email protected]> Co-authored-by: CodeChronos <[email protected]> Co-authored-by: Vincent Coubard <[email protected]> Co-authored-by: Austin Hsieh <[email protected]> Co-authored-by: Jerry Johns <[email protected]> Co-authored-by: Zang MingJie <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]> Co-authored-by: yunhanw-google <[email protected]>

dependencies for UDC

b7318b3

boring-cyborg bot added app controller lib labels Jun 30, 2021

pullapprove bot requested review from andy31415, bzbarsky-apple, Damian-Nordic, hawk248, jepenven-silabs and msandstedt June 30, 2021 17:41

pullapprove bot added the review - pending label Jun 30, 2021

msandstedt approved these changes Jun 30, 2021

View reviewed changes

chrisdecenzo requested a review from cecille June 30, 2021 18:01

cecille reviewed Jun 30, 2021

View reviewed changes

src/controller/python/ChipDeviceController-ScriptBinding.cpp Show resolved Hide resolved

cecille approved these changes Jun 30, 2021

View reviewed changes

fix build

5711479

woody-apple approved these changes Jun 30, 2021

View reviewed changes

woody-apple added the has conflicts label Jun 30, 2021

hawk248 approved these changes Jun 30, 2021

View reviewed changes

sharadb-amazon approved these changes Jun 30, 2021

View reviewed changes

fix mdns examples

aa021a6

boring-cyborg bot added the examples label Jun 30, 2021

pullapprove bot added review - approved and removed review - pending labels Jun 30, 2021

chrisdecenzo added 3 commits June 30, 2021 12:46

merge to mainline TOT

1e65f1b

fix typo

2ada1f7

fix broken nRF build

a8c531c

msandstedt merged commit dac287b into master Jul 1, 2021

msandstedt deleted the udc-phase1 branch July 1, 2021 04:27

bzbarsky-apple reviewed Jul 1, 2021

View reviewed changes

msandstedt mentioned this pull request Jul 1, 2021

IGNORE - Implement User Directed Commissioning #6790

Closed

bzbarsky-apple reviewed Jul 1, 2021

View reviewed changes

chrisdecenzo mentioned this pull request Jul 30, 2021

cleanup fixes relating to udc #8739

Merged

nikita-s-wrk pushed a commit to nikita-s-wrk/connectedhomeip that referenced this pull request Sep 23, 2021

Implement User Directed Commissioning - Phase 1 (project-chip#8034)

46eb40b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement User Directed Commissioning - Phase 1 #8034

Implement User Directed Commissioning - Phase 1 #8034

chrisdecenzo commented Jun 30, 2021

github-actions bot commented Jul 1, 2021

github-actions bot commented Jul 1, 2021

github-actions bot commented Jul 1, 2021

bzbarsky-apple Jul 1, 2021

bzbarsky-apple Jul 1, 2021

chrisdecenzo Jul 30, 2021

bzbarsky-apple Jul 1, 2021

bzbarsky-apple Jul 1, 2021

bzbarsky-apple Jul 1, 2021

bzbarsky-apple Jul 1, 2021

bzbarsky-apple Jul 1, 2021

bzbarsky-apple Jul 1, 2021

	auto & mdnsAdvertiser = chip::Mdns::ServiceAdvertiser::Instance();
	auto & mdnsAdvertiser = ServiceAdvertiser::Instance();

	Mdns::DiscoveryFilter filter(Mdns::DiscoveryFilterType::kNone, (uint16_t) 0);
	Mdns::DiscoveryFilter filter(Mdns::DiscoveryFilterType::kNone, static_cast<uint16_t>(0));

	chip::Platform::CopyString(mDeviceName, sizeof(mDeviceName), deviceName.Value());
	Platform::CopyString(mDeviceName, sizeof(mDeviceName), deviceName.Value());

	chip::Platform::CopyString(mRotatingId, sizeof(mRotatingId), rotatingId.Value());
	Platform::CopyString(mRotatingId, sizeof(mRotatingId), rotatingId.Value());

	chip::Platform::CopyString(mPairingInstr, sizeof(mPairingInstr), pairingInstr.Value());
	Platform::CopyString(mPairingInstr, sizeof(mPairingInstr), pairingInstr.Value());

Implement User Directed Commissioning - Phase 1 #8034

Implement User Directed Commissioning - Phase 1 #8034

Conversation

chrisdecenzo commented Jun 30, 2021

Problem

Change overview

Testing

github-actions bot commented Jul 1, 2021

github-actions bot commented Jul 1, 2021

github-actions bot commented Jul 1, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment