From 4a25509e2250074e83492d99912956021678ae45 Mon Sep 17 00:00:00 2001 From: Justin Wood <woody@apple.com> Date: Wed, 29 Sep 2021 13:02:03 -0700 Subject: [PATCH 1/3] Disable SoftAP in the SDK --- examples/lock-app/mbed/main/include/CHIPProjectConfig.h | 2 +- src/include/platform/CHIPDeviceConfig.h | 2 +- src/platform/Linux/CHIPDevicePlatformConfig.h | 2 +- src/platform/P6/ConnectivityManagerImpl.cpp | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/lock-app/mbed/main/include/CHIPProjectConfig.h b/examples/lock-app/mbed/main/include/CHIPProjectConfig.h index 896d53ec97a572..17b762f0def566 100644 --- a/examples/lock-app/mbed/main/include/CHIPProjectConfig.h +++ b/examples/lock-app/mbed/main/include/CHIPProjectConfig.h @@ -28,7 +28,7 @@ #pragma once #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1 -#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 1 +#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0 // Use a default pairing code if one hasn't been provisioned in flash. #define CHIP_DEVICE_CONFIG_USE_TEST_SETUP_PIN_CODE 20202021 diff --git a/src/include/platform/CHIPDeviceConfig.h b/src/include/platform/CHIPDeviceConfig.h index c623e934d96482..f851c524351504 100644 --- a/src/include/platform/CHIPDeviceConfig.h +++ b/src/include/platform/CHIPDeviceConfig.h @@ -297,7 +297,7 @@ * Enable support for a WiFi AP interface. */ #ifndef CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP -#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 1 +#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0 #endif /** diff --git a/src/platform/Linux/CHIPDevicePlatformConfig.h b/src/platform/Linux/CHIPDevicePlatformConfig.h index fa72ec13524c00..9c9c86de95f069 100644 --- a/src/platform/Linux/CHIPDevicePlatformConfig.h +++ b/src/platform/Linux/CHIPDevicePlatformConfig.h @@ -26,7 +26,7 @@ // ==================== Platform Adaptations ==================== #define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 1 -#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 1 +#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0 #ifndef CHIP_DEVICE_CONFIG_ENABLE_THREAD #define CHIP_DEVICE_CONFIG_ENABLE_THREAD CHIP_ENABLE_OPENTHREAD diff --git a/src/platform/P6/ConnectivityManagerImpl.cpp b/src/platform/P6/ConnectivityManagerImpl.cpp index 1dd9d940d4f04e..cfe7bccb12c8a3 100644 --- a/src/platform/P6/ConnectivityManagerImpl.cpp +++ b/src/platform/P6/ConnectivityManagerImpl.cpp @@ -43,9 +43,11 @@ #error "WiFi Station support must be enabled when building for PSoC6" #endif -#if !CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP -#error "WiFi AP support must be enabled when building for PSoC6" -#endif + +// FIXME: https://github.com/project-chip/connectedhomeip/issues/10071 +// #if !CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP +// #error "WiFi AP support must be enabled when building for PSoC6" +// #endif using namespace ::chip; using namespace ::chip::Inet; From a1dd7ef2082575288e96c8584a5c076d83322e95 Mon Sep 17 00:00:00 2001 From: "Restyled.io" <commits@restyled.io> Date: Wed, 29 Sep 2021 23:19:28 +0000 Subject: [PATCH 2/3] Restyled by clang-format --- src/platform/P6/ConnectivityManagerImpl.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/platform/P6/ConnectivityManagerImpl.cpp b/src/platform/P6/ConnectivityManagerImpl.cpp index cfe7bccb12c8a3..87fd71092cd995 100644 --- a/src/platform/P6/ConnectivityManagerImpl.cpp +++ b/src/platform/P6/ConnectivityManagerImpl.cpp @@ -43,7 +43,6 @@ #error "WiFi Station support must be enabled when building for PSoC6" #endif - // FIXME: https://github.com/project-chip/connectedhomeip/issues/10071 // #if !CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP // #error "WiFi AP support must be enabled when building for PSoC6" From a080de7b4bb15028ebc1890aa862fbe3802db152 Mon Sep 17 00:00:00 2001 From: Justin Wood <woody@apple.com> Date: Wed, 6 Oct 2021 20:09:04 -0700 Subject: [PATCH 3/3] Update ConnectivityManagerImpl.cpp Removing this comment --- src/platform/P6/ConnectivityManagerImpl.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/platform/P6/ConnectivityManagerImpl.cpp b/src/platform/P6/ConnectivityManagerImpl.cpp index 9dd48c672697a7..a7095b44ac8719 100644 --- a/src/platform/P6/ConnectivityManagerImpl.cpp +++ b/src/platform/P6/ConnectivityManagerImpl.cpp @@ -43,11 +43,6 @@ #error "WiFi Station support must be enabled when building for PSoC6" #endif -// FIXME: https://github.com/project-chip/connectedhomeip/issues/10071 -// #if !CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP -// #error "WiFi AP support must be enabled when building for PSoC6" -// #endif - using namespace ::chip; using namespace ::chip::Inet; using namespace ::chip::System;