Merge branch 'master' into metering-identification-cluster-test-scripts

Author: aburgonov-dsr

.github/workflows/chef.yaml

@@ -51,6 +51,28 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci -t linux"
 
+    chef_linux_all_devices:
+        name: Chef - Linux CI Examples (All chef devices)
+        timeout-minutes: 60
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: ghcr.io/project-chip/chip-build:119
+            options: --user root
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Checkout submodules & Bootstrap
+              uses: ./.github/actions/checkout-submodules-and-bootstrap
+              with:
+                platform: linux
+            - name: CI Examples Linux
+              shell: bash
+              run: |
+                  ./scripts/run_in_build_env.sh "./examples/chef/chef.py --ci_linux"
+
     chef_esp32:
         name: Chef - ESP32 CI Examples
         runs-on: ubuntu-latest

.github/workflows/darwin.yaml

@@ -116,11 +116,10 @@ jobs:
 
                   export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
 
-                  # Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
                   xcodebuild test -target "Matter" -scheme "Matter Framework Tests" \
                     -resultBundlePath /tmp/darwin/framework-tests/TestResults.xcresult \
                     -sdk macosx ${{ matrix.options.arguments }} \
-                    CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
+                    GCC_PREPROCESSOR_DEFINITIONS='${inherited} ${{ matrix.options.defines }}' \
                     > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
             - name: Generate Summary
               if: always()

config/esp32/components/chip/CMakeLists.txt

@@ -444,6 +444,10 @@ if (CONFIG_SEC_CERT_DAC_PROVIDER)
     list(APPEND matter_requires espressif__esp_secure_cert_mgr)
 endif()
 
+if (CONFIG_ENABLE_ENCRYPTED_OTA)
+    list(APPEND matter_requires espressif__esp_encrypted_img)
+endif()
+
 add_prebuilt_library(matterlib "${CMAKE_CURRENT_BINARY_DIR}/lib/libCHIP.a"
                      REQUIRES ${matter_requires})
 

config/esp32/components/chip/idf_component.yml

@@ -11,7 +11,7 @@ dependencies:
             - if: "idf_version >=4.3"
 
     espressif/esp_encrypted_img:
-        version: "2.1.0"
+        version: "2.3.0"
         require: public
         rules:
             - if: "idf_version >=4.4"

docs/platforms/esp32/ota.md

@@ -92,35 +92,50 @@ image can be encrypted/decrypted using an RSA-3072 key pair.
 
 Please follow the steps below to generate an application image for OTA upgrades:
 
-1. Generate a new RSA-3072 key pair or use an existing one.
+1.  Generate a new RSA-3072 key pair or use an existing one.
 
-    - To generate a key pair, use the following command:
+    -   To generate a key pair, use the following command:
 
         ```
         openssl genrsa -out esp_image_encryption_key.pem 3072
         ```
 
-    - Extract the public key from the key pair:
+    -   Extract the public key from the key pair:
         ```
         openssl rsa -in esp_image_encryption_key.pem -pubout -out esp_image_encryption_public_key.pem
         ```
 
-2. Encrypt the application binary using the
-   [esp_enc_img_gen.py](https://github.com/espressif/idf-extra-components/blob/master/esp_encrypted_img/tools/esp_enc_img_gen.py)
-   script.
+2.  Encrypt the application binary using the
+    [esp_enc_img_gen.py](https://github.com/espressif/idf-extra-components/blob/master/esp_encrypted_img/tools/esp_enc_img_gen.py)
+    script.
 
-    - Use the following command to encrypt the OTA image with the public key:
+    Use the following command to encrypt the OTA image with the public key:
 
-        ```
-        python3 esp_enc_img_gen.py encrypt lighting-app.bin esp_image_encryption_public_key.pem lighting-app-encrypted.bin
-        ```
+    ```
+    python3 esp_enc_img_gen.py encrypt lighting-app.bin esp_image_encryption_public_key.pem lighting-app-encrypted.bin
+    ```
 
-    - Append the Matter OTA header:
-        ```
-        src/app/ota_image_tool.py create --vendor-id 0xFFF1 --product-id 0x8000 --version 2 --version-str "v2.0" -da sha256 lighting-app-encrypted.bin lighting-app-encrypted-ota.bin
-        ```
+    Optionally, you can use the cmake function `create_esp_enc_img()` to encrypt
+    the OTA image during the build process. Please find the usage below. This is
+    also demonstrated in the `examples/lighting-app/esp32/main/CMakeLists.txt`
+    file.
+
+    ```
+    create_esp_enc_img(${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.bin
+                       ${project_dir}/esp_image_encryption_public_key.pem
+                       ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-encrypted.bin
+                       app)
+    ```
+
+3.  Append the Matter OTA header
+
+    ```
+    src/app/ota_image_tool.py create --vendor-id 0xFFF1 --product-id 0x8000 \
+                                     --version 2 --version-str "v2.0" -da sha256 \
+                                     lighting-app-encrypted.bin lighting-app-encrypted-ota.bin
+    ```
 
-3. Use the `lighting-app-encrypted-ota.bin` file with the OTA Provider app.
+4.  Use the `lighting-app-encrypted-ota.bin` file with the OTA Provider app.
 
 ## Delta OTA
 

examples/all-clusters-app/nrfconnect/prj.conf

@@ -57,3 +57,6 @@ CONFIG_CHIP_ENABLE_READ_CLIENT=y
 
 # Increase the settings partition
 CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000
+
+# Increase heap size
+CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240

examples/all-clusters-app/nrfconnect/prj_dfu.conf

@@ -55,3 +55,6 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable the Read Client for binding purposes
 CONFIG_CHIP_ENABLE_READ_CLIENT=y
+
+# Increase heap size
+CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240

examples/all-clusters-app/nrfconnect/prj_release.conf

@@ -66,3 +66,6 @@ CONFIG_CHIP_ENABLE_READ_CLIENT=y
 # Enable LTO to reduce the flash usage
 CONFIG_LTO=y
 CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
+
+# Increase heap size
+CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240

examples/camera-controller/commands/interactive/InteractiveCommands.cpp

@@ -29,11 +29,6 @@
 #include <thread>
 #include <vector>
 
-#if defined(PW_RPC_ENABLED)
-#include <rpc/RpcClient.h>
-#include <rpc/RpcServer.h>
-#endif
-
 using namespace chip;
 
 namespace {
@@ -42,10 +37,6 @@ constexpr char kInteractiveModePrompt[]          = ">>> ";
 constexpr char kInteractiveModeHistoryFileName[] = "chip_tool_history";
 constexpr char kInteractiveModeStopCommand[]     = "quit()";
 
-#if defined(PW_RPC_ENABLED)
-constexpr uint16_t kRetryIntervalS = 3;
-#endif
-
 // File pointer for the log file
 FILE * sLogFile = nullptr;
 
@@ -114,28 +105,6 @@ void ENFORCE_FORMAT(3, 0) LoggingCallback(const char * module, uint8_t category,
     funlockfile(sLogFile);
 }
 
-#if defined(PW_RPC_ENABLED)
-void AttemptRpcClientConnect(System::Layer * systemLayer, void * appState)
-{
-    if (admin::StartRpcClient() == CHIP_NO_ERROR)
-    {
-        // print to console
-        fprintf(stderr, "Connected to Fabric-Bridge\n");
-    }
-    else
-    {
-        // print to console
-        fprintf(stderr, "Failed to connect to Fabric-Bridge, retry in %d seconds....\n", kRetryIntervalS);
-        systemLayer->StartTimer(System::Clock::Seconds16(kRetryIntervalS), AttemptRpcClientConnect, nullptr);
-    }
-}
-
-void ExecuteDeferredConnect(intptr_t ignored)
-{
-    AttemptRpcClientConnect(&DeviceLayer::SystemLayer(), nullptr);
-}
-#endif
-
 } // namespace
 
 char * InteractiveStartCommand::GetCommand(char * command)
@@ -198,13 +167,6 @@ CHIP_ERROR InteractiveStartCommand::RunCommand()
         Logging::SetLogRedirectCallback(LoggingCallback);
     }
 
-#if defined(PW_RPC_ENABLED)
-    admin::SetRpcRemoteServerPort(mFabricBridgeServerPort.Value());
-    admin::InitRpcServer(mLocalServerPort.Value());
-    ChipLogProgress(NotSpecified, "PW_RPC initialized.");
-    DeviceLayer::PlatformMgr().ScheduleWork(ExecuteDeferredConnect, 0);
-#endif
-
     std::thread readCommands(ReadCommandThread);
     readCommands.detach();
 

examples/chef/chef.py

@@ -40,6 +40,10 @@
                 for file in os.listdir(_DEVICE_FOLDER) if file.endswith(".zap") and file != 'template.zap']
 _CICD_CONFIG_FILE_NAME = os.path.join(_CHEF_SCRIPT_PATH, "cicd_config.json")
 _CD_STAGING_DIR = os.path.join(_CHEF_SCRIPT_PATH, "staging")
+_EXCLUDE_DEVICE_FROM_LINUX_CI = [  # These do not compile / deprecated.
+    "noip_rootnode_dimmablelight_bCwGYSDpoe",
+    "rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680",
+]
 
 gen_dir = ""  # Filled in after sample app type is read from args.
 
@@ -382,6 +386,10 @@ def main() -> int:
                       help=("Builds Chef examples defined in cicd_config. "
                             "Uses specified target from -t. Chef exits after completion."),
                       dest="ci", action="store_true")
+    parser.add_option("", "--ci_linux",
+                      help=("Builds Chef Examples defined in cicd_config under ci_allow_list_linux. "
+                            "Devices are built without -c for faster compilation."),
+                      dest="ci_linux", action="store_true")
     parser.add_option(
         "", "--enable_ipv4", help="Enable IPv4 mDNS. Only applicable to platforms that can support IPV4 (e.g, Linux, ESP32)",
         action="store_true", default=False)
@@ -409,6 +417,21 @@ def main() -> int:
             bundle(options.build_target, device_name)
         exit(0)
 
+    #
+    # CI Linux
+    #
+
+    if options.ci_linux:
+        for device_name in _DEVICE_LIST:
+            if device_name in _EXCLUDE_DEVICE_FROM_LINUX_CI:
+                continue
+            shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
+            command = f"./chef.py -br -d {device_name} -t linux"
+            flush_print(f"Building {command}", with_border=True)
+            shell.run_cmd(command)
+            bundle("linux", device_name)
+        exit(0)
+
     #
     # CD
     #

examples/chef/esp32/main/CMakeLists.txt

@@ -54,6 +54,7 @@ set(SRC_DIRS_LIST
                       "${CHEF}/common/clusters/target-navigator/"
                       "${CHEF}/common/clusters/temperature-control/"
                       "${CHEF}/common/clusters/wake-on-lan/"
+                      "${CHEF}/common/clusters/window-covering/"
                       "${CHIP_ROOT}/zzz_generated/app-common/app-common/zap-generated/attributes"
 )
 

examples/lighting-app/esp32/main/CMakeLists.txt

@@ -82,6 +82,13 @@ target_compile_options(${COMPONENT_LIB} PUBLIC
            "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"
 )
 
+if (CONFIG_ENABLE_ENCRYPTED_OTA)
+	create_esp_enc_img(${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.bin
+			   ${project_dir}/esp_image_encryption_public_key.pem
+			   ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-encrypted.bin
+			   app)
+endif()
+
 if (CONFIG_ENABLE_PW_RPC)
 
 get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)

examples/platform/silabs/sensors/AirQuality/AirQualitySensor.cpp

@@ -22,12 +22,8 @@
 #include <platform/CHIPDeviceLayer.h>
 
 #ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <sparkfun_sgp40.h>
-}
 #include "sl_i2cspm_instances.h"
+#include <sparkfun_sgp40.h>
 #endif // USE_SPARKFUN_AIR_QUALITY_SENSOR
 
 namespace {

integrations/docker/images/stage-2/chip-build-efr32/requirements.txt

@@ -1,5 +1,5 @@
 # codegen.py build requirements
-Jinja2==3.1.5
+Jinja2==3.1.6
 lark==1.1.7
 # Sphinx dependencies (for slc-cli)
 linkify-it-py==2.0.2

scripts/build/build/__init__.py

@@ -19,11 +19,12 @@ class Context:
          to generate make/ninja instructions and to compile.
       """
 
-    def __init__(self, runner, repository_path: str, output_prefix: str, ninja_jobs: int):
+    def __init__(self, runner, repository_path: str, output_prefix: str, verbose: bool, ninja_jobs: int):
         self.builders = []
         self.runner = runner
         self.repository_path = repository_path
         self.output_prefix = output_prefix
+        self.verbose = verbose
         self.ninja_jobs = ninja_jobs
         self.completed_steps = set()
 
@@ -38,7 +39,8 @@ def SetupBuilders(self, targets: Sequence[str], options: BuilderOptions):
             found = False
             for choice in BUILD_TARGETS:
                 builder = choice.Create(target, self.runner, self.repository_path,
-                                        self.output_prefix, self.ninja_jobs, options)
+                                        self.output_prefix, self.verbose, self.ninja_jobs,
+                                        options)
                 if builder:
                     self.builders.append(builder)
                     found = True

scripts/build/build/target.py

@@ -389,7 +389,7 @@ def StringIntoTargetParts(self, value: str):
         return _StringIntoParts(value, suffix, self.fixed_targets, self.modifiers)
 
     def Create(self, name: str, runner, repository_path: str, output_prefix: str,
-               ninja_jobs: int, builder_options: BuilderOptions):
+               verbose: bool, ninja_jobs: int, builder_options: BuilderOptions):
 
         parts = self.StringIntoTargetParts(name)
 
@@ -406,6 +406,7 @@ def Create(self, name: str, runner, repository_path: str, output_prefix: str,
         builder.target = self
         builder.identifier = name
         builder.output_dir = os.path.join(output_prefix, name)
+        builder.verbose = verbose
         builder.ninja_jobs = ninja_jobs
         builder.chip_dir = os.path.abspath(repository_path)
         builder.options = builder_options

scripts/build/build_examples.py

@@ -78,6 +78,11 @@ def ValidateTargetNames(context, parameter, values):
     default='INFO',
     type=click.Choice(__LOG_LEVELS__.keys(), case_sensitive=False),
     help='Determines the verbosity of script output.')
+@click.option(
+    '--verbose',
+    default=False,
+    is_flag=True,
+    help='Pass verbose flag to ninja.')
 @click.option(
     '--target',
     default=[],
@@ -142,7 +147,7 @@ def ValidateTargetNames(context, parameter, values):
         'Set pigweed command launcher. E.g.: "--pw-command-launcher=ccache" '
         'for using ccache when building examples.'))
 @click.pass_context
-def main(context, log_level, target, enable_link_map_file, repo,
+def main(context, log_level, verbose, target, enable_link_map_file, repo,
          out_prefix, ninja_jobs, pregen_dir, clean, dry_run, dry_run_output,
          enable_flashbundle, no_log_timestamps, pw_command_launcher):
     # Ensures somewhat pretty logging of what is going on
@@ -168,7 +173,9 @@ def main(context, log_level, target, enable_link_map_file, repo,
     logging.info('Building targets: %s', CommaSeparate(requested_targets))
 
     context.obj = build.Context(
-        repository_path=repo, output_prefix=out_prefix, ninja_jobs=ninja_jobs, runner=runner)
+        repository_path=repo, output_prefix=out_prefix, verbose=verbose,
+        ninja_jobs=ninja_jobs, runner=runner
+    )
     context.obj.SetupBuilders(targets=requested_targets, options=BuilderOptions(
         enable_link_map_file=enable_link_map_file,
         enable_flashbundle=enable_flashbundle,

scripts/build/builders/gn.py

@@ -95,6 +95,8 @@ def _build(self):
         self.PreBuildCommand()
 
         cmd = ['ninja', '-C', self.output_dir]
+        if self.verbose:
+            cmd.append('-v')
         if self.ninja_jobs is not None:
             cmd.append('-j' + str(self.ninja_jobs))
         if self.build_command:

scripts/build/builders/nrf.py

@@ -220,7 +220,7 @@ def _build(self):
             # Note: running zephyr/zephyr.elf has the same result except it creates
             # a flash.bin in the current directory. ctest has more options and does not
             # pollute the source directory
-            self._Execute(['ctest', '--build-nocmake', '-V', '--output-on-failure', '--test-dir', os.path.join(self.output_dir, 'nrfconnect')],
+            self._Execute(['ctest', '--build-nocmake', '-V', '--output-on-failure', '--test-dir', os.path.join(self.output_dir, 'nrfconnect'), '--no-tests=error'],
                           title='Run Tests ' + self.identifier)
 
     def _bundle(self):