Merge branch 'master' into pr/camera/pushav

Author: sayondeep

.github/workflows/darwin.yaml

@@ -96,15 +96,6 @@ jobs:
                   platform: darwin
                   bootstrap-log-name:
                       bootstrap-logs-framework-${{ matrix.options.flavor }}
-            - name: Build example All Clusters Server
-              run: |
-                  scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/all-clusters-app chip_config_network_layer_ble=false
-            - name: Build example OTA Provider
-              run: |
-                  scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug/ota-provider-app chip_config_network_layer_ble=false
-            - name: Build example OTA Requestor
-              run: |
-                  scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug/ota-requestor-app chip_config_network_layer_ble=false non_spec_compliant_ota_action_delay_floor=0
             - name: Run Framework Tests
               # We want to ensure that our log upload runs on timeout, so use a timeout here shorter
               # than the 6-hour overall job timeout.  4.5 hours should be plenty.

.github/workflows/examples-efr32.yaml

@@ -84,6 +84,7 @@ jobs:
                 --target efr32-brd4187c-lock-rpc \
                 --target efr32-brd4187c-air-quality-sensor-app-shell-heap-monitoring \
                 --target efr32-brd4187c-window-covering-additional-data-advertising \
+                --target efr32-brd4187c-closure \
                 build \
                 --copy-artifacts-to out/artifacts \
              "
@@ -106,6 +107,7 @@ jobs:
                 --enable-flashbundle \
                 --target efr32-brd2605a-light-skip-rps-generation \
                 --target efr32-brd4338a-lock-skip-rps-generation \
+                --target efr32-brd4338a-closure-skip-rps-generation \
                 build \
                 --copy-artifacts-to out/artifacts \
              "

docs/guides/BUILDING.md

@@ -131,7 +131,7 @@ Complete the following steps:
 1. Install some Raspberry Pi specific dependencies:
 
     ```
-    sudo apt-get install pi-bluetooth avahi-utils
+    sudo apt-get install bluez pi-bluetooth avahi-utils
     ```
 
 1. Reboot your Raspberry Pi after installing `pi-bluetooth`.

docs/testing/yaml_schema.md

@@ -7,6 +7,7 @@ Script: generate_yaml_doc_tables.py
 # YAML Schema
 
 YAML schema
+
 |key | type| supports variables
 |:---|:---|:---|
 |name |str||
@@ -54,6 +55,7 @@ YAML schema
 |      endsWith |str||
 |      isUpperCase |bool||
 |      isLowerCase |bool||
+|      isSetOfValues |list||
 |      minValue |int,float|Y|
 |      maxValue |int,float|Y|
 |      contains |list||

examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

@@ -424,7 +424,7 @@ cluster Descriptor = 29 {
     kTagList = 0x1;
   }
 
-  shared struct DeviceTypeStruct {
+  struct DeviceTypeStruct {
     devtype_id deviceType = 0;
     int16u revision = 1;
   }

examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

@@ -352,7 +352,7 @@ cluster Descriptor = 29 {
     kTagList = 0x1;
   }
 
-  shared struct DeviceTypeStruct {
+  struct DeviceTypeStruct {
     devtype_id deviceType = 0;
     int16u revision = 1;
   }

examples/air-quality-sensor-app/silabs/include/AppEvent.h

@@ -18,39 +18,23 @@
  */
 
 #pragma once
-#include <cstdint>
 
-struct AppEvent;
-typedef void (*EventHandler)(AppEvent *);
+#include "BaseAppEvent.h"
 
-struct AppEvent
+struct AppEvent : public BaseAppEvent
 {
     enum AppEventTypes
     {
-        kEventType_Button = 0,
-        kEventType_Timer,
-        kEventType_AirQualitySensor,
+        kEventType_AirQualitySensor = BaseAppEvent::kEventType_Max + 1,
         kEventType_Install,
     };
 
-    uint16_t Type;
-
     union
     {
-        struct
-        {
-            uint8_t Action;
-        } ButtonEvent;
-        struct
-        {
-            void * Context;
-        } TimerEvent;
         struct
         {
             uint8_t Action;
             int32_t Actor;
         } AirQualitySensorEvent;
     };
-
-    EventHandler Handler;
 };

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -698,7 +698,7 @@ cluster Descriptor = 29 {
     kTagList = 0x1;
   }
 
-  shared struct DeviceTypeStruct {
+  struct DeviceTypeStruct {
     devtype_id deviceType = 0;
     int16u revision = 1;
   }
@@ -726,7 +726,7 @@ cluster Descriptor = 29 {
 
 /** The Binding Cluster is meant to replace the support from the Zigbee Device Object (ZDO) for supporting the binding table. */
 cluster Binding = 30 {
-  revision 1; // NOTE: Default/not specifically set
+  revision 1;
 
   fabric_scoped struct TargetStruct {
     optional node_id node = 1;
@@ -7108,6 +7108,7 @@ provisional cluster CameraAvStreamManagement = 1361 {
     kOnScreenDisplay = 0x80;
     kLocalStorage = 0x100;
     kHighDynamicRange = 0x200;
+    kNightVision = 0x400;
   }
 
   struct VideoResolutionStruct {
@@ -7142,6 +7143,8 @@ provisional cluster CameraAvStreamManagement = 1361 {
     int8u referenceCount = 6;
     boolean encodedPixels = 7;
     boolean hardwareEncoder = 8;
+    optional boolean watermarkEnabled = 9;
+    optional boolean OSDEnabled = 10;
   }
 
   struct SnapshotCapabilitiesStruct {
@@ -7193,7 +7196,7 @@ provisional cluster CameraAvStreamManagement = 1361 {
   readonly attribute optional int8u maxConcurrentEncoders = 0;
   readonly attribute optional int32u maxEncodedPixelRate = 1;
   readonly attribute optional VideoSensorParamsStruct videoSensorParams = 2;
-  readonly attribute optional boolean nightVisionCapable = 3;
+  readonly attribute optional boolean nightVisionUsesInfrared = 3;
   readonly attribute optional VideoResolutionStruct minViewport = 4;
   readonly attribute optional RateDistortionTradeOffPointsStruct rateDistortionTradeOffPoints[] = 5;
   readonly attribute int32u maxContentBufferSize = 6;
@@ -8542,7 +8545,7 @@ endpoint 0 {
   }
 
   server cluster UnitLocalization {
-    persist  attribute temperatureUnit default = 0;
+    callback attribute temperatureUnit;
     callback attribute supportedTemperatureUnits;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
@@ -9825,7 +9828,7 @@ endpoint 1 {
     ram      attribute colorCapabilities default = 0x1F;
     ram      attribute colorTempPhysicalMinMireds default = 0x009A;
     ram      attribute colorTempPhysicalMaxMireds default = 0x01C6;
-    ram      attribute coupleColorTempToLevelMinMireds;
+    ram      attribute coupleColorTempToLevelMinMireds default = 0x009A;
     persist  attribute startUpColorTemperatureMireds default = 0x00FA;
     ram      attribute featureMap default = 0x1F;
     ram      attribute clusterRevision default = 7;

examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

@@ -1563,10 +1563,10 @@
               "side": "server",
               "type": "TempUnitEnum",
               "included": 1,
-              "storageOption": "NVM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -17077,7 +17077,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": "0x009A",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

examples/all-clusters-app/all-clusters-common/src/camera-av-stream-delegate-impl.cpp

@@ -333,14 +333,15 @@ void emberAfCameraAvStreamManagementClusterInitCallback(EndpointId endpoint)
 
     BitFlags<Feature> features;
     features.Set(Feature::kSnapshot);
+    features.Set(Feature::kNightVision);
 
     BitFlags<OptionalAttribute> optionalAttrs;
     optionalAttrs.Set(OptionalAttribute::kNightVision);
     optionalAttrs.Set(OptionalAttribute::kNightVisionIllum);
     uint32_t maxConcurrentVideoEncoders  = 1;
     uint32_t maxEncodedPixelRate         = 10000;
     VideoSensorParamsStruct sensorParams = { 4608, 2592, 120, Optional<uint16_t>(30) }; // Typical numbers for Pi camera.
-    bool nightVisionCapable              = false;
+    bool nightVisionUsesInfrared         = false;
     VideoResolutionStruct minViewport    = { 854, 480 }; // Assuming 480p resolution.
     std::vector<RateDistortionTradeOffStruct> rateDistortionTradeOffPoints = {};
     uint32_t maxContentBufferSize                                          = 1024;
@@ -354,7 +355,7 @@ void emberAfCameraAvStreamManagementClusterInitCallback(EndpointId endpoint)
 
     sCameraAVStreamMgmtClusterServerInstance = std::make_unique<CameraAVStreamMgmtServer>(
         *sCameraAVStreamMgrInstance.get(), endpoint, features, optionalAttrs, maxConcurrentVideoEncoders, maxEncodedPixelRate,
-        sensorParams, nightVisionCapable, minViewport, rateDistortionTradeOffPoints, maxContentBufferSize, micCapabilities,
+        sensorParams, nightVisionUsesInfrared, minViewport, rateDistortionTradeOffPoints, maxContentBufferSize, micCapabilities,
         spkrCapabilities, twowayTalkSupport, snapshotCapabilities, maxNetworkBandwidth, supportedStreamUsages,
         rankedStreamPriorities);
     sCameraAVStreamMgmtClusterServerInstance->Init();