[nrfconnect] Remove test mode from examples (#21676)

It is a leftover from very early phase of the project when we had the redezvous bypass mode. Signed-off-by: Damian Krolik <[email protected]>
project-chip · Aug 9, 2022 · a30d766 · a30d766
1 parent 36fb7cd
commit a30d766
Show file tree

Hide file tree

Showing 43 changed files with 5 additions and 328 deletions.
diff --git a/examples/chef/nrfconnect/CMakeLists.txt b/examples/chef/nrfconnect/CMakeLists.txt
@@ -88,7 +88,6 @@ target_sources(app PRIVATE
     ${CHEF}/common/stubs.cpp
     ${GEN_DIR}/callback-stub.cpp
     ${GEN_DIR}/IMClusterCommandHandler.cpp
-    ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp
 )
 
 message(STATUS ${CHEF}/devices/${SAMPLE_NAME}.zap)

diff --git a/examples/chef/nrfconnect/prj.conf b/examples/chef/nrfconnect/prj.conf
@@ -28,12 +28,6 @@ CONFIG_PWM=y
 # OpenThread configs
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y
 
-# Default OpenThread network settings
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
-CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-
 # Bluetooth overrides
 CONFIG_BT_DEVICE_NAME="MatterLight"
 

diff --git a/examples/light-switch-app/nrfconnect/CMakeLists.txt b/examples/light-switch-app/nrfconnect/CMakeLists.txt
@@ -61,7 +61,6 @@ target_sources(app PRIVATE
                ${GEN_DIR}/light-switch-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
-               ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp)
 
 
 if(CONFIG_CHIP_OTA_REQUESTOR)

diff --git a/examples/light-switch-app/nrfconnect/README.md b/examples/light-switch-app/nrfconnect/README.md
@@ -102,11 +102,6 @@ has Thread disabled, and it should be paired with Matter controller and get
 configuration from it. Some actions required before establishing full
 communication are described below.
 
-The example also comes with a test mode, which allows to start Thread with the
-default settings by pressing button manually. However, this mode does not
-guarantee that the device will be able to communicate with the Matter controller
-and other devices.
-
 The example can be configured to use the secure bootloader and utilize it for
 performing over-the-air Device Firmware Upgrade using Bluetooth LE.
 

diff --git a/examples/light-switch-app/nrfconnect/main/AppTask.cpp b/examples/light-switch-app/nrfconnect/main/AppTask.cpp
@@ -20,7 +20,6 @@
 #include "AppConfig.h"
 #include "LEDWidget.h"
 #include "LightSwitch.h"
-#include "ThreadUtil.h"
 
 #include <DeviceInfoProviderImpl.h>
 #include <app/clusters/identify-server/identify-server.h>

diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt
@@ -61,8 +61,7 @@ target_sources(app PRIVATE
                ${GEN_DIR}/lighting-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/lighting-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
-               ${NRFCONNECT_COMMON}/util/PWMDevice.cpp
-               ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp)
+               ${NRFCONNECT_COMMON}/util/PWMDevice.cpp)
 
 chip_configure_data_model(app
     INCLUDE_SERVER

diff --git a/examples/lighting-app/nrfconnect/README.md b/examples/lighting-app/nrfconnect/README.md
@@ -63,11 +63,6 @@ Thread disabled, and it should be paired with Matter controller and get
 configuration from it. Some actions required before establishing full
 communication are described below.
 
-The example also comes with a test mode, which allows to start Thread with the
-default settings by pressing button manually. However, this mode does not
-guarantee that the device will be able to communicate with the Matter controller
-and other devices.
-
 The example can be configured to use the secure bootloader and utilize it for
 performing over-the-air Device Firmware Upgrade using Bluetooth LE.
 
@@ -241,9 +236,6 @@ effect.
 **Button 2** &mdash; Pressing the button once changes the lighting state to the
 opposite one.
 
-**Button 3** &mdash; Pressing the button once starts the Thread networking in
-the test mode using the default configuration.
-
 **Button 4** &mdash; Pressing the button once starts the NFC tag emulation and
 enables Bluetooth LE advertising for the predefined period of time (15 minutes
 by default).

diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -22,7 +22,6 @@
 #include "AppEvent.h"
 #include "LEDWidget.h"
 #include "PWMDevice.h"
-#include "ThreadUtil.h"
 
 #include <DeviceInfoProviderImpl.h>
 #include <app-common/zap-generated/attribute-id.h>
@@ -270,14 +269,6 @@ void AppTask::ButtonEventHandler(uint32_t button_state, uint32_t has_changed)
         sAppTask.PostEvent(&button_event);
     }
 
-    if (THREAD_START_BUTTON_MASK & button_state & has_changed)
-    {
-        button_event.ButtonEvent.PinNo  = THREAD_START_BUTTON;
-        button_event.ButtonEvent.Action = kButtonPushEvent;
-        button_event.Handler            = StartThreadHandler;
-        sAppTask.PostEvent(&button_event);
-    }
-
     if (BLE_ADVERTISEMENT_START_BUTTON_MASK & button_state & has_changed)
     {
         button_event.ButtonEvent.PinNo  = BLE_ADVERTISEMENT_START_BUTTON;
@@ -399,22 +390,6 @@ void AppTask::FunctionHandler(AppEvent * aEvent)
     }
 }
 
-void AppTask::StartThreadHandler(AppEvent * aEvent)
-{
-    if (aEvent->ButtonEvent.PinNo != THREAD_START_BUTTON)
-        return;
-
-    if (!chip::DeviceLayer::ConnectivityMgr().IsThreadProvisioned())
-    {
-        StartDefaultThreadNetwork();
-        LOG_INF("Device is not commissioned to a Thread network. Starting with the default configuration.");
-    }
-    else
-    {
-        LOG_INF("Device is commissioned to a Thread network.");
-    }
-}
-
 void AppTask::StartBLEAdvertisementHandler(AppEvent *)
 {
     if (Server::GetInstance().GetFabricTable().FabricCount() != 0)

diff --git a/examples/lighting-app/nrfconnect/main/include/AppConfig.h b/examples/lighting-app/nrfconnect/main/include/AppConfig.h
@@ -24,8 +24,6 @@
 #define LIGHTING_BUTTON_MASK DK_BTN2_MSK
 #define FUNCTION_BUTTON DK_BTN1
 #define FUNCTION_BUTTON_MASK DK_BTN1_MSK
-#define THREAD_START_BUTTON DK_BTN3
-#define THREAD_START_BUTTON_MASK DK_BTN3_MSK
 #define BLE_ADVERTISEMENT_START_BUTTON DK_BTN4
 #define BLE_ADVERTISEMENT_START_BUTTON_MASK DK_BTN4_MSK
 

diff --git a/examples/lighting-app/nrfconnect/main/include/AppTask.h b/examples/lighting-app/nrfconnect/main/include/AppTask.h
@@ -74,7 +74,6 @@ class AppTask
     static void UpdateLedStateEventHandler(AppEvent * aEvent);
     static void FunctionTimerEventHandler(AppEvent * aEvent);
     static void FunctionHandler(AppEvent * aEvent);
-    static void StartThreadHandler(AppEvent * aEvent);
     static void LightingActionEventHandler(AppEvent * aEvent);
     static void StartBLEAdvertisementHandler(AppEvent * aEvent);
 

diff --git a/examples/lighting-app/nrfconnect/prj.conf b/examples/lighting-app/nrfconnect/prj.conf
@@ -28,12 +28,6 @@ CONFIG_PWM=y
 # OpenThread configs
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y
 
-# Default OpenThread network settings
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
-CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-
 # Bluetooth overrides
 CONFIG_BT_DEVICE_NAME="MatterLight"
 

diff --git a/examples/lighting-app/nrfconnect/prj_no_dfu.conf b/examples/lighting-app/nrfconnect/prj_no_dfu.conf
@@ -28,12 +28,6 @@ CONFIG_PWM=y
 # OpenThread configs
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y
 
-# Default OpenThread network settings
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
-CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-
 # Bluetooth overrides
 CONFIG_BT_DEVICE_NAME="MatterLight"
 

diff --git a/examples/lighting-app/nrfconnect/prj_release.conf b/examples/lighting-app/nrfconnect/prj_release.conf
@@ -28,12 +28,6 @@ CONFIG_PWM=y
 # OpenThread configs
 CONFIG_OPENTHREAD_NORDIC_LIBRARY_FTD=y
 
-# Default OpenThread network settings
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
-CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-
 # Bluetooth overrides
 CONFIG_BT_DEVICE_NAME="MatterLight"
 

diff --git a/examples/lock-app/nrfconnect/CMakeLists.txt b/examples/lock-app/nrfconnect/CMakeLists.txt
@@ -58,8 +58,7 @@ target_sources(app PRIVATE
                main/ZclCallbacks.cpp
                ${GEN_DIR}/lock-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/lock-app/zap-generated/IMClusterCommandHandler.cpp
-               ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
-               ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp)
+               ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 
 chip_configure_data_model(app
     INCLUDE_SERVER

diff --git a/examples/lock-app/nrfconnect/README.md b/examples/lock-app/nrfconnect/README.md
@@ -62,11 +62,6 @@ Thread disabled, and it should be paired with Matter controller and get
 configuration from it. Some actions required before establishing full
 communication are described below.
 
-The example also comes with a test mode, which allows to start Thread with the
-default settings by pressing button manually. However, this mode does not
-guarantee that the device will be able to communicate with the Matter controller
-and other devices.
-
 The example can be configured to use the secure bootloader and utilize it for
 performing over-the-air Device Firmware Upgrade using Bluetooth LE.
 
@@ -227,9 +222,6 @@ states are possible:
 **Button 2** &mdash; Pressing the button once changes the lock state to the
 opposite one.
 
-**Button 3** &mdash; Pressing the button once starts the Thread networking in
-the test mode using the default configuration.
-
 **Button 4** &mdash; Pressing the button once starts the NFC tag emulation and
 enables Bluetooth LE advertising for the predefined period of time (15 minutes
 by default).

diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp
@@ -20,7 +20,6 @@
 #include "AppConfig.h"
 #include "BoltLockManager.h"
 #include "LEDWidget.h"
-#include "ThreadUtil.h"
 
 #include <DeviceInfoProviderImpl.h>
 #include <app-common/zap-generated/attribute-id.h>
@@ -249,14 +248,6 @@ void AppTask::ButtonEventHandler(uint32_t button_state, uint32_t has_changed)
         sAppTask.PostEvent(&button_event);
     }
 
-    if (THREAD_START_BUTTON_MASK & button_state & has_changed)
-    {
-        button_event.ButtonEvent.PinNo  = THREAD_START_BUTTON;
-        button_event.ButtonEvent.Action = BUTTON_PUSH_EVENT;
-        button_event.Handler            = StartThreadHandler;
-        sAppTask.PostEvent(&button_event);
-    }
-
     if (BLE_ADVERTISEMENT_START_BUTTON_MASK & button_state & has_changed)
     {
         button_event.ButtonEvent.PinNo  = BLE_ADVERTISEMENT_START_BUTTON;
@@ -373,22 +364,6 @@ void AppTask::FunctionHandler(AppEvent * aEvent)
     }
 }
 
-void AppTask::StartThreadHandler(AppEvent * aEvent)
-{
-    if (aEvent->ButtonEvent.PinNo != THREAD_START_BUTTON)
-        return;
-
-    if (!ConnectivityMgr().IsThreadProvisioned())
-    {
-        StartDefaultThreadNetwork();
-        LOG_INF("Device is not commissioned to a Thread network. Starting with the default configuration.");
-    }
-    else
-    {
-        LOG_INF("Device is commissioned to a Thread network.");
-    }
-}
-
 void AppTask::StartBLEAdvertisementHandler(AppEvent *)
 {
     if (Server::GetInstance().GetFabricTable().FabricCount() != 0)

diff --git a/examples/lock-app/nrfconnect/main/include/AppConfig.h b/examples/lock-app/nrfconnect/main/include/AppConfig.h
@@ -24,8 +24,6 @@
 #define LOCK_BUTTON_MASK DK_BTN2_MSK
 #define FUNCTION_BUTTON DK_BTN1
 #define FUNCTION_BUTTON_MASK DK_BTN1_MSK
-#define THREAD_START_BUTTON DK_BTN3
-#define THREAD_START_BUTTON_MASK DK_BTN3_MSK
 #define BLE_ADVERTISEMENT_START_BUTTON DK_BTN4
 #define BLE_ADVERTISEMENT_START_BUTTON_MASK DK_BTN4_MSK
 

diff --git a/examples/lock-app/nrfconnect/main/include/AppTask.h b/examples/lock-app/nrfconnect/main/include/AppTask.h
@@ -59,7 +59,6 @@ class AppTask
     static void UpdateLedStateEventHandler(AppEvent * aEvent);
     static void FunctionTimerEventHandler(AppEvent * aEvent);
     static void FunctionHandler(AppEvent * aEvent);
-    static void StartThreadHandler(AppEvent * aEvent);
     static void LockActionEventHandler(AppEvent * aEvent);
     static void StartBLEAdvertisementHandler(AppEvent * aEvent);
 

diff --git a/examples/lock-app/nrfconnect/prj.conf b/examples/lock-app/nrfconnect/prj.conf
@@ -30,12 +30,6 @@ CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n
 CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y
 
-# Default OpenThread network settings
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
-CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-
 # Bluetooth overrides
 CONFIG_BT_DEVICE_NAME="MatterLock"
 

diff --git a/examples/lock-app/nrfconnect/prj_no_dfu.conf b/examples/lock-app/nrfconnect/prj_no_dfu.conf
@@ -30,12 +30,6 @@ CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n
 CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y
 
-# Default OpenThread network settings
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
-CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-
 # Bluetooth overrides
 CONFIG_BT_DEVICE_NAME="MatterLock"
 

diff --git a/examples/lock-app/nrfconnect/prj_release.conf b/examples/lock-app/nrfconnect/prj_release.conf
@@ -30,12 +30,6 @@ CONFIG_OPENTHREAD_MTD=y
 CONFIG_OPENTHREAD_FTD=n
 CONFIG_CHIP_ENABLE_SLEEPY_END_DEVICE_SUPPORT=y
 
-# Default OpenThread network settings
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_NETWORK_NAME="OpenThread"
-CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-
 # Bluetooth overrides
 CONFIG_BT_DEVICE_NAME="MatterLock"
 

diff --git a/examples/platform/nrfconnect/util/ThreadUtil.cpp b/examples/platform/nrfconnect/util/ThreadUtil.cpp
diff --git a/examples/platform/nrfconnect/util/include/ThreadUtil.h b/examples/platform/nrfconnect/util/include/ThreadUtil.h
diff --git a/examples/pump-app/nrfconnect/CMakeLists.txt b/examples/pump-app/nrfconnect/CMakeLists.txt
@@ -58,8 +58,7 @@ target_sources(app PRIVATE
                main/ZclCallbacks.cpp
                ${GEN_DIR}/pump-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/pump-app/zap-generated/IMClusterCommandHandler.cpp
-               ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
-               ${NRFCONNECT_COMMON}/util/ThreadUtil.cpp)
+               ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 
 chip_configure_data_model(app
     INCLUDE_SERVER