Skip to content

Commit 8071c9b

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/issue_226_temp_2' into issue_226_temp_2
2 parents 9280df5 + abdac73 commit 8071c9b

File tree

10 files changed

+21
-9
lines changed

10 files changed

+21
-9
lines changed

.github/workflows/chef.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

5858
container:
59-
image: ghcr.io/project-chip/chip-build-esp32:66
59+
image: ghcr.io/project-chip/chip-build-esp32:67
6060
options: --user root
6161

6262
steps:

.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-esp32:66
39+
image: ghcr.io/project-chip/chip-build-esp32:67
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

128128
container:
129-
image: ghcr.io/project-chip/chip-build-esp32:66
129+
image: ghcr.io/project-chip/chip-build-esp32:67
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

.github/workflows/qemu.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-esp32-qemu:66
43+
image: ghcr.io/project-chip/chip-build-esp32-qemu:67
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646

.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
container:
35-
image: ghcr.io/project-chip/chip-build-esp32:66
35+
image: ghcr.io/project-chip/chip-build-esp32:67
3636

3737
steps:
3838
- name: Checkout

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

+6
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,9 @@ CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
8282
CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=1024
8383

8484
CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
85+
86+
# Memory Optimizations
87+
CONFIG_NIMBLE_MAX_CONNECTIONS=1
88+
CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
89+
CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
90+
CONFIG_BT_NIMBLE_ROLE_OBSERVER=n

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

+6
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ CONFIG_BTDM_CTRL_LPCLK_SEL_MAIN_XTAL=n
7272
# Enable HKDF in mbedtls
7373
CONFIG_MBEDTLS_HKDF_C=y
7474

75+
# Memory Optimizations
76+
CONFIG_NIMBLE_MAX_CONNECTIONS=1
77+
CONFIG_BTDM_CTRL_BLE_MAX_CONN=1
78+
CONFIG_BT_NIMBLE_ROLE_CENTRAL=n
79+
CONFIG_BT_NIMBLE_ROLE_OBSERVER=n
80+
7581
# Build chip tests
7682
CONFIG_BUILD_CHIP_TESTS=y
7783

examples/chef/esp32/partitions.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
nvs, data, nvs, , 0xC000,
44
phy_init, data, phy, , 0x1000,
55
# Factory partition size about 1.9MB
6-
factory, app, factory, , 1945K,
6+
factory, app, factory, , 2M,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ using namespace chip::System;
3535
using namespace chip::app::Clusters;
3636

3737
void AppDeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId,
38-
uint8_t mask, uint8_t type, uint16_t size, uint8_t * value)
38+
uint8_t type, uint16_t size, uint8_t * value)
3939
{
4040
ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%" PRIx32 "', EndPoint ID: '0x%x', Attribute ID: '0x%" PRIx32 "'",
4141
clusterId, endpointId, attributeId);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class AppDeviceCallbacks : public CommonDeviceCallbacks
3333
{
3434
public:
3535
virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
36-
uint8_t mask, uint8_t type, uint16_t size, uint8_t * value);
36+
uint8_t type, uint16_t size, uint8_t * value) override;
3737

3838
private:
3939
void OnIdentifyPostAttributeChangeCallback(chip::EndpointId endpointId, chip::AttributeId attributeId, uint8_t * value);

scripts/helpers/restyle-diff.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ done
7878

7979
if [[ -z "$ref" ]]; then
8080
ref="master"
81-
git remote | grep -qxF upstream && ref="upstream/master" && git fetch upstream
81+
git remote | grep -qxF upstream && ref="upstream/master"
8282
fi
8383

8484
if [[ $pull_image -eq 1 ]]; then

0 commit comments

Comments
 (0)