Merge remote-tracking branch 'refs/remotes/origin/issue_226_temp_2' into issue_226_temp_2

Author: austina-csa

.github/workflows/chef.yaml

@@ -56,7 +56,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
             options: --user root
 
         steps:

.github/workflows/examples-esp32.yaml

@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -126,7 +126,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

.github/workflows/qemu.yaml

@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32-qemu:66
+            image: ghcr.io/project-chip/chip-build-esp32-qemu:67
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

.github/workflows/release_artifacts.yaml

@@ -32,7 +32,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:66
+            image: ghcr.io/project-chip/chip-build-esp32:67
 
         steps:
             - name: Checkout

examples/all-clusters-app/esp32/sdkconfig_m5stack_rpc.defaults

@@ -82,3 +82,9 @@ CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=1024
 
 CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
+
+# Memory Optimizations
+CONFIG_NIMBLE_MAX_CONNECTIONS=1
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
+CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
+CONFIG_BT_NIMBLE_ROLE_OBSERVER=n

examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults

@@ -72,6 +72,12 @@ CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=n
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
 
+# Memory Optimizations
+CONFIG_NIMBLE_MAX_CONNECTIONS=1
+CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
+CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
+CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
+
 # Build chip tests
 CONFIG_BUILD_CHIP_TESTS=y
 

examples/chef/esp32/partitions.csv

@@ -3,4 +3,4 @@
 nvs,      data, nvs,     ,        0xC000,
 phy_init, data, phy,     ,        0x1000,
 # Factory partition size about 1.9MB
-factory,  app,  factory, ,        1945K,
+factory,  app,  factory, ,        2M,

examples/light-switch-app/esp32/main/DeviceCallbacks.cpp

@@ -35,7 +35,7 @@ using namespace chip::System;
 using namespace chip::app::Clusters;
 
 void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId,
-                                                     uint8_t mask, uint8_t type, uint16_t size, uint8_t * value)
+                                                     uint8_t type, uint16_t size, uint8_t * value)
 {
     ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%" PRIx32 "', EndPoint ID: '0x%x', Attribute ID: '0x%" PRIx32 "'",
              clusterId, endpointId, attributeId);

examples/light-switch-app/esp32/main/include/DeviceCallbacks.h

@@ -33,7 +33,7 @@ class AppDeviceCallbacks : public CommonDeviceCallbacks
 {
 public:
     virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t mask, uint8_t type, uint16_t size, uint8_t * value);
+                                             uint8_t type, uint16_t size, uint8_t * value) override;
 
 private:
     void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);

scripts/helpers/restyle-diff.sh

@@ -78,7 +78,7 @@ done
 
 if [[ -z "$ref" ]]; then
     ref="master"
-    git remote | grep -qxF upstream && ref="upstream/master" && git fetch upstream
+    git remote | grep -qxF upstream && ref="upstream/master"
 fi
 
 if [[ $pull_image -eq 1 ]]; then