Restyle Part 4: feature/binary input basic cluster

examples/chip-tool/commands/reporting/Commands.h

@@ -30,6 +30,8 @@ class Listen : public ReportingCommand
 
     ~Listen()
     {
+        delete onReportBinaryInputBasicPresentValueCallback;
+        delete onReportBinaryInputBasicStatusFlagsCallback;
         delete onReportColorControlCurrentHueCallback;
         delete onReportColorControlCurrentSaturationCallback;
         delete onReportColorControlCurrentXCallback;
@@ -51,6 +53,10 @@ class Listen : public ReportingCommand
     void AddReportCallbacks(uint8_t endpointId) override
     {
         chip::app::CHIPDeviceCallbacksMgr & callbacksMgr = chip::app::CHIPDeviceCallbacksMgr::GetInstance();
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x000F, 0x0055,
+                                       onReportBinaryInputBasicPresentValueCallback->Cancel());
+        callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x000F, 0x006F,
+                                       onReportBinaryInputBasicStatusFlagsCallback->Cancel());
         callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0000,
                                        onReportColorControlCurrentHueCallback->Cancel());
         callbacksMgr.AddReportCallback(chip::kTestDeviceNodeId, endpointId, 0x0300, 0x0001,
@@ -117,6 +123,10 @@ class Listen : public ReportingCommand
     }
 
 private:
+    chip::Callback::Callback<BooleanAttributeCallback> * onReportBinaryInputBasicPresentValueCallback =
+        new chip::Callback::Callback<BooleanAttributeCallback>(OnBooleanAttributeResponse, this);
+    chip::Callback::Callback<Int8uAttributeCallback> * onReportBinaryInputBasicStatusFlagsCallback =
+        new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
     chip::Callback::Callback<Int8uAttributeCallback> * onReportColorControlCurrentHueCallback =
         new chip::Callback::Callback<Int8uAttributeCallback>(OnInt8uAttributeResponse, this);
     chip::Callback::Callback<Int8uAttributeCallback> * onReportColorControlCurrentSaturationCallback =

src/app/clusters/binary-input-server/binary-input-server.cpp

@@ -0,0 +1,81 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "binary-input-server.h"
+
+#include <app/util/af.h>
+
+#include "gen/att-storage.h"
+#include "gen/attribute-id.h"
+#include "gen/attribute-type.h"
+#include "gen/cluster-id.h"
+#include "gen/command-id.h"
+
+static inline EmberAfStatus emberAfBinaryInputBasicClusterGetPresentValueCallback(chip::EndpointId endpoint, bool * presentValue)
+{
+    return emberAfReadAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_PRESENT_VALUE_ATTRIBUTE_ID, CLUSTER_MASK_SERVER,
+                                (uint8_t *) presentValue, sizeof(uint8_t), NULL);
+}
+
+static inline EmberAfStatus emberAfBinaryInputBasicClusterGetOutOfServiceCallback(chip::EndpointId endpoint, bool * isOutOfService)
+{
+    return emberAfReadAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_OUT_OF_SERVICE_ATTRIBUTE_ID, CLUSTER_MASK_SERVER,
+                                (uint8_t *) isOutOfService, sizeof(uint8_t), NULL);
+}
+
+void emberAfBinaryInputBasicClusterServerInitCallback(chip::EndpointId endpoint)
+{
+    bool presentValue    = false;
+    EmberAfStatus status = emberAfBinaryInputBasicClusterGetPresentValueCallback(endpoint, &presentValue);
+
+    if (EMBER_ZCL_STATUS_SUCCESS != status)
+    {
+        (void) emberAfBinaryInputBasicClusterSetPresentValueCallback(endpoint, false);
+    }
+
+    bool isOutOfService = false;
+    status              = emberAfBinaryInputBasicClusterGetOutOfServiceCallback(endpoint, &isOutOfService);
+
+    if (EMBER_ZCL_STATUS_SUCCESS != status)
+    {
+        (void) emberAfBinaryInputBasicClusterSetOutOfServiceCallback(endpoint, false);
+    }
+}
+
+EmberAfStatus emberAfBinaryInputBasicClusterSetPresentValueCallback(chip::EndpointId endpoint, bool presentValue)
+{
+    EmberAfStatus status = emberAfWriteAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_PRESENT_VALUE_ATTRIBUTE_ID,
+                                                 CLUSTER_MASK_SERVER, (uint8_t *) &presentValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    if (EMBER_ZCL_STATUS_SUCCESS != status)
+    {
+        emberAfBinaryInputBasicClusterPrintln("ERR: writing present value %x", status);
+    }
+
+    return status;
+}
+
+EmberAfStatus emberAfBinaryInputBasicClusterSetOutOfServiceCallback(chip::EndpointId endpoint, bool isOutOfService)
+{
+    EmberAfStatus status = emberAfWriteAttribute(endpoint, ZCL_BINARY_INPUT_BASIC_CLUSTER_ID, ZCL_OUT_OF_SERVICE_ATTRIBUTE_ID,
+                                                 CLUSTER_MASK_SERVER, (uint8_t *) &isOutOfService, ZCL_BOOLEAN_ATTRIBUTE_TYPE);
+    if (EMBER_ZCL_STATUS_SUCCESS != status)
+    {
+        emberAfBinaryInputBasicClusterPrintln("ERR: writing present value %x", status);
+    }
+
+    return status;
+}

src/app/clusters/binary-input-server/binary-input-server.h

@@ -0,0 +1,23 @@
+/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app/util/af-types.h>
+
+EmberAfStatus emberAfBinaryInputBasicClusterSetPresentValueCallback(chip::EndpointId endpoint, bool presentValue);
+EmberAfStatus emberAfBinaryInputBasicClusterSetOutOfServiceCallback(chip::EndpointId endpoint, bool isOutOfService);

src/app/zap-templates/templates/app/helper.js

@@ -195,8 +195,10 @@ function asChipUnderlyingType(label, type)
 // These helpers only works within the endpoint_config iterator
 
 // List of all cluster with generated functions
-var endpointClusterWithInit =
-    [ 'Basic', 'Identify', 'Groups', 'Scenes', 'Occupancy Sensing', 'On/off', 'Level Control', 'Color Control', 'IAS Zone' ];
+var endpointClusterWithInit = [
+  'Basic', 'Binary Input (Basic)', 'Identify', 'Groups', 'Scenes', 'Occupancy Sensing', 'On/off', 'Level Control', 'Color Control',
+  'IAS Zone'
+];
 var endpointClusterWithAttributeChanged = [ 'Identify', 'Door Lock' ];
 var endpointClusterWithPreAttribute     = [ 'IAS Zone' ];
 var endpointClusterWithMessageSent      = [ 'IAS Zone' ];
@@ -219,7 +221,7 @@ function chip_endpoint_generated_functions()
   let alreadySetCluster = [];
   let ret               = '\\\n';
   this.clusterList.forEach((c) => {
-    let clusterName  = extract_cluster_name(c.comment);
+    let clusterName  = c.clusterName;
     let functionList = '';
     if (alreadySetCluster.includes(clusterName)) {
       // Only one array of Generated functions per cluster across all endpoints

src/app/zap_cluster_list.py

@@ -9,13 +9,15 @@
 
 # List of directories in src/app/clusters to build for server clusters.
 SERVER_CLUSTERS: typing.Dict[str, typing.List[str]] = {
+    'AIR_PRESSURE_MEASUREMENT_CLUSTER': ['air-pressure-measurement-server'],
     'ALARM_CLUSTER': [],
     'APPLICATION_BASIC_CLUSTER': [],
     'ACCOUNT_LOGIN_CLUSTER': [],
     'APPLICATION_LAUNCHER_CLUSTER': ['application-launcher-server'],
     'AUDIO_OUTPUT_CLUSTER': [],
     'BARRIER_CONTROL_CLUSTER': ['barrier-control-server'],
     'BASIC_CLUSTER': ['basic'],
+    'BINARY_INPUT_BASIC_CLUSTER': ['binary-input-server'],
     'BINDING_CLUSTER': ['bindings'],
     'COLOR_CONTROL_CLUSTER': ['color-control-server'],
     'COMMISSIONING_CLUSTER': [],
@@ -44,6 +46,7 @@
     'OTA_CLIENT_CLUSTER': [],
     'POWER_CONFIG_CLUSTER': [],
     'PUMP_CONFIG_CONTROL_CLUSTER': [],
+    'RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER': ['relative-humidity-measurement-server'],
     'SCENES_CLUSTER': ['scenes'],
     'SWITCH_CLUSTER': [],
     'TARGET_NAVIGATOR_CLUSTER': ['target-navigator-server'],
@@ -61,13 +64,15 @@
 
 # List of directories in src/app/clusters to build for client clusters.
 CLIENT_CLUSTERS: typing.Dict[str, typing.List[str]] = {
+    'AIR_PRESSURE_MEASUREMENT_CLUSTER': [],
     'ALARM_CLUSTER': [],
     'ACCOUNT_LOGIN_CLUSTER': [],
     'APPLICATION_LAUNCHER_CLUSTER': [],
     'AUDIO_OUTPUT_CLUSTER': [],
     'APPLICATION_BASIC_CLUSTER': [],
     'BARRIER_CONTROL_CLUSTER': [],
     'BASIC_CLUSTER': [],
+    'BINARY_INPUT_BASIC_CLUSTER': [],
     'BINDING_CLUSTER': [],
     'COLOR_CONTROL_CLUSTER': [],
     'COMMISSIONING_CLUSTER': [],
@@ -96,6 +101,7 @@
     'OTA_CLIENT_CLUSTER': [],
     'POWER_CONFIG_CLUSTER': [],
     'PUMP_CONFIG_CONTROL_CLUSTER': [],
+    'RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER': [],
     'SCENES_CLUSTER': [],
     'SWITCH_CLUSTER': [],
     'TARGET_NAVIGATOR_CLUSTER': [],