Skip to content

Commit 1164d6a

Browse files
Kshitijjain21Kshitijjain21
authored
Merge branch 'project-chip:master' into update-CNET-4.13-test
2 parents 3886fb2 + 8a4dffc commit 1164d6a

File tree

258 files changed

+3865
-1169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+3865
-1169
lines changed

‎config/esp32/components/chip/Kconfig

+14-2
Original file line numberDiff line numberDiff line change
@@ -1192,8 +1192,11 @@ menu "CHIP Device Layer"
11921192
menu "Commissioning Window Options"
11931193
config CHIP_DISCOVERY_TIMEOUT_SECS
11941194
int "Commissioning Window Timeout in seconds"
1195-
range 180 900
1196-
default 900
1195+
range 180 900 if !ENABLE_BLE_EXT_ANNOUNCEMENT
1196+
range 901 172800 if ENABLE_BLE_EXT_ANNOUNCEMENT
1197+
default 900 if !ENABLE_BLE_EXT_ANNOUNCEMENT
1198+
default 172800 if ENABLE_BLE_EXT_ANNOUNCEMENT
1199+
11971200
help
11981201
The amount of time (in seconds) after which the CHIP platform will close the Commissioning Window
11991202
endmenu
@@ -1216,4 +1219,13 @@ menu "CHIP Device Layer"
12161219

12171220
endmenu
12181221

1222+
menu "Enable BLE Extended Announcement"
1223+
config ENABLE_BLE_EXT_ANNOUNCEMENT
1224+
bool "Enable BLE Extended Announcement"
1225+
default n
1226+
help
1227+
Enable BLE Extended Announcement.To be used with CHIP_DISCOVERY_TIMEOUT_SECS for extended announcement duration.
1228+
1229+
endmenu
1230+
12191231
endmenu

‎examples/all-clusters-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#pragma once
2020

2121
#include "AppEvent.h"
22-
#include <ble/BLEEndPoint.h>
22+
#include <ble/Ble.h>
2323
#include <lega_rtos_api.h>
2424
#include <platform/CHIPDeviceLayer.h>
2525
#include <stdbool.h>

‎examples/all-clusters-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "AppEvent.h"
2727
#include "FreeRTOS.h"
2828
#include "timers.h" // provides FreeRTOS timer support
29-
#include <ble/BLEEndPoint.h>
29+
#include <ble/Ble.h>
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
// Application-defined error codes in the CHIP_ERROR space.

‎examples/all-clusters-minimal-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "AppEvent.h"
2525
#include "FreeRTOS.h"
2626
#include "timers.h" // provides FreeRTOS timer support
27-
#include <ble/BLEEndPoint.h>
27+
#include <ble/Ble.h>
2828
#include <platform/CHIPDeviceLayer.h>
2929

3030
// Application-defined error codes in the CHIP_ERROR space.

‎examples/all-clusters-minimal-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "AppEvent.h"
2727
#include "FreeRTOS.h"
2828
#include "timers.h" // provides FreeRTOS timer support
29-
#include <ble/BLEEndPoint.h>
29+
#include <ble/Ble.h>
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
// Application-defined error codes in the CHIP_ERROR space.

‎examples/chef/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
31-
#include <ble/BLEEndPoint.h>
31+
#include <ble/Ble.h>
3232
#include <cmsis_os2.h>
3333
#include <lib/core/CHIPError.h>
3434
#include <platform/CHIPDeviceLayer.h>

‎examples/light-switch-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include "FreeRTOS.h"
2727
#include "timers.h" // provides FreeRTOS timer support
28-
#include <ble/BLEEndPoint.h>
28+
#include <ble/Ble.h>
2929
#include <platform/CHIPDeviceLayer.h>
3030

3131
// Application-defined error codes in the CHIP_ERROR space.

‎examples/light-switch-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
31-
#include <ble/BLEEndPoint.h>
31+
#include <ble/Ble.h>
3232
#include <cmsis_os2.h>
3333
#include <lib/core/CHIPError.h>
3434
#include <platform/CHIPDeviceLayer.h>

‎examples/lighting-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232

3333
// Application-defined error codes in the CHIP_ERROR space.

‎examples/lighting-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
3131
#include "LightingManager.h"
32-
#include <ble/BLEEndPoint.h>
32+
#include <ble/Ble.h>
3333
#include <cmsis_os2.h>
3434
#include <lib/core/CHIPError.h>
3535
#include <platform/CHIPDeviceLayer.h>

‎examples/lit-icd-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
31-
#include <ble/BLEEndPoint.h>
31+
#include <ble/Ble.h>
3232
#include <cmsis_os2.h>
3333
#include <lib/core/CHIPError.h>
3434
#include <platform/CHIPDeviceLayer.h>

‎examples/lock-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232

3333
// Application-defined error codes in the CHIP_ERROR space.

‎examples/lock-app/esp32/main/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <lock/BoltLockManager.h>
2525

2626
#include "freertos/FreeRTOS.h"
27-
#include <ble/BLEEndPoint.h>
27+
#include <ble/Ble.h>
2828
#include <lib/support/CodeUtils.h>
2929
#include <platform/CHIPDeviceLayer.h>
3030

‎examples/lock-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232

3333
// Application-defined error codes in the CHIP_ERROR space.

‎examples/lock-app/qpg/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <lib/core/CHIPError.h>
3232
#include <platform/CHIPDeviceLayer.h>
3333

‎examples/lock-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
3131
#include "LockManager.h"
32-
#include <ble/BLEEndPoint.h>
32+
#include <ble/Ble.h>
3333
#include <cmsis_os2.h>
3434
#include <lib/core/CHIPError.h>
3535
#include <platform/CHIPDeviceLayer.h>

‎examples/platform/nxp/common/app_task/source/AppTaskBase.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@
6262
#include <app/clusters/ota-requestor/OTATestEventTriggerDelegate.h>
6363
#endif
6464

65+
#ifdef ENABLE_CHIP_SHELL
66+
#include <lib/shell/commands/WiFi.h>
67+
#endif
68+
6569
using namespace chip;
6670
using namespace chip::TLV;
6771
using namespace ::chip::Credentials;
@@ -202,6 +206,9 @@ CHIP_ERROR chip::NXP::App::AppTaskBase::Init()
202206

203207
#if CONFIG_CHIP_WIFI || CHIP_DEVICE_CONFIG_ENABLE_WPA
204208
sNetworkCommissioningInstance.Init();
209+
#ifdef ENABLE_CHIP_SHELL
210+
Shell::SetWiFiDriver(chip::NXP::App::GetAppTask().GetWifiDriverInstance());
211+
#endif
205212
#endif
206213
#if CONFIG_CHIP_OTA_REQUESTOR
207214
if (err == CHIP_NO_ERROR)

‎examples/platform/silabs/BaseApplication.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/server/AppDelegate.h>
3232
#include <app/util/config.h>
33-
#include <ble/BLEEndPoint.h>
33+
#include <ble/Ble.h>
3434
#include <cmsis_os2.h>
3535
#include <lib/core/CHIPError.h>
3636
#include <platform/CHIPDeviceEvent.h>

‎examples/pump-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
3131
#include "PumpManager.h"
32-
#include <ble/BLEEndPoint.h>
32+
#include <ble/Ble.h>
3333
#include <cmsis_os2.h>
3434
#include <lib/core/CHIPError.h>
3535
#include <platform/CHIPDeviceLayer.h>

‎examples/smoke-co-alarm-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "AppEvent.h"
2828
#include "BaseApplication.h"
2929
#include "SmokeCoAlarmManager.h"
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <cmsis_os2.h>
3232
#include <lib/core/CHIPError.h>
3333
#include <platform/CHIPDeviceLayer.h>

‎examples/temperature-measurement-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "AppEvent.h"
2525
#include "FreeRTOS.h"
2626
#include "timers.h" // provides FreeRTOS timer support
27-
#include <ble/BLEEndPoint.h>
27+
#include <ble/Ble.h>
2828
#include <platform/CHIPDeviceLayer.h>
2929

3030
// Application-defined error codes in the CHIP_ERROR space.

‎examples/thermostat/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "SensorManager.h"
2727
#include "TemperatureManager.h"
2828
#include "timers.h" // provides FreeRTOS timer support
29-
#include <ble/BLEEndPoint.h>
29+
#include <ble/Ble.h>
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
#include <FreeRTOS.h>

‎examples/thermostat/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "BaseApplication.h"
3535
#include "SensorManager.h"
3636
#include "TemperatureManager.h"
37-
#include <ble/BLEEndPoint.h>
37+
#include <ble/Ble.h>
3838
#include <cmsis_os2.h>
3939
#include <lib/core/CHIPError.h>
4040
#include <platform/CHIPDeviceLayer.h>

0 commit comments

Comments
 (0)