Merge branch 'YAML-Updates-2-23-2024' of https://github.com/raul-marquez-csa/connectedhomeip into YAML-Updates-2-23-2024

Author: raul-marquez-csa

build/chip/chip_codegen.gni

@@ -152,7 +152,7 @@ template("_chip_build_time_zapgen") {
     _output_subdir = "zap-generated"
   }
 
-  pw_python_action("${_name}_zap_pregen") {
+  pw_python_action("${_name}_zap") {
     script = "${chip_root}/scripts/tools/zap/generate.py"
 
     # TODO: this seems to touch internals. Is this ok? speeds up builds!
@@ -165,7 +165,7 @@ template("_chip_build_time_zapgen") {
       "--templates",
       _template_path,
       "--output-dir",
-      rebase_path(target_gen_dir) + "/zap_pregen/" + _output_subdir,
+      rebase_path(target_gen_dir) + "/zapgen/" + _output_subdir,
 
       # TODO: lock file support should be removed as this serializes zap
       # (slower), however this is currently done because on Darwin zap startup
@@ -188,54 +188,10 @@ template("_chip_build_time_zapgen") {
 
     sources = [ _idl_file ]
 
-    outputs = []
-    foreach(name, invoker.outputs) {
-      outputs += [ "${target_gen_dir}/zap_pregen/${name}" ]
-    }
-
-    forward_variables_from(invoker, [ "prune_outputs" ])
-    if (defined(prune_outputs)) {
-      foreach(name, prune_outputs) {
-        outputs += [ "${target_gen_dir}/zap_pregen/${name}" ]
-      }
-    }
-  }
-
-  # This action ensures that any "extra" files generated by zap codegen
-  # are actually deleted.
-  #
-  # This is to avoid double-codegen of configurations like endpoint config
-  # or access credentials being generated for both "controller client" and
-  # application-specific
-  pw_python_action("${_name}_files") {
-    # TODO: this seems to touch internals. Is this ok? speeds up builds!
-    _pw_internal_run_in_venv = false
-
-    script = "${chip_root}/scripts/tools/zap/prune_outputs.py"
-
-    _keep_file = rebase_path("${target_gen_dir}/${_name}.keep.outputs")
-    write_file(_keep_file, invoker.outputs, "list lines")
-
-    args = [
-      "--keep",
-      _keep_file,
-      "--input-dir",
-      rebase_path("${target_gen_dir}/zap_pregen/"),
-      "--output-dir",
-      rebase_path("${target_gen_dir}/zapgen/"),
-    ]
-
-    inputs = []
-    foreach(name, invoker.outputs) {
-      inputs += [ "${target_gen_dir}/zap_pregen/${name}" ]
-    }
-
     outputs = []
     foreach(name, invoker.outputs) {
       outputs += [ "${target_gen_dir}/zapgen/${name}" ]
     }
-
-    deps = [ ":${_name}_zap_pregen" ]
   }
 
   source_set(_name) {
@@ -255,10 +211,7 @@ template("_chip_build_time_zapgen") {
     if (!defined(public_deps)) {
       public_deps = []
     }
-    public_deps += [
-      ":${_name}_files",
-      ":${_name}_zap_pregen",
-    ]
+    public_deps += [ ":${_name}_zap" ]
   }
 }
 
@@ -420,7 +373,6 @@ template("chip_zapgen") {
                                "input",
                                "outputs",
                                "public_configs",
-                               "prune_outputs",
                              ])
     }
   } else {
@@ -482,7 +434,6 @@ template("chip_zapgen") {
                              [
                                "deps",
                                "public_configs",
-                               "prune_outputs",
                              ])
       if (!defined(public_configs)) {
         public_configs = []

examples/air-quality-sensor-app/linux/README.md

@@ -165,3 +165,21 @@ value.
 ```
 $ echo '{"Name":"NitrogenDioxideConcentrationMeasurement","NewValue":1}' > /tmp/chip_air_quality_fifo_<PID>
 ```
+
+Generate event `Pm1ConcentrationMeasurement`, to change the PM1 value.
+
+```
+echo '{"Name":"Pm1ConcentrationMeasurement","NewValue":1}' > /tmp/chip_air_quality_fifo_<PID>
+```
+
+Generate event `Pm25ConcentrationMeasurement`, to change the PM2.5 value.
+
+```
+echo '{"Name":"Pm25ConcentrationMeasurement","NewValue":2.5}' > /tmp/chip_air_quality_fifo_<PID>
+```
+
+Generate event `Pm10ConcentrationMeasurement`, to change the PM10 value.
+
+```
+echo '{"Name":"Pm10ConcentrationMeasurement","NewValue":10}' > /tmp/chip_air_quality_fifo_<PID>
+```

integrations/docker/images/base/chip-build/version

@@ -1 +1 @@
-37 : [NXP] Update Docker image for RW61X SDK
+38 : [NXP] Update Docker image for K32W1 SDK

integrations/docker/images/stage-2/chip-build-k32w/Dockerfile

@@ -24,9 +24,9 @@ RUN set -x \
 
 RUN set -x \
     && mkdir -p k32w1 \
-    && wget https://cache.nxp.com/lgfiles/bsps/SDK_2_12_6_K32W148-EVK.zip \
-    && unzip SDK_2_12_6_K32W148-EVK.zip -d k32w1 \
-    && rm -rf SDK_2_12_6_K32W148-EVK.zip
+    && wget https://cache.nxp.com/lgfiles/bsps/SDK_2_12_7_K32W148-EVK.zip \
+    && unzip SDK_2_12_7_K32W148-EVK.zip -d k32w1 \
+    && rm -rf SDK_2_12_7_K32W148-EVK.zip
 
 FROM ghcr.io/project-chip/chip-build:${VERSION}
 

scripts/py_matter_yamltests/matter_yamltests/hooks.py

@@ -13,6 +13,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+from typing import Optional
+
 from .parser import TestStep
 
 
@@ -213,6 +215,15 @@ async def step_manual(self):
         """
         pass
 
+    def show_prompt(self,
+                    msg: str,
+                    placeholder: Optional[str] = None,
+                    default_value: Optional[str] = None) -> None:
+        """
+        This method is called when the step needs to ask the user to perform some action or provide some value.
+        """
+        pass
+
 
 class WebSocketRunnerHooks():
     def connecting(self, url: str):

scripts/tools/zap/prune_outputs.py

@@ -302,15 +302,15 @@
             { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x7 }, /* ControlMode */                                                  \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Thermostat (server) */                                                                        \
-            { (uint16_t) 0xA28, (uint16_t) - 0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedCoolingSetpoint */                            \
-            { (uint16_t) 0x7D0, (uint16_t) - 0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedHeatingSetpoint */                            \
-            { (uint16_t) 0x2BC, (uint16_t) - 0x6AB3, (uint16_t) 0x7FFF }, /* MinHeatSetpointLimit */                               \
-            { (uint16_t) 0xBB8, (uint16_t) - 0x6AB3, (uint16_t) 0x7FFF }, /* MaxHeatSetpointLimit */                               \
-            { (uint16_t) 0x640, (uint16_t) - 0x6AB3, (uint16_t) 0x7FFF }, /* MinCoolSetpointLimit */                               \
-            { (uint16_t) 0xC80, (uint16_t) - 0x6AB3, (uint16_t) 0x7FFF }, /* MaxCoolSetpointLimit */                               \
-            { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 },         /* MinSetpointDeadBand */                                \
-            { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 },           /* ControlSequenceOfOperation */                         \
-            { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x9 },           /* SystemMode */                                         \
+            { (uint16_t) 0xA28, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedCoolingSetpoint */                             \
+            { (uint16_t) 0x7D0, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* OccupiedHeatingSetpoint */                             \
+            { (uint16_t) 0x2BC, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinHeatSetpointLimit */                                \
+            { (uint16_t) 0xBB8, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxHeatSetpointLimit */                                \
+            { (uint16_t) 0x640, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MinCoolSetpointLimit */                                \
+            { (uint16_t) 0xC80, (uint16_t) -0x6AB3, (uint16_t) 0x7FFF }, /* MaxCoolSetpointLimit */                                \
+            { (uint16_t) 0x19, (uint16_t) 0x0, (uint16_t) 0x19 },        /* MinSetpointDeadBand */                                 \
+            { (uint16_t) 0x4, (uint16_t) 0x0, (uint16_t) 0x5 },          /* ControlSequenceOfOperation */                          \
+            { (uint16_t) 0x1, (uint16_t) 0x0, (uint16_t) 0x9 },          /* SystemMode */                                          \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Fan Control (server) */                                                                       \
             { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0x6 },  /* FanMode */                                                     \
@@ -334,14 +334,14 @@
             { (uint16_t) 0x0, (uint16_t) 0x0, (uint16_t) 0xFEFF }, /* StartUpColorTemperatureMireds */                             \
                                                                                                                                    \
             /* Endpoint: 1, Cluster: Unit Testing (server) */                                                                      \
-            { (uint16_t) 0x46, (uint16_t) 0x14, (uint16_t) 0x64 },     /* range_restricted_int8u */                                \
-            { (uint16_t) - 0x14, (uint16_t) - 0x28, (uint16_t) 0x32 }, /* range_restricted_int8s */                                \
-            { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 },    /* range_restricted_int16u */                               \
-            { (uint16_t) - 0x64, (uint16_t) - 0x96, (uint16_t) 0xC8 }, /* range_restricted_int16s */                               \
-            { (uint16_t) 0x46, (uint16_t) 0x14, (uint16_t) 0x64 },     /* nullable_range_restricted_int8u */                       \
-            { (uint16_t) - 0x14, (uint16_t) - 0x28, (uint16_t) 0x32 }, /* nullable_range_restricted_int8s */                       \
-            { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 },    /* nullable_range_restricted_int16u */                      \
-            { (uint16_t) - 0x64, (uint16_t) - 0x96, (uint16_t) 0xC8 }, /* nullable_range_restricted_int16s */                      \
+            { (uint16_t) 0x46, (uint16_t) 0x14, (uint16_t) 0x64 },   /* range_restricted_int8u */                                  \
+            { (uint16_t) -0x14, (uint16_t) -0x28, (uint16_t) 0x32 }, /* range_restricted_int8s */                                  \
+            { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 },  /* range_restricted_int16u */                                 \
+            { (uint16_t) -0x64, (uint16_t) -0x96, (uint16_t) 0xC8 }, /* range_restricted_int16s */                                 \
+            { (uint16_t) 0x46, (uint16_t) 0x14, (uint16_t) 0x64 },   /* nullable_range_restricted_int8u */                         \
+            { (uint16_t) -0x14, (uint16_t) -0x28, (uint16_t) 0x32 }, /* nullable_range_restricted_int8s */                         \
+            { (uint16_t) 0xC8, (uint16_t) 0x64, (uint16_t) 0x3E8 },  /* nullable_range_restricted_int16u */                        \
+            { (uint16_t) -0x64, (uint16_t) -0x96, (uint16_t) 0xC8 }, /* nullable_range_restricted_int16s */                        \
                                                                                                                                    \
         /* Endpoint: 2, Cluster: On/Off (server) */                                                                                \
         {                                                                                                                          \

scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h

@@ -56,20 +56,8 @@ template("chip_data_model") {
       "zap-generated/endpoint_config.h",
     ]
 
-    # NOTE: these are ALSO auto-generated but handled below:
-    #       "zap-generated/IMClusterCommandHandler.cpp"
-    #         -> contains one large DispatchSingleClusterCommand and DispatchServerCommand
-
-    if (chip_code_pre_generated_directory == "") {
-      prune_outputs = []
-    }
-
     if (!chip_build_controller_dynamic_server) {
       outputs += [ "zap-generated/IMClusterCommandHandler.cpp" ]
-    } else {
-      if (defined(prune_outputs)) {
-        prune_outputs += [ "zap-generated/IMClusterCommandHandler.cpp" ]
-      }
     }
 
     if (!defined(deps)) {