diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp index 728fe97e5d3c3f..821ce73b39429a 100644 --- a/examples/lighting-app/efr32/src/AppTask.cpp +++ b/examples/lighting-app/efr32/src/AppTask.cpp @@ -71,10 +71,9 @@ QueueHandle_t sAppEventQueue; LEDWidget sStatusLED; LEDWidget sLightLED; -bool sIsThreadProvisioned = false; -bool sIsThreadEnabled = false; -bool sHaveBLEConnections = false; -bool sHaveServiceConnectivity = false; +bool sIsThreadProvisioned = false; +bool sIsThreadEnabled = false; +bool sHaveBLEConnections = false; uint8_t sAppEventQueueBuffer[APP_EVENT_QUEUE_SIZE * sizeof(AppEvent)]; StaticQueue_t sAppEventQueueStruct; @@ -193,10 +192,9 @@ void AppTask::AppTaskMain(void * pvParameter) // when the CHIP task is busy (e.g. with a long crypto operation). if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -214,13 +212,7 @@ void AppTask::AppTaskMain(void * pvParameter) // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - // Consider the system to be "fully connected" if it has service - // connectivity - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/lighting-app/k32w/main/AppTask.cpp b/examples/lighting-app/k32w/main/AppTask.cpp index 0050788e184eb4..069c8ab292fb82 100644 --- a/examples/lighting-app/k32w/main/AppTask.cpp +++ b/examples/lighting-app/k32w/main/AppTask.cpp @@ -52,10 +52,9 @@ static QueueHandle_t sAppEventQueue; static LEDWidget sStatusLED; static LEDWidget sLightLED; -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sHaveBLEConnections = false; static uint32_t eventMask = 0; @@ -182,10 +181,9 @@ void AppTask::AppTaskMain(void * pvParameter) #if CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI K32WUartProcess(); #endif - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -203,11 +201,7 @@ void AppTask::AppTaskMain(void * pvParameter) // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp index 408935ba68a72e..0336077386f021 100644 --- a/examples/lighting-app/nrfconnect/main/AppTask.cpp +++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp @@ -61,10 +61,9 @@ LEDWidget sStatusLED; LEDWidget sUnusedLED; LEDWidget sUnusedLED_1; -bool sIsThreadProvisioned = false; -bool sIsThreadEnabled = false; -bool sHaveBLEConnections = false; -bool sHaveServiceConnectivity = false; +bool sIsThreadProvisioned = false; +bool sIsThreadEnabled = false; +bool sHaveBLEConnections = false; } // namespace @@ -150,10 +149,9 @@ int AppTask::StartApp() if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -171,11 +169,7 @@ int AppTask::StartApp() // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp index 7efb5bd5cfac71..f1480225ae14b0 100644 --- a/examples/lighting-app/qpg/src/AppTask.cpp +++ b/examples/lighting-app/qpg/src/AppTask.cpp @@ -57,10 +57,9 @@ using namespace chip::DeviceLayer; static TaskHandle_t sAppTaskHandle; static QueueHandle_t sAppEventQueue; -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sHaveBLEConnections = false; AppTask AppTask::sAppTask; @@ -146,10 +145,9 @@ void AppTask::AppTaskMain(void * pvParameter) // when the CHIP task is busy (e.g. with a long crypto operation). if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -167,13 +165,7 @@ void AppTask::AppTaskMain(void * pvParameter) // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - // Consider the system to be "fully connected" if it has service - // connectivity - if (sHaveServiceConnectivity) - { - qvCHIP_LedSet(SYSTEM_STATE_LED, true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { qvCHIP_LedBlink(SYSTEM_STATE_LED, 950, 50); } diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp index 652f07822ccdb6..fc2be9cf84ab4a 100644 --- a/examples/lighting-app/telink/src/AppTask.cpp +++ b/examples/lighting-app/telink/src/AppTask.cpp @@ -64,11 +64,10 @@ Button sFactoryResetButton; Button sLightingButton; Button sThreadStartButton; -bool sIsThreadProvisioned = false; -bool sIsThreadEnabled = false; -bool sIsThreadAttached = false; -bool sHaveBLEConnections = false; -bool sHaveServiceConnectivity = false; +bool sIsThreadProvisioned = false; +bool sIsThreadEnabled = false; +bool sIsThreadAttached = false; +bool sHaveBLEConnections = false; } // namespace @@ -146,19 +145,14 @@ CHIP_ERROR AppTask::StartApp() if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sIsThreadAttached = ConnectivityMgr().IsThreadAttached(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sIsThreadAttached = ConnectivityMgr().IsThreadAttached(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { if (sIsThreadAttached) { diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp index bfbfc3eee581a3..5362cccf84cf3a 100644 --- a/examples/lock-app/efr32/src/AppTask.cpp +++ b/examples/lock-app/efr32/src/AppTask.cpp @@ -68,10 +68,9 @@ QueueHandle_t sAppEventQueue; LEDWidget sStatusLED; LEDWidget sLockLED; -bool sIsThreadProvisioned = false; -bool sIsThreadEnabled = false; -bool sHaveBLEConnections = false; -bool sHaveServiceConnectivity = false; +bool sIsThreadProvisioned = false; +bool sIsThreadEnabled = false; +bool sHaveBLEConnections = false; StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)]; StaticTask_t appTaskStruct; @@ -186,10 +185,9 @@ void AppTask::AppTaskMain(void * pvParameter) // when the CHIP task is busy (e.g. with a long crypto operation). if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -207,13 +205,7 @@ void AppTask::AppTaskMain(void * pvParameter) // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - // Consider the system to be "fully connected" if it has service - // connectivity - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/lock-app/esp32/main/AppTask.cpp b/examples/lock-app/esp32/main/AppTask.cpp index 9db64f5f7e398a..8dc76f843826fe 100644 --- a/examples/lock-app/esp32/main/AppTask.cpp +++ b/examples/lock-app/esp32/main/AppTask.cpp @@ -53,8 +53,7 @@ Button lockButton; BaseType_t sAppTaskHandle; QueueHandle_t sAppEventQueue; -bool sHaveBLEConnections = false; -bool sHaveServiceConnectivity = false; +bool sHaveBLEConnections = false; StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)]; } // namespace @@ -140,8 +139,7 @@ void AppTask::AppTaskMain(void * pvParameter) // when the CHIP task is busy (e.g. with a long crypto operation). if (PlatformMgr().TryLockChipStack()) { - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -158,13 +156,7 @@ void AppTask::AppTaskMain(void * pvParameter) // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - // Consider the system to be "fully connected" if it has service - // connectivity - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sHaveBLEConnections) + if (sHaveBLEConnections) { sStatusLED.Blink(100, 100); } diff --git a/examples/lock-app/k32w/main/AppTask.cpp b/examples/lock-app/k32w/main/AppTask.cpp index e95b73cb394b5b..44c3beb3bd4945 100644 --- a/examples/lock-app/k32w/main/AppTask.cpp +++ b/examples/lock-app/k32w/main/AppTask.cpp @@ -52,10 +52,9 @@ static LEDWidget sStatusLED; static LEDWidget sLockLED; #endif -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sHaveBLEConnections = false; static uint32_t eventMask = 0; @@ -195,10 +194,9 @@ void AppTask::AppTaskMain(void * pvParameter) K32WUartProcess(); #endif - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -218,11 +216,7 @@ void AppTask::AppTaskMain(void * pvParameter) #if !cPWR_UsePowerDownMode if (sAppTask.mFunction != kFunction_FactoryReset) { - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp index eeda5d717ba79a..353e7778ebbb2f 100644 --- a/examples/lock-app/nrfconnect/main/AppTask.cpp +++ b/examples/lock-app/nrfconnect/main/AppTask.cpp @@ -52,10 +52,9 @@ static LEDWidget sLockLED; static LEDWidget sUnusedLED; static LEDWidget sUnusedLED_1; -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sHaveBLEConnections = false; static k_timer sFunctionTimer; @@ -140,10 +139,9 @@ int AppTask::StartApp() if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -161,11 +159,7 @@ int AppTask::StartApp() // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/lock-app/p6/src/AppTask.cpp b/examples/lock-app/p6/src/AppTask.cpp index 64d8b1f15b40a7..9510745af07bc7 100644 --- a/examples/lock-app/p6/src/AppTask.cpp +++ b/examples/lock-app/p6/src/AppTask.cpp @@ -57,7 +57,6 @@ bool sIsWiFiStationProvisioned = false; bool sIsWiFiStationEnabled = false; bool sIsWiFiStationConnected = false; bool sHaveBLEConnections = false; -bool sHaveServiceConnectivity = false; StackType_t appStack[APP_TASK_STACK_SIZE / sizeof(StackType_t)]; StaticTask_t appTaskStruct; @@ -179,7 +178,6 @@ void AppTask::AppTaskMain(void * pvParameter) sIsWiFiStationConnected = ConnectivityMgr().IsWiFiStationConnected(); sIsWiFiStationProvisioned = ConnectivityMgr().IsWiFiStationProvisioned(); sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); PlatformMgr().UnlockChipStack(); } @@ -197,13 +195,7 @@ void AppTask::AppTaskMain(void * pvParameter) // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != Function::kFactoryReset) { - // Consider the system to be "fully connected" if it has service - // connectivity - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsWiFiStationEnabled && sIsWiFiStationProvisioned && (!sIsWiFiStationConnected || !sHaveServiceConnectivity)) + if (sIsWiFiStationEnabled && sIsWiFiStationProvisioned && !sIsWiFiStationConnected) { sStatusLED.Blink(950, 50); } diff --git a/examples/lock-app/qpg/src/AppTask.cpp b/examples/lock-app/qpg/src/AppTask.cpp index 7f641a0a6cbff2..770d753d079ef3 100644 --- a/examples/lock-app/qpg/src/AppTask.cpp +++ b/examples/lock-app/qpg/src/AppTask.cpp @@ -58,10 +58,9 @@ using namespace chip::DeviceLayer; static TaskHandle_t sAppTaskHandle; static QueueHandle_t sAppEventQueue; -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sHaveBLEConnections = false; AppTask AppTask::sAppTask; @@ -145,10 +144,9 @@ void AppTask::AppTaskMain(void * pvParameter) // when the CHIP task is busy (e.g. with a long crypto operation). if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -166,13 +164,7 @@ void AppTask::AppTaskMain(void * pvParameter) // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - // Consider the system to be "fully connected" if it has service - // connectivity - if (sHaveServiceConnectivity) - { - qvCHIP_LedSet(SYSTEM_STATE_LED, true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { qvCHIP_LedBlink(SYSTEM_STATE_LED, 950, 50); } diff --git a/examples/pump-app/nrfconnect/main/AppTask.cpp b/examples/pump-app/nrfconnect/main/AppTask.cpp index ae61ba78a1dc81..0a61538f227f5c 100644 --- a/examples/pump-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-app/nrfconnect/main/AppTask.cpp @@ -52,10 +52,9 @@ static LEDWidget sPumpStateLED; static LEDWidget sUnusedLED; static LEDWidget sUnusedLED_1; -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sHaveBLEConnections = false; static k_timer sFunctionTimer; @@ -140,10 +139,9 @@ int AppTask::StartApp() if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -161,11 +159,7 @@ int AppTask::StartApp() // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp index ae61ba78a1dc81..0a61538f227f5c 100644 --- a/examples/pump-controller-app/nrfconnect/main/AppTask.cpp +++ b/examples/pump-controller-app/nrfconnect/main/AppTask.cpp @@ -52,10 +52,9 @@ static LEDWidget sPumpStateLED; static LEDWidget sUnusedLED; static LEDWidget sUnusedLED_1; -static bool sIsThreadProvisioned = false; -static bool sIsThreadEnabled = false; -static bool sHaveBLEConnections = false; -static bool sHaveServiceConnectivity = false; +static bool sIsThreadProvisioned = false; +static bool sIsThreadEnabled = false; +static bool sHaveBLEConnections = false; static k_timer sFunctionTimer; @@ -140,10 +139,9 @@ int AppTask::StartApp() if (PlatformMgr().TryLockChipStack()) { - sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - sHaveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + sIsThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + sIsThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + sHaveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -161,11 +159,7 @@ int AppTask::StartApp() // Otherwise, blink the LED ON for a very short time. if (sAppTask.mFunction != kFunction_FactoryReset) { - if (sHaveServiceConnectivity) - { - sStatusLED.Set(true); - } - else if (sIsThreadProvisioned && sIsThreadEnabled) + if (sIsThreadProvisioned && sIsThreadEnabled) { sStatusLED.Blink(950, 50); } diff --git a/examples/window-app/common/include/WindowApp.h b/examples/window-app/common/include/WindowApp.h index 8a9de61f8090f2..000c997cde6d4a 100644 --- a/examples/window-app/common/include/WindowApp.h +++ b/examples/window-app/common/include/WindowApp.h @@ -133,10 +133,9 @@ class WindowApp protected: struct StateFlags { - bool isThreadProvisioned = false; - bool isThreadEnabled = false; - bool haveBLEConnections = false; - bool haveServiceConnectivity = false; + bool isThreadProvisioned = false; + bool isThreadEnabled = false; + bool haveBLEConnections = false; }; Cover & GetCover(); diff --git a/examples/window-app/common/src/WindowApp.cpp b/examples/window-app/common/src/WindowApp.cpp index afe6c5b48c0148..5db1853c467878 100644 --- a/examples/window-app/common/src/WindowApp.cpp +++ b/examples/window-app/common/src/WindowApp.cpp @@ -107,10 +107,9 @@ CHIP_ERROR WindowApp::Run() // when the CHIP task is busy (e.g. with a long crypto operation). if (PlatformMgr().TryLockChipStack()) { - mState.isThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); - mState.isThreadEnabled = ConnectivityMgr().IsThreadEnabled(); - mState.haveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); - mState.haveServiceConnectivity = ConnectivityMgr().HaveServiceConnectivity(); + mState.isThreadProvisioned = ConnectivityMgr().IsThreadProvisioned(); + mState.isThreadEnabled = ConnectivityMgr().IsThreadEnabled(); + mState.haveBLEConnections = (ConnectivityMgr().NumBLEConnections() != 0); PlatformMgr().UnlockChipStack(); } @@ -120,12 +119,6 @@ CHIP_ERROR WindowApp::Run() DispatchEvent(EventId::ProvisionedStateChanged); } - if (mState.haveServiceConnectivity != oldState.haveServiceConnectivity) - { - // Provisioned state changed - DispatchEvent(EventId::ConnectivityStateChanged); - } - if (mState.haveBLEConnections != oldState.haveBLEConnections) { // Provisioned state changed diff --git a/examples/window-app/efr32/src/WindowAppImpl.cpp b/examples/window-app/efr32/src/WindowAppImpl.cpp index 602db9bd5bfcdc..20bc37a094bed4 100644 --- a/examples/window-app/efr32/src/WindowAppImpl.cpp +++ b/examples/window-app/efr32/src/WindowAppImpl.cpp @@ -298,13 +298,7 @@ void WindowAppImpl::UpdateLEDs() } else { - // Consider the system to be "fully connected" if it has service - // connectivity - if (mState.haveServiceConnectivity) - { - mStatusLED.Set(true); - } - else if (mState.isThreadProvisioned && mState.isThreadEnabled) + if (mState.isThreadProvisioned && mState.isThreadEnabled) { mStatusLED.Blink(950, 50); } diff --git a/src/include/platform/ConnectivityManager.h b/src/include/platform/ConnectivityManager.h index a03290bf7a88eb..aa49492a2c3aac 100644 --- a/src/include/platform/ConnectivityManager.h +++ b/src/include/platform/ConnectivityManager.h @@ -164,15 +164,8 @@ class ConnectivityManager bool IsThreadAttached(); bool IsThreadProvisioned(); void ErasePersistentInfo(); - bool HaveServiceConnectivityViaThread(); - CHIP_ERROR WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, TLV::TLVWriter * aWriter); - - // Internet connectivity methods - bool HaveIPv4InternetConnectivity(); - bool HaveIPv6InternetConnectivity(); - // Service connectivity methods - bool HaveServiceConnectivity(); + CHIP_ERROR WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, TLV::TLVWriter * aWriter); // Ethernet network diagnostics methods CHIP_ERROR GetEthPacketRxCount(uint64_t & packetRxCount); @@ -377,21 +370,6 @@ inline CHIP_ERROR ConnectivityManager::GetAndLogWifiStatsCounters() return static_cast(this)->_GetAndLogWifiStatsCounters(); } -inline bool ConnectivityManager::HaveIPv4InternetConnectivity() -{ - return static_cast(this)->_HaveIPv4InternetConnectivity(); -} - -inline bool ConnectivityManager::HaveIPv6InternetConnectivity() -{ - return static_cast(this)->_HaveIPv6InternetConnectivity(); -} - -inline bool ConnectivityManager::HaveServiceConnectivity() -{ - return static_cast(this)->_HaveServiceConnectivity(); -} - inline CHIP_ERROR ConnectivityManager::GetEthPacketRxCount(uint64_t & packetRxCount) { return static_cast(this)->_GetEthPacketRxCount(packetRxCount); @@ -472,11 +450,6 @@ inline void ConnectivityManager::ErasePersistentInfo() static_cast(this)->_ErasePersistentInfo(); } -inline bool ConnectivityManager::HaveServiceConnectivityViaThread() -{ - return static_cast(this)->_HaveServiceConnectivityViaThread(); -} - /* * @brief Get runtime value from the thread network based on the given attribute ID. * The info is written in the TLVWriter for the zcl read command reply. diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h index 3fc46bf5c3fdb7..5db68ebbbb2105 100644 --- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h +++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoThread.h @@ -55,7 +55,6 @@ class GenericConnectivityManagerImpl_NoThread bool _IsThreadAttached(void); bool _IsThreadProvisioned(void); void _ErasePersistentInfo(void); - bool _HaveServiceConnectivityViaThread(void); CHIP_ERROR _WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, TLV::TLVWriter * aWriter); ImplClass * Impl() { return static_cast(this); } @@ -128,12 +127,6 @@ inline CHIP_ERROR GenericConnectivityManagerImpl_NoThread::_SetThread return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE; } -template -inline bool GenericConnectivityManagerImpl_NoThread::_HaveServiceConnectivityViaThread(void) -{ - return false; -} - template inline CHIP_ERROR GenericConnectivityManagerImpl_NoThread::_WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h b/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h index af744bbf4da9fd..a502b9411f6c0e 100644 --- a/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h +++ b/src/include/platform/internal/GenericConnectivityManagerImpl_NoWiFi.h @@ -57,8 +57,6 @@ class GenericConnectivityManagerImpl_NoWiFi bool _IsWiFiStationEnabled(void); bool _IsWiFiStationApplicationControlled(void); bool _IsWiFiStationConnected(void); - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); uint32_t _GetWiFiStationReconnectIntervalMS(void); CHIP_ERROR _SetWiFiStationReconnectIntervalMS(uint32_t val); bool _IsWiFiStationProvisioned(void); @@ -109,18 +107,6 @@ inline bool GenericConnectivityManagerImpl_NoWiFi::_IsWiFiStationConn return false; } -template -inline bool GenericConnectivityManagerImpl_NoWiFi::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -template -inline bool GenericConnectivityManagerImpl_NoWiFi::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - template inline uint32_t GenericConnectivityManagerImpl_NoWiFi::_GetWiFiStationReconnectIntervalMS(void) { diff --git a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h index 194251dd39e551..fb719916384130 100644 --- a/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h +++ b/src/include/platform/internal/GenericConnectivityManagerImpl_Thread.h @@ -68,7 +68,6 @@ class GenericConnectivityManagerImpl_Thread bool _IsThreadAttached(); bool _IsThreadProvisioned(); void _ErasePersistentInfo(); - bool _HaveServiceConnectivityViaThread(); CHIP_ERROR _WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, TLV::TLVWriter * aWriter); // ===== Members for use by the implementation subclass. @@ -152,12 +151,6 @@ inline CHIP_ERROR GenericConnectivityManagerImpl_Thread::_SetThreadPo return ThreadStackMgrImpl().SetThreadPollingConfig(pollingConfig); } -template -inline bool GenericConnectivityManagerImpl_Thread::_HaveServiceConnectivityViaThread() -{ - return mFlags.Has(Flags::kHaveServiceConnectivity); -} - template inline CHIP_ERROR GenericConnectivityManagerImpl_Thread::_WriteThreadNetworkDiagnosticAttributeToTlv(AttributeId attributeId, diff --git a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.cpp b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.cpp index f1ef7b1ea75368..d0a917b17a96e0 100644 --- a/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.cpp +++ b/src/include/platform/internal/GenericSoftwareUpdateManagerImpl.cpp @@ -112,22 +112,9 @@ void GenericSoftwareUpdateManagerImpl::_SetRetryPolicyCallback( template void GenericSoftwareUpdateManagerImpl::PrepareBinding(intptr_t arg) { - CHIP_ERROR err; GenericSoftwareUpdateManagerImpl * self = &SoftwareUpdateMgrImpl(); self->Cleanup(); - - if (!ConnectivityMgr().HaveServiceConnectivity()) - { - ChipLogProgress(DeviceLayer, "Software Update Check: No service connectivity"); - ExitNow(err = CHIP_ERROR_NOT_CONNECTED); - } - -exit: - if (err != CHIP_NO_ERROR) - { - self->Impl()->SoftwareUpdateFailed(err, NULL); - } } template diff --git a/src/platform/Darwin/ConnectivityManagerImpl.h b/src/platform/Darwin/ConnectivityManagerImpl.h index e267e6c9acbf1b..718ca594378006 100644 --- a/src/platform/Darwin/ConnectivityManagerImpl.h +++ b/src/platform/Darwin/ConnectivityManagerImpl.h @@ -65,9 +65,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -79,21 +76,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return _HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/EFR32/ConnectivityManagerImpl.h b/src/platform/EFR32/ConnectivityManagerImpl.h index 97a49c530a37bd..02e1c11c8c7cb9 100644 --- a/src/platform/EFR32/ConnectivityManagerImpl.h +++ b/src/platform/EFR32/ConnectivityManagerImpl.h @@ -63,9 +63,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -77,21 +74,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return _HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/ESP32/ConnectivityManagerImpl_Thread.h b/src/platform/ESP32/ConnectivityManagerImpl_Thread.h index 86f4e8d0eeb365..c398e31213515b 100644 --- a/src/platform/ESP32/ConnectivityManagerImpl_Thread.h +++ b/src/platform/ESP32/ConnectivityManagerImpl_Thread.h @@ -60,9 +60,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); // ===== Members for internal use by the following friends. friend ConnectivityManager & ConnectivityMgr(void); @@ -71,21 +68,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return HaveServiceConnectivityViaThread(); -} - -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.h b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.h index f379c78dbeadf4..f51ee882386213 100644 --- a/src/platform/ESP32/ConnectivityManagerImpl_WiFi.h +++ b/src/platform/ESP32/ConnectivityManagerImpl_WiFi.h @@ -82,9 +82,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, uint32_t _GetWiFiAPIdleTimeoutMS(void); void _SetWiFiAPIdleTimeoutMS(uint32_t val); CHIP_ERROR _GetAndLogWifiStatsCounters(void); - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); bool _CanStartWiFiScan(); @@ -164,26 +161,11 @@ inline uint32_t ConnectivityManagerImpl::_GetWiFiAPIdleTimeoutMS(void) return mWiFiAPIdleTimeoutMS; } -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return mFlags.Has(Flags::kHaveIPv4InternetConnectivity); -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return mFlags.Has(Flags::kHaveIPv6InternetConnectivity); -} - inline bool ConnectivityManagerImpl::_CanStartWiFiScan() { return mWiFiStationState != kWiFiStationState_Connecting; } -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/K32W/ConnectivityManagerImpl.h b/src/platform/K32W/ConnectivityManagerImpl.h index 2c2840f8db1435..115c5ecebe40e4 100644 --- a/src/platform/K32W/ConnectivityManagerImpl.h +++ b/src/platform/K32W/ConnectivityManagerImpl.h @@ -60,9 +60,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -74,21 +71,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return _HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp index 2450e6505da412..a07a54e26196a9 100644 --- a/src/platform/Linux/ConnectivityManagerImpl.cpp +++ b/src/platform/Linux/ConnectivityManagerImpl.cpp @@ -392,16 +392,6 @@ BitFlags: struct GDBusWpaSupplicant ConnectivityManagerImpl::mWpaSupplicant; std::mutex ConnectivityManagerImpl::mWpaSupplicantMutex; -bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity() -{ - return mConnectivityFlag.Has(ConnectivityFlags::kHaveIPv4InternetConnectivity); -} - -bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity() -{ - return mConnectivityFlag.Has(ConnectivityFlags::kHaveIPv6InternetConnectivity); -} - ConnectivityManager::WiFiStationMode ConnectivityManagerImpl::_GetWiFiStationMode() { if (mWiFiStationMode != kWiFiStationMode_ApplicationControlled) diff --git a/src/platform/Linux/ConnectivityManagerImpl.h b/src/platform/Linux/ConnectivityManagerImpl.h index 73bf0739c3dd03..4fea4eb48c50c2 100644 --- a/src/platform/Linux/ConnectivityManagerImpl.h +++ b/src/platform/Linux/ConnectivityManagerImpl.h @@ -114,9 +114,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(); - bool _HaveIPv6InternetConnectivity(); - bool _HaveServiceConnectivity(); CHIP_ERROR _Init(); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -208,10 +205,6 @@ inline uint32_t ConnectivityManagerImpl::_GetWiFiAPIdleTimeoutMS() return mWiFiAPIdleTimeoutMS; } -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity() -{ - return _HaveServiceConnectivityViaThread(); -} #endif /** diff --git a/src/platform/P6/ConnectivityManagerImpl.h b/src/platform/P6/ConnectivityManagerImpl.h index d75d756664e9f2..95e5f40d4049c5 100644 --- a/src/platform/P6/ConnectivityManagerImpl.h +++ b/src/platform/P6/ConnectivityManagerImpl.h @@ -87,12 +87,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager, uint32_t _GetWiFiAPIdleTimeoutMS(void); void _SetWiFiAPIdleTimeoutMS(uint32_t val); - // Internet connectivity methods - bool _HaveIPv4InternetConnectivity(); - bool _HaveIPv6InternetConnectivity(); - // Service connectivity methods - bool _HaveServiceConnectivity(); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -166,26 +161,11 @@ inline uint32_t ConnectivityManagerImpl::_GetWiFiAPIdleTimeoutMS(void) return mWiFiAPIdleTimeoutMS; } -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return mFlags.Has(Flags::kHaveIPv4InternetConnectivity); -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return mFlags.Has(Flags::kHaveIPv6InternetConnectivity); -} - inline bool ConnectivityManagerImpl::_CanStartWiFiScan() { return mWiFiStationState != kWiFiStationState_Connecting; } -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/Tizen/ConnectivityManagerImpl.cpp b/src/platform/Tizen/ConnectivityManagerImpl.cpp index dc8a721296a88b..0e869e567b1052 100644 --- a/src/platform/Tizen/ConnectivityManagerImpl.cpp +++ b/src/platform/Tizen/ConnectivityManagerImpl.cpp @@ -57,15 +57,6 @@ CHIP_ERROR ConnectivityManagerImpl::_Init(void) void ConnectivityManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event) {} #if CHIP_DEVICE_CONFIG_ENABLE_WIFI -bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} ConnectivityManager::WiFiStationMode ConnectivityManagerImpl::_GetWiFiStationMode(void) { diff --git a/src/platform/Tizen/ConnectivityManagerImpl.h b/src/platform/Tizen/ConnectivityManagerImpl.h index cf88f4c0de1cf9..1175600fee22ef 100644 --- a/src/platform/Tizen/ConnectivityManagerImpl.h +++ b/src/platform/Tizen/ConnectivityManagerImpl.h @@ -77,9 +77,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -144,10 +141,6 @@ inline uint32_t ConnectivityManagerImpl::_GetWiFiAPIdleTimeoutMS() return 0; } -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity() -{ - return _HaveServiceConnectivityViaThread(); -} #endif /** diff --git a/src/platform/cc13x2_26x2/ConnectivityManagerImpl.h b/src/platform/cc13x2_26x2/ConnectivityManagerImpl.h index 467d16ccad5d3e..fe6476b017fab0 100644 --- a/src/platform/cc13x2_26x2/ConnectivityManagerImpl.h +++ b/src/platform/cc13x2_26x2/ConnectivityManagerImpl.h @@ -64,9 +64,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -78,21 +75,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return _HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/fake/ConnectivityManagerImpl.h b/src/platform/fake/ConnectivityManagerImpl.h index 3acb925781ab0f..301a890172f0b6 100644 --- a/src/platform/fake/ConnectivityManagerImpl.h +++ b/src/platform/fake/ConnectivityManagerImpl.h @@ -38,7 +38,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveServiceConnectivity(void) { return false; } CHIP_ERROR _Init(void) { return CHIP_NO_ERROR; } void _OnPlatformEvent(const ChipDeviceEvent * event) {} diff --git a/src/platform/mbed/ConnectivityManagerImpl.h b/src/platform/mbed/ConnectivityManagerImpl.h index 4a49dd49a248d5..8207752fb8053b 100644 --- a/src/platform/mbed/ConnectivityManagerImpl.h +++ b/src/platform/mbed/ConnectivityManagerImpl.h @@ -69,9 +69,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _ProcessInterfaceChange(nsapi_connection_status_t new_status); void OnInterfaceEvent(nsapi_event_t event, intptr_t data); @@ -125,20 +122,6 @@ inline uint32_t ConnectivityManagerImpl::_GetWiFiStationReconnectIntervalMS(void { return mWiFiStationReconnectIntervalMS; } -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return mWiFiStationState == kWiFiStationState_Connected && mIp4Address != Inet::IPAddress::Any; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return mWiFiStationState == kWiFiStationState_Connected && mIp6Address != Inet::IPAddress::Any; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return HaveServiceConnectivityViaThread(); -} /** * Returns the public interface of the ConnectivityManager singleton object. diff --git a/src/platform/nrfconnect/ConnectivityManagerImpl.h b/src/platform/nrfconnect/ConnectivityManagerImpl.h index 39694b2b6a6b9a..16e39cdb1b63db 100644 --- a/src/platform/nrfconnect/ConnectivityManagerImpl.h +++ b/src/platform/nrfconnect/ConnectivityManagerImpl.h @@ -66,9 +66,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -80,21 +77,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return _HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/qpg/ConnectivityManagerImpl.h b/src/platform/qpg/ConnectivityManagerImpl.h index 72e2511871bbbe..61432f71ad0e19 100644 --- a/src/platform/qpg/ConnectivityManagerImpl.h +++ b/src/platform/qpg/ConnectivityManagerImpl.h @@ -64,9 +64,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -78,21 +75,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return _HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. * diff --git a/src/platform/telink/ConnectivityManagerImpl.h b/src/platform/telink/ConnectivityManagerImpl.h index 01f2a2a34cca79..54ba7717346c78 100644 --- a/src/platform/telink/ConnectivityManagerImpl.h +++ b/src/platform/telink/ConnectivityManagerImpl.h @@ -66,9 +66,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, private: // ===== Members that implement the ConnectivityManager abstract interface. - bool _HaveIPv4InternetConnectivity(void); - bool _HaveIPv6InternetConnectivity(void); - bool _HaveServiceConnectivity(void); CHIP_ERROR _Init(void); void _OnPlatformEvent(const ChipDeviceEvent * event); @@ -80,21 +77,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager, static ConnectivityManagerImpl sInstance; }; -inline bool ConnectivityManagerImpl::_HaveIPv4InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveIPv6InternetConnectivity(void) -{ - return false; -} - -inline bool ConnectivityManagerImpl::_HaveServiceConnectivity(void) -{ - return _HaveServiceConnectivityViaThread(); -} - /** * Returns the public interface of the ConnectivityManager singleton object. *