Skip to content

Commit

Permalink
Merge branch 'v1_2/update_submodule_to_chip_v1_2_branch' into 'releas…
Browse files Browse the repository at this point in the history
…e/v1.2'

[v1.2][submodule]set the chip submodule to upstream v1.2-branch instead of espressif's v1.2-branch

See merge request app-frameworks/esp-matter!721
chshu committed May 7, 2024
2 parents 8af1814 + bf85177 commit ef804e0
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions components/esp_matter/esp_matter.h
Original file line number Diff line number Diff line change
@@ -127,8 +127,6 @@ enum
/** Signals that operational credentials are changed, which may not be persistent.
Can be used to affect what is needed for UpdateNOC prior to commit */
kFabricUpdated,
/** Signals that BLE is deinitialized and heap memory is reclaimed */
kBLEDeinitialized,
};

} // DeviceEventType
2 changes: 1 addition & 1 deletion connectedhomeip/connectedhomeip
Submodule connectedhomeip updated 62 files
+6 −0 .github/.wordlist.txt
+1 −1 .github/workflows/build.yaml
+1 −1 .github/workflows/darwin-tests.yaml
+1 −1 .github/workflows/darwin.yaml
+1 −1 .github/workflows/fuzzing-build.yaml
+2 −2 .github/workflows/tests.yaml
+256 −251 .gitmodules
+7 −6 config/esp32/components/chip/Kconfig
+1 −0 docs/guides/README.md
+1 −0 docs/guides/esp32/README.md
+3 −7 docs/guides/esp32/factory_data.md
+76 −0 docs/guides/esp32/providers.md
+67 −0 docs/guides/infineon_trustm_provisioning.md
+16 −1 examples/lock-app/infineon/psoc6/BUILD.gn
+48 −1 examples/lock-app/infineon/psoc6/README.md
+3 −0 examples/lock-app/infineon/psoc6/args.gni
+9 −0 examples/lock-app/infineon/psoc6/src/AppTask.cpp
+5 −1 examples/platform/esp32/common/CommonDeviceCallbacks.cpp
+5 −39 examples/platform/esp32/common/Esp32AppServer.cpp
+1 −0 scripts/build/build/targets.py
+6 −1 scripts/build/builders/infineon.py
+1 −1 scripts/build/testdata/all_targets_linux_x64.txt
+8 −1 scripts/setup/constraints.txt
+0 −3 scripts/tests/cirque_tests.sh
+100 −141 scripts/tools/generate_esp32_chip_factory_bin.py
+5 −0 src/include/platform/CHIPDeviceEvent.h
+26 −2 src/lib/dnssd/ActiveResolveAttempts.cpp
+6 −0 src/lib/dnssd/ActiveResolveAttempts.h
+6 −0 src/lib/dnssd/IncrementalResolve.h
+17 −3 src/lib/dnssd/Resolver_ImplMinimalMdns.cpp
+1 −1 src/lib/dnssd/minimal_mdns/core/QName.cpp
+3 −3 src/lib/dnssd/minimal_mdns/core/tests/TestQName.cpp
+17 −12 src/messaging/ExchangeContext.cpp
+5 −1 src/platform/ESP32/BLEManagerImpl.h
+2 −0 src/platform/ESP32/BUILD.gn
+122 −0 src/platform/ESP32/StaticESP32DeviceInfoProvider.cpp
+141 −0 src/platform/ESP32/StaticESP32DeviceInfoProvider.h
+70 −1 src/platform/ESP32/nimble/BLEManagerImpl.cpp
+5 −0 src/platform/ESP32/route_hook/ESP32RouteHook.c
+20 −0 src/platform/Infineon/crypto/infineon_crypto.gni
+64 −0 src/platform/Infineon/crypto/trustm/BUILD.gn
+1,477 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHost.cpp
+90 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_HKDF_trustm.cpp
+87 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_HMAC_trustm.cpp
+593 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_P256_trustm.cpp
+53 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_config_trustm.h
+60 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_rng_trustm.cpp
+981 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_utils_trustm.cpp
+83 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPALHsm_utils_trustm.h
+512 −0 src/platform/Infineon/crypto/trustm/CHIPCryptoPAL_HostFallBack.cpp
+140 −0 src/platform/Infineon/crypto/trustm/DeviceAttestationCredsExampleTrustM.cpp
+36 −0 src/platform/Infineon/crypto/trustm/DeviceAttestationCredsExampleTrustM.h
+19 −0 src/platform/Infineon/crypto/trustm/args.gni
+32 −4 src/transport/SessionManager.cpp
+1 −1 third_party/infineon/psoc6/BUILD.gn
+5 −1 third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json
+5 −1 third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json
+8 −2 third_party/infineon/psoc6/psoc6_sdk/configs/FreeRTOSConfig.h
+196 −0 third_party/infineon/psoc6/psoc6_sdk/configs/optiga_lib_config_mtb.h
+73 −0 third_party/infineon/trustm/BUILD.gn
+1 −0 third_party/infineon/trustm/optiga-trust-m
+19 −0 third_party/infineon/trustm/trustm_config.gni

0 comments on commit ef804e0

Please sign in to comment.