Merge branch 'master' into silabs/add_air_quality_app

.devcontainer/Dockerfile

@@ -24,22 +24,19 @@ ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 ENV LANG en_US.utf8
 
-# these are installed for terminal/dev convenience.  If more tooling for build is required, please
-#  add them to chip-build (in integrations/docker/images/chip-build)
+
+# These are installed for terminal/dev convenience. If more tooling for build is required, please
+# add them to chip-build (in integrations/docker/images/chip-build).
 RUN apt-get update \
     && apt-get install -y locales \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
-    && apt-get -fy install git vim emacs sudo \
+    && apt-get -fy install vim emacs sudo \
     apt-utils dialog zsh \
-    iproute2 procps lsb-release \
+    lsb-release \
     bash-completion \
-    build-essential cmake cppcheck valgrind \
-    wget curl telnet \
+    valgrind \
     docker.io \
-    iputils-ping net-tools \
-    libncurses5 \
-    libncursesw5 \
-    libpython2.7 \
+    iputils-ping \
     && :
 
 RUN groupadd -g $USER_GID $USERNAME \
@@ -55,13 +52,22 @@ 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/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
-    $IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
+    $ANDROID_HOME \
+    $IDF_TOOLS_PATH \
+    && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
+    && chmod -R +x \
+    $ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
+    && chmod -R +w \
     $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 \
+    && find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
+    && find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
+    && find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
+    && find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
+    # Safe directory is preffered over chown.
+    && git config --global --add safe.directory "*" \
     && :
 
 # Fix Tizen SDK paths for new user

.devcontainer/devcontainer.json

@@ -14,9 +14,12 @@
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
+    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
+    "containerEnv": {
+        "PW_ENVIRONMENT_ROOT": "${containerWorkspaceFolder}/.environment-vscode"
+    },
     "customizations": {
         "vscode": {
             // Add the IDs of extensions you want installed when the container is created in the array below.

.gitignore

@@ -15,7 +15,7 @@ out/
 /src/darwin/Framework/build/
 
 # Pigweed Environment
-.environment/
+.environment*/
 build_overrides/pigweed_environment.gni
 
 # Temporary Directories
@@ -84,4 +84,3 @@ examples/*/esp32/dependencies.lock
 
 # jupyter temporary files
 .ipynb_checkpoints
-

config/esp32/components/chip/CMakeLists.txt

@@ -87,25 +87,25 @@ if (CONFIG_CHIP_CONFIG_IM_PRETTY_PRINT)
 endif()
 
 # Config the chip log level by IDF menuconfig
-if (CONFIG_LOG_DEFAULT_LEVEL GREATER_EQUAL 1)
+if (CONFIG_CHIP_LOG_DEFAULT_LEVEL GREATER_EQUAL 1)
     chip_gn_arg_bool  ("chip_error_logging" "true")
 else()
     chip_gn_arg_bool  ("chip_error_logging" "false")
 endif()
 
-if (CONFIG_LOG_DEFAULT_LEVEL GREATER_EQUAL 3)
+if (CONFIG_CHIP_LOG_DEFAULT_LEVEL GREATER_EQUAL 3)
     chip_gn_arg_bool  ("chip_progress_logging" "true")
 else()
     chip_gn_arg_bool  ("chip_progress_logging" "false")
 endif()
 
-if (CONFIG_LOG_DEFAULT_LEVEL GREATER_EQUAL 4)
+if (CONFIG_CHIP_LOG_DEFAULT_LEVEL GREATER_EQUAL 4)
     chip_gn_arg_bool  ("chip_detail_logging" "true")
 else()
     chip_gn_arg_bool  ("chip_detail_logging" "false")
 endif()
 
-if (CONFIG_LOG_DEFAULT_LEVEL GREATER_EQUAL 5)
+if (CONFIG_CHIP_LOG_DEFAULT_LEVEL GREATER_EQUAL 5)
     chip_gn_arg_bool  ("chip_automation_logging" "true")
 else()
     chip_gn_arg_bool  ("chip_automation_logging" "false")

config/esp32/components/chip/Kconfig

@@ -1172,6 +1172,36 @@ menu "CHIP Device Layer"
 	     To see detailed logging please set default log level to Debug.
 	     (Component config --> Log output --> Default log verbosity --> Debug)
 
+    choice CHIP_LOG_DEFAULT_LEVEL
+        bool "CHIP default log verbosity"
+        default CHIP_LOG_DEFAULT_LEVEL_EQUALS_LOG_DEFAULT_LEVEL
+        help
+            Default log level for CHIP logs. Note that CHIP_LOG_DEFAULT_LEVEL can only be less than or equal to LOG_DEFAULT_LEVEL.
+
+        config CHIP_LOG_DEFAULT_LEVEL_EQUALS_LOG_DEFAULT_LEVEL
+            bool "Same as default log level"
+        config CHIP_LOG_DEFAULT_LEVEL_NONE
+            bool "CHIP logging disabled"
+        config CHIP_LOG_DEFAULT_LEVEL_ERROR
+            bool "Enable Error Logs"
+        config CHIP_LOG_DEFAULT_LEVEL_PROGRESS
+            bool "Enable Progress Logs"
+        config CHIP_LOG_DEFAULT_LEVEL_DETAIL
+            bool "Enable Detail Logs"
+        config CHIP_LOG_DEFAULT_LEVEL_AUTOMATION
+            bool "Enable Automation Logs"
+    endchoice
+
+    config CHIP_LOG_DEFAULT_LEVEL
+        int
+        range 0 LOG_DEFAULT_LEVEL
+        default LOG_DEFAULT_LEVEL if CHIP_LOG_DEFAULT_LEVEL_EQUALS_LOG_DEFAULT_LEVEL
+        default 0 if CHIP_LOG_DEFAULT_LEVEL_NONE
+        default 1 if CHIP_LOG_DEFAULT_LEVEL_ERROR
+        default 3 if CHIP_LOG_DEFAULT_LEVEL_PROGRESS
+        default 4 if CHIP_LOG_DEFAULT_LEVEL_DETAIL
+        default 5 if CHIP_LOG_DEFAULT_LEVEL_AUTOMATION
+
     endmenu
 
     config CHIP_ENABLE_BDX_LOG_TRANSFER

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

@@ -2985,6 +2985,16 @@ cluster OvenMode = 73 {
   revision 1;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kBake = 16384;
     kConvection = 16385;
     kGrill = 16386;
@@ -3106,6 +3116,16 @@ cluster LaundryWasherMode = 81 {
   revision 2;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kNormal = 16384;
     kDelicate = 16385;
     kHeavy = 16386;
@@ -3157,6 +3177,16 @@ cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 {
   revision 2;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kRapidCool = 16384;
     kRapidFreeze = 16385;
   }
@@ -3234,6 +3264,16 @@ cluster RvcRunMode = 84 {
   revision 3;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kIdle = 16384;
     kCleaning = 16385;
     kMapping = 16386;
@@ -3293,6 +3333,16 @@ cluster RvcCleanMode = 85 {
   revision 3;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kDeepClean = 16384;
     kVacuum = 16385;
     kMop = 16386;
@@ -3403,6 +3453,16 @@ cluster DishwasherMode = 89 {
   revision 2;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kNormal = 16384;
     kHeavy = 16385;
     kLight = 16386;
@@ -3644,6 +3704,16 @@ cluster MicrowaveOvenMode = 94 {
   revision 1;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kNormal = 16384;
     kDefrost = 16385;
   }
@@ -3744,6 +3814,10 @@ cluster RvcOperationalState = 97 {
   revision 1;
 
   enum ErrorStateEnum : enum8 {
+    kNoError = 0;
+    kUnableToStartOrResume = 1;
+    kUnableToCompleteOperation = 2;
+    kCommandInvalidInState = 3;
     kFailedToFindChargingDock = 64;
     kStuck = 65;
     kDustBinMissing = 66;
@@ -3755,6 +3829,10 @@ cluster RvcOperationalState = 97 {
   }
 
   enum OperationalStateEnum : enum8 {
+    kStopped = 0;
+    kRunning = 1;
+    kPaused = 2;
+    kError = 3;
     kSeekingCharger = 64;
     kCharging = 65;
     kDocked = 66;
@@ -4903,6 +4981,16 @@ cluster EnergyEvseMode = 157 {
   revision 1;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kManual = 16384;
     kTimeOfUse = 16385;
     kSolarCharging = 16386;
@@ -4953,6 +5041,16 @@ cluster WaterHeaterMode = 158 {
   revision 1;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kOff = 16384;
     kManual = 16385;
     kTimed = 16386;
@@ -5003,6 +5101,16 @@ provisional cluster DeviceEnergyManagementMode = 159 {
   revision 1;
 
   enum ModeTag : enum16 {
+    kAuto = 0;
+    kQuick = 1;
+    kQuiet = 2;
+    kLowNoise = 3;
+    kLowEnergy = 4;
+    kVacation = 5;
+    kMin = 6;
+    kMax = 7;
+    kNight = 8;
+    kDay = 9;
     kNoOptimization = 16384;
     kDeviceOptimization = 16385;
     kLocalOptimization = 16386;