Merge branch 'master' into camera-webrtc-server

project-chip · Nov 7, 2024 · 54cef78 · 54cef78
2 parents 4704301 + 8797fa0
commit 54cef78
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/src/platform/nxp/common/CHIPDeviceNXPPlatformDefaultConfig.h b/src/platform/nxp/common/CHIPDeviceNXPPlatformDefaultConfig.h
@@ -27,6 +27,29 @@
 
 // ==================== Platform Adaptations ====================
 
+#ifdef CONFIG_CHIP_USE_GENERATED_CONFIG
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID CONFIG_CHIP_DEVICE_VENDOR_ID
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_NAME CONFIG_CHIP_DEVICE_VENDOR_NAME
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID CONFIG_CHIP_DEVICE_PRODUCT_ID
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME CONFIG_CHIP_DEVICE_PRODUCT_NAME
+#define CHIP_DEVICE_CONFIG_DEVICE_HARDWARE_VERSION CONFIG_CHIP_DEVICE_HARDWARE_VERSION
+#define CHIP_DEVICE_CONFIG_DEFAULT_DEVICE_HARDWARE_VERSION_STRING CONFIG_CHIP_DEVICE_HARDWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION CONFIG_CHIP_DEVICE_SOFTWARE_VERSION
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_TEST_MANUFACTURING_DATE CONFIG_CHIP_DEVICE_MANUFACTURING_DATE
+#define CHIP_DEVICE_CONFIG_DEVICE_TYPE CONFIG_CHIP_DEVICE_TYPE
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_ITERATION_COUNT CONFIG_CHIP_DEVICE_SPAKE2_IT
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_SALT CONFIG_CHIP_DEVICE_SPAKE2_SALT
+#define CHIP_DEVICE_CONFIG_USE_TEST_SPAKE2P_VERIFIER CONFIG_CHIP_DEVICE_SPAKE2_TEST_VERIFIER
+
+#if !CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_DISCRIMINATOR CONFIG_CHIP_DEVICE_DISCRIMINATOR
+#define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE CONFIG_CHIP_DEVICE_SPAKE2_PASSCODE
+#define CHIP_DEVICE_CONFIG_USE_TEST_PAIRING_CODE CONFIG_CHIP_DEVICE_USE_TEST_PAIRING_CODE
+#define CHIP_DEVICE_CONFIG_TEST_SERIAL_NUMBER CONFIG_CHIP_DEVICE_SERIAL_NUMBER
+#endif // CONFIG_CHIP_PLAT_LOAD_REAL_FACTORY_DATA
+#endif // CONFIG_CHIP_USE_GENERATED_CONFIG
+
 #ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
 #if CONFIG_CHIP_WIFI || CHIP_DEVICE_CONFIG_ENABLE_WPA
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1
@@ -39,12 +62,16 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
 #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
 
-#if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#define CHIP_DEVICE_CONFIG_ENABLE_UNPROVISIONED_MDNS 1
-#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
-
 #ifndef CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#ifdef CONFIG_NET_L2_OPENTHREAD
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_NET_L2_OPENTHREAD
+#else
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
+#endif // CONFIG_NET_L2_OPENTHREAD
+#endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
+
+#if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
+#define CHIP_DEVICE_CONFIG_ENABLE_UNPROVISIONED_MDNS 1
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 
 #ifndef CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE

diff --git a/src/platform/nxp/common/CHIPNXPPlatformDefaultConfig.h b/src/platform/nxp/common/CHIPNXPPlatformDefaultConfig.h
@@ -254,6 +254,15 @@
 #define CHIP_CONFIG_RMP_DEFAULT_MAX_RETRANS 10
 #endif
 
+/* Increasing the retransmission interval of the MRP messages after subsequent failures */
+#ifndef CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+#ifdef CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+#define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+#else
+#define CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL (2000_ms32)
+#endif // CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+#endif // CHIP_CONFIG_MRP_LOCAL_ACTIVE_RETRY_INTERVAL
+
 #ifndef NXP_USE_MML
 /* Do not use Memory Manager Light for dynamic memory allocation by default. */
 #define NXP_USE_MML 0