Merge branch 'master' into pr/devicetype/binding

.github/stale.yml

@@ -9,10 +9,10 @@ staleLabel: stale
 
 pulls:
   # Number of days of inactivity before a pull request becomes stale
-  daysUntilStale: 7
+  daysUntilStale: 60
 
   # Number of days of inactivity before a stale pull request is closed
-  daysUntilClose: 7
+  daysUntilClose: 30
 
   # Comment to post when marking a pull request as stale. Set to `false` to disable
   markComment: >

.github/workflows/examples-qpg.yaml

@@ -81,6 +81,17 @@ jobs:
               run: |
                   config/qpg/chip-gn/build.sh
 
+            - name: Prepare some bloat report from the previous builds
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    qpg qpg6105+debug lighting-app \
+                    out/qpg-light/chip-qpg6105-lighting-example.out \
+                    /tmp/bloat_reports/
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    qpg qpg6105+debug lock-app \
+                    out/qpg-lock/chip-qpg6105-lock-example.out \
+                    /tmp/bloat_reports/
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

config/esp32/components/chip/CMakeLists.txt

@@ -67,6 +67,18 @@ macro(chip_gn_arg_bool arg boolean)
     endif()
 endmacro()
 
+# ESP-IDF lets user set software version string by two ways:
+# 1. Project's CMakeLists.txt file and 2. Config option
+# It depends on CONFIG_APP_PROJECT_VER_FROM_CONFIG option
+# So, below makes the same provision for software version number
+if (CONFIG_APP_PROJECT_VER_FROM_CONFIG)
+    chip_gn_arg_append("chip_config_software_version_number" ${CONFIG_DEVICE_SOFTWARE_VERSION_NUMBER})
+elseif (DEFINED PROJECT_VER_NUMBER)
+    chip_gn_arg_append("chip_config_software_version_number" ${PROJECT_VER_NUMBER})
+else()
+    chip_gn_arg_append("chip_config_software_version_number" 0)
+endif()
+
 chip_gn_arg_append("esp32_ar"              "\"${CMAKE_AR}\"")
 chip_gn_arg_append("esp32_cc"              "\"${CMAKE_C_COMPILER}\"")
 chip_gn_arg_append("esp32_cxx"             "\"${CMAKE_CXX_COMPILER}\"")

config/esp32/components/chip/Kconfig

@@ -301,15 +301,9 @@ menu "CHIP Device Layer"
                 This is a default value which is used when a hardware version has not been stored in device
                 persistent storage (e.g. by a factory provisioning process).
 
-        config DEVICE_SOFTWARE_VERSION
-            string "Device Software Version String"
-            default "v1.0"
-            help
-                A string identifying the software version running on the device.
-
         config DEVICE_SOFTWARE_VERSION_NUMBER
             int "Device Software Version Number"
-            default 1
+            default 0
             help
                 Software version number running on the device.
 

docs/Doxyfile

@@ -795,7 +795,7 @@ WARN_NO_PARAMDOC       = NO
 # a warning is encountered.
 # The default value is: NO.
 
-WARN_AS_ERROR          = YES
+WARN_AS_ERROR          = NO
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
@@ -919,14 +919,14 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = 
+EXCLUDE                = third_party
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
 # The default value is: NO.
 
-EXCLUDE_SYMLINKS       = NO
+EXCLUDE_SYMLINKS       = YES
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
@@ -2172,7 +2172,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = third_party/
+INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the