Skip to content

Commit

Permalink
support for electrical measurement cluster (#7953)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
1 parent 12180c6 commit 3d9fc15
Show file tree
Hide file tree
Showing 26 changed files with 2,643 additions and 14 deletions.
217 changes: 217 additions & 0 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
Original file line number Diff line number Diff line change
Expand Up @@ -12886,6 +12886,223 @@
}
]
},
{
"name": "Electrical Measurement",
"code": 2820,
"mfgCode": null,
"define": "ELECTRICAL_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [],
"attributes": [
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "client",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
},
{
"name": "Electrical Measurement",
"code": 2820,
"mfgCode": null,
"define": "ELECTRICAL_MEASUREMENT_CLUSTER",
"side": "server",
"enabled": 1,
"commands": [],
"attributes": [
{
"name": "measurement type",
"code": 0,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x000000",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "total active power",
"code": 772,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x000000",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "rms voltage",
"code": 1285,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xffff",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "rms voltage min",
"code": 1286,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x8000",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "rms voltage max",
"code": 1287,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0x8000",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "rms current",
"code": 1288,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xffff",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "rms current min",
"code": 1289,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xffff",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "rms current max",
"code": 1290,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xffff",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "active power",
"code": 1291,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xffff",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "active power min",
"code": 1292,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xffff",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "active power max",
"code": 1293,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0xffff",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
},
{
"name": "cluster revision",
"code": 65533,
"mfgCode": null,
"side": "server",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "3",
"reportable": 0,
"minInterval": 0,
"maxInterval": 65344,
"reportableChange": 0
}
]
},
{
"name": "Binding",
"code": 61440,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
case ZCL_DOOR_LOCK_CLUSTER_ID:
emberAfDoorLockClusterInitCallback(endpoint);
break;
case ZCL_ELECTRICAL_MEASUREMENT_CLUSTER_ID:
emberAfElectricalMeasurementClusterInitCallback(endpoint);
break;
case ZCL_ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER_ID:
emberAfEthernetNetworkDiagnosticsClusterInitCallback(endpoint);
break;
Expand Down Expand Up @@ -249,6 +252,11 @@ void __attribute__((weak)) emberAfDoorLockClusterInitCallback(EndpointId endpoin
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfElectricalMeasurementClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
(void) endpoint;
}
void __attribute__((weak)) emberAfEthernetNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
{
// To prevent warning
Expand Down
79 changes: 79 additions & 0 deletions examples/all-clusters-app/all-clusters-common/gen/callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@ void emberAfDiagnosticLogsClusterInitCallback(chip::EndpointId endpoint);
*/
void emberAfDoorLockClusterInitCallback(chip::EndpointId endpoint);

/** @brief Electrical Measurement Cluster Init
*
* Cluster Init
*
* @param endpoint Endpoint that is being initialized
*/
void emberAfElectricalMeasurementClusterInitCallback(chip::EndpointId endpoint);

/** @brief Ethernet Network Diagnostics Cluster Init
*
* Cluster Init
Expand Down Expand Up @@ -1405,6 +1413,77 @@ EmberAfStatus emberAfDoorLockClusterServerPreAttributeChangedCallback(chip::Endp
*/
void emberAfDoorLockClusterServerTickCallback(chip::EndpointId endpoint);

//
// Electrical Measurement Cluster server
//

/** @brief Electrical Measurement Cluster Server Init
*
* Server Init
*
* @param endpoint Endpoint that is being initialized
*/
void emberAfElectricalMeasurementClusterServerInitCallback(chip::EndpointId endpoint);

/** @brief Electrical Measurement Cluster Server Attribute Changed
*
* Server Attribute Changed
*
* @param endpoint Endpoint that is being initialized
* @param attributeId Attribute that changed
*/
void emberAfElectricalMeasurementClusterServerAttributeChangedCallback(chip::EndpointId endpoint, chip::AttributeId attributeId);

/** @brief Electrical Measurement Cluster Server Manufacturer Specific Attribute Changed
*
* Server Manufacturer Specific Attribute Changed
*
* @param endpoint Endpoint that is being initialized
* @param attributeId Attribute that changed
* @param manufacturerCode Manufacturer Code of the attribute that changed
*/
void emberAfElectricalMeasurementClusterServerManufacturerSpecificAttributeChangedCallback(chip::EndpointId endpoint,
chip::AttributeId attributeId,
uint16_t manufacturerCode);

/** @brief Electrical Measurement Cluster Server Message Sent
*
* Server Message Sent
*
* @param type The type of message sent
* @param destination The destination to which the message was sent
* @param apsFrame The APS frame for the message
* @param msgLen The length of the message
* @param message The message that was sent
* @param status The status of the sent message
*/
void emberAfElectricalMeasurementClusterServerMessageSentCallback(const chip::MessageSendDestination & destination,
EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
EmberStatus status);

/** @brief Electrical Measurement Cluster Server Pre Attribute Changed
*
* server Pre Attribute Changed
*
* @param endpoint Endpoint that is being initialized
* @param attributeId Attribute to be changed
* @param attributeType Attribute type
* @param size Attribute size
* @param value Attribute value
*/
EmberAfStatus emberAfElectricalMeasurementClusterServerPreAttributeChangedCallback(chip::EndpointId endpoint,
chip::AttributeId attributeId,
EmberAfAttributeType attributeType,
uint16_t size, uint8_t * value);

/** @brief Electrical Measurement Cluster Server Tick
*
* server Tick
*
* @param endpoint Endpoint that is being served
*/
void emberAfElectricalMeasurementClusterServerTickCallback(chip::EndpointId endpoint);

//
// Ethernet Network Diagnostics Cluster server
//
Expand Down
Loading

0 comments on commit 3d9fc15

Please sign in to comment.