[nrf mergeup] Matter upmerge to 1.2.0.1 version tag

Regular upmerge of Matter fork to v.1.2.0.1

Signed-off-by: Kamil Kasperczyk <[email protected]>

.clang-format

@@ -107,129 +107,13 @@ Standard:        Cpp11
 TabWidth:        8
 UseTab:          Never
 ---
-Language:        ObjC
-# BasedOnStyle:  WebKit
-AccessModifierOffset: -4
-AlignAfterOpenBracket: DontAlign
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlines: Right
-AlignOperands:   false
-AlignTrailingComments: false
-AllowAllArgumentsOnNextLine: true
-AllowAllConstructorInitializersOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterCaseLabel:  false
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: All
-BreakBeforeBraces: WebKit
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeComma
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     132
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: false
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: false
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
-IndentPPDirectives: None
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: Inner
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 4
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
+Language: ObjC
+BasedOnStyle: WebKit
+Standard: c++17
 PointerAlignment: Middle
-ReflowComments:  true
-SortIncludes:    true
-SortUsingDeclarations: true
 SpaceAfterCStyleCast: true
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: true
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
-TabWidth:        8
-UseTab:          Never
+SpaceInEmptyBlock: false
+ObjCBreakBeforeNestedBlockParam: false
 ---
 Language: JavaScript
 BasedOnStyle: WebKit

.clang-tidy

@@ -10,20 +10,23 @@ Checks: >
   readability-redundant-control-flow,
   readability-redundant-string-cstr,
   readability-redundant-string-init,
-  -bugprone-assignment-in-if-condition,  
+  -bugprone-assignment-in-if-condition,
   -bugprone-branch-clone,
   -bugprone-copy-constructor-init,
   -bugprone-easily-swappable-parameters,
   -bugprone-forward-declaration-namespace,
   -bugprone-forwarding-reference-overload,
   -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-inc-dec-in-conditions,
   -bugprone-macro-parentheses,
   -bugprone-misplaced-widening-cast,
+  -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-not-null-terminated-result,
   -bugprone-reserved-identifier,
   -bugprone-signed-char-misuse,
   -bugprone-suspicious-include,
+  -bugprone-switch-missing-default-case,
   -bugprone-undelegated-constructor,
   -bugprone-unused-return-value,
   -clang-analyzer-core.CallAndMessage,

.devcontainer/Dockerfile

@@ -15,7 +15,8 @@
 ARG BUILD_VERSION
 
 # All tools required for compilation belong in chip-build, forms "truth" for CHIP build tooling
-FROM connectedhomeip/chip-build-vscode:${BUILD_VERSION}
+FROM ghcr.io/project-chip/chip-build-vscode:${BUILD_VERSION}
+LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 # This Dockerfile contains things useful for an interactive development environment
 ARG USERNAME=vscode
@@ -37,6 +38,7 @@ RUN apt-get update \
     docker.io \
     iputils-ping net-tools \
     libncurses5 \
+    libncursesw5 \
     libpython2.7 \
     && :
 
@@ -53,14 +55,13 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
 RUN mkdir -p /opt/sdk/sdks/ \
     && chown -R $USERNAME:$USERNAME \
     /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
-    /opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
-    /opt/espressif/tools \
     /opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
-    /opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
-    /opt/android/sdk `# allow licenses to be accepted` \
-    /opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
-    /opt/fsl-imx-xwayland/5.15-kirkstone/ \
-    /opt/openocd \
+    $IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
+    $IDF_TOOLS_PATH \
+    $SYSROOT_AARCH64 `# allow read/write access to header and libraries` \
+    $ANDROID_HOME `# allow licenses to be accepted` \
+    $AMEBA_PATH `# AmebaD requires access to change build_info.h` \
+    $IMX_SDK_ROOT \
     && :
 
 # Fix Tizen SDK paths for new user

.devcontainer/build.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+
+#
+#    Copyright (c) 2023 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.
+#
+
+HERE="$(dirname "$0")"
+CHIP_ROOT="$(realpath "$HERE"/..)"
+BUILD_VERSION="latest"
+IMAGE_TAG="matter-dev-environment:local"
+USER_UID=$UID
+
+function show_usage() {
+    cat <<EOF
+Usage: $0
+
+Build vscode dev environment docker image.
+
+Options:
+    -h,--help        Show this help
+    -t,--tag         Image tag - default is matter-dev-environment:local
+    -u,--uid         User UIDa - default is the current user ID
+    -v,--version     Build version - default is the latest
+EOF
+}
+
+SHORT=t:,u:,h:,v
+LONG=tag:,uid:,help:,version:
+OPTS=$(getopt -n build --options "$SHORT" --longoptions "$LONG" -- "$@")
+
+eval set -- "$OPTS"
+
+while :; do
+    case "$1" in
+        -h | --help)
+            show_usage
+            exit 0
+            ;;
+        -t | --tag)
+            IMAGE_TAG=$2
+            shift 2
+            ;;
+        -u | --uid)
+            USER_UID=$2
+            shift 2
+            ;;
+        -v | --version)
+            BUILD_VERSION=$2
+            shift 2
+            ;;
+        --)
+            shift
+            break
+            ;;
+        *)
+            echo "Unexpected option: $1"
+            show_usage
+            exit 2
+            ;;
+    esac
+done
+
+if [ "$USER_UID" = "0" ]; then
+    USER_UID=1000
+fi
+
+docker build \
+    -t "$IMAGE_TAG" \
+    --pull \
+    --build-arg USER_UID="$USER_UID" \
+    --build-arg BUILD_VERSION="$BUILD_VERSION" \
+    --network=host \
+    "$HERE"

.devcontainer/devcontainer.json

@@ -14,38 +14,43 @@
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "BUILD_VERSION": "0.7.0"
-        }
-    },
+    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
+    "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
-    // Add the IDs of extensions you want installed when the container is created in the array below.
-    "extensions": [
-        "aaron-bond.better-comments",
-        "augustocdias.tasks-shell-input",
-        "christian-kohler.path-intellisense",
-        "eamodio.gitlens",
-        "editorconfig.editorconfig",
-        "esbenp.prettier-vscode",
-        "foxundermoon.shell-format",
-        "github.vscode-pull-request-github",
-        "maelvalais.autoconf",
-        "marus25.cortex-debug",
-        "ms-azuretools.vscode-docker",
-        "ms-vscode.cpptools",
-        "msedge-dev.gnls",
-        "redhat.vscode-yaml",
-        "vadimcn.vscode-lldb",
-        "xaver.clang-format",
-        "yuichinukiyama.vscode-preview-server",
-        "yzhang.markdown-all-in-one"
-    ],
-    // Use 'settings' to set *default* container specific settings.json values on container create.
-    // You can edit these settings after create using File > Preferences > Settings > Remote.
-    "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
+    "customizations": {
+        "vscode": {
+            // Add the IDs of extensions you want installed when the container is created in the array below.
+            "extensions": [
+                "mcu-debug.debug-tracker-vscode",
+                "aaron-bond.better-comments",
+                "augustocdias.tasks-shell-input",
+                "christian-kohler.path-intellisense",
+                "eamodio.gitlens",
+                "editorconfig.editorconfig",
+                "esbenp.prettier-vscode",
+                "foxundermoon.shell-format",
+                "github.vscode-pull-request-github",
+                "maelvalais.autoconf",
+                "marus25.cortex-debug",
+                "ms-azuretools.vscode-docker",
+                "ms-vscode.cpptools",
+                "msedge-dev.gnls",
+                "redhat.vscode-yaml",
+                "vadimcn.vscode-lldb",
+                "xaver.clang-format",
+                "yuichinukiyama.vscode-preview-server",
+                "yzhang.markdown-all-in-one"
+            ],
+            "settings": {
+                "terminal.integrated.defaultProfile.linux": "bash",
+                "terminal.integrated.profiles.linux": {
+                    "bash": {
+                        "path": "/bin/bash",
+                        "args": ["-l"]
+                    }
+                }
+            }
+        }
     },
     "remoteEnv": {
         "GIT_PS1_SHOWDIRTYSTATE": "1",