diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp index b6bb6419d6c7a5..7efb5bd5cfac71 100644 --- a/examples/lighting-app/qpg/src/AppTask.cpp +++ b/examples/lighting-app/qpg/src/AppTask.cpp @@ -50,7 +50,7 @@ using namespace chip::DeviceLayer; #define FACTORY_RESET_TRIGGER_TIMEOUT 3000 #define FACTORY_RESET_CANCEL_WINDOW_TIMEOUT 3000 -#define APP_TASK_STACK_SIZE (2048) +#define APP_TASK_STACK_SIZE (3 * 1024) #define APP_TASK_PRIORITY 2 #define APP_EVENT_QUEUE_SIZE 10 diff --git a/examples/platform/qpg/project_include/OpenThreadConfig.h b/examples/platform/qpg/project_include/OpenThreadConfig.h index 05a2d2ce8333c0..5f7dcd0c844a51 100644 --- a/examples/platform/qpg/project_include/OpenThreadConfig.h +++ b/examples/platform/qpg/project_include/OpenThreadConfig.h @@ -34,15 +34,16 @@ #define OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE 1 #if CHIP_DEVICE_CONFIG_THREAD_FTD -#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 22 +#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 44 #else -#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 10 +#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 22 #endif // Limit CLI buffers #define OPENTHREAD_CONFIG_CLI_UART_RX_BUFFER_SIZE 384 #define OPENTHREAD_CONFIG_CLI_UART_TX_BUFFER_SIZE 512 +// Enable specific features #define OPENTHREAD_CONFIG_JOINER_ENABLE 1 #define OPENTHREAD_CONFIG_NCP_HDLC_ENABLE 1 #define OPENTHREAD_CONFIG_IP6_SLAAC_ENABLE 1 @@ -50,6 +51,15 @@ #define OPENTHREAD_CONFIG_SRP_CLIENT_ENABLE 1 #define OPENTHREAD_CONFIG_ECDSA_ENABLE 1 +// Disable unneeded features +#define OPENTHREAD_CONFIG_COAP_API_ENABLE 0 +#define OPENTHREAD_CONFIG_COMMISSIONER_ENABLE 0 +#define OPENTHREAD_CONFIG_UDP_FORWARD_ENABLE 0 +#define OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE 0 +#define OPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE 0 +#define OPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE 0 +#define OPENTHREAD_CONFIG_TCP_ENABLE 0 + // Use the Qorvo-supplied default platform configuration for remainder // of OpenThread config options. // diff --git a/src/lwip/qpg/lwipopts.h b/src/lwip/qpg/lwipopts.h index 1cd86d29ab289c..6276c099b38bd5 100644 --- a/src/lwip/qpg/lwipopts.h +++ b/src/lwip/qpg/lwipopts.h @@ -106,7 +106,7 @@ #define SUB_ETHERNET_HEADER_SPACE (0) #define PBUF_LINK_HLEN (0) -#define TCPIP_THREAD_STACKSIZE (4096) +#define TCPIP_THREAD_STACKSIZE (2048) #define TCPIP_THREAD_PRIO (2) #define NETIF_MAX_HWADDR_LEN 8U @@ -126,7 +126,7 @@ // TODO: make LWIP_DEBUG conditional on build type #ifndef LWIP_DEBUG -#define LWIP_DEBUG 1 +#define LWIP_DEBUG 0 #endif #define MEMP_OVERFLOW_CHECK (0) diff --git a/src/platform/qpg/CHIPDevicePlatformConfig.h b/src/platform/qpg/CHIPDevicePlatformConfig.h index 69cadc40dd0615..d1339bc787e67d 100644 --- a/src/platform/qpg/CHIPDevicePlatformConfig.h +++ b/src/platform/qpg/CHIPDevicePlatformConfig.h @@ -30,8 +30,12 @@ #if CHIP_ENABLE_OPENTHREAD #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 1 +#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1 +#define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES 4 #endif +#define CHIP_DEVICE_CONFIG_ENABLE_EXTENDED_DISCOVERY 1 +#define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DISCOVERY 1 #define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1 #define CHIP_DEVICE_CONFIG_ENABLE_CHIP_TIME_SERVICE_TIME_SYNC 0 @@ -42,8 +46,6 @@ #define CHIP_DEVICE_CONFIG_PERSISTED_STORAGE_DEBUG_EIDC_KEY 5 #define CHIP_DEVICE_CONFIG_ENABLE_MDNS 1 -#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT 1 -#define CHIP_DEVICE_CONFIG_THREAD_SRP_MAX_SERVICES 1 // ========== Platform-specific Configuration ========= @@ -55,7 +57,7 @@ // ========== Platform-specific Configuration Overrides ========= #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE -#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (4 * 1024) +#define CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE (5 * 1024) #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE #ifndef CHIP_DEVICE_CONFIG_THREAD_TASK_STACK_SIZE diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo index 2e11f9c052cb57..9ae1935b25a16f 160000 --- a/third_party/qpg_sdk/repo +++ b/third_party/qpg_sdk/repo @@ -1 +1 @@ -Subproject commit 2e11f9c052cb5758f318e56d344ca6d9b391b50b +Subproject commit 9ae1935b25a16fc68873696c3c6eac671a1aaa95