Merge branch 'master' into feature/unittest-protocols-bdx-tests

examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/bluetooth/BluetoothManager.kt

@@ -138,6 +138,12 @@ class BluetoothManager : BleCallback {
 
       private val coroutineContinuation = continuation
 
+      private val STATE_INIT = 1
+      private val STATE_DISCOVER_SERVICE = 2
+      private val STATE_REQUEST_MTU = 3
+
+      private var mState = STATE_INIT
+
       override fun onConnectionStateChange(gatt: BluetoothGatt?, status: Int, newState: Int) {
         super.onConnectionStateChange(gatt, status, newState)
         Log.i(
@@ -148,21 +154,31 @@ class BluetoothManager : BleCallback {
 
         if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) {
           Log.i("$TAG|onConnectionStateChange", "Discovering Services...")
+          mState = STATE_DISCOVER_SERVICE
           gatt?.discoverServices()
         }
       }
 
       override fun onServicesDiscovered(gatt: BluetoothGatt?, status: Int) {
         Log.d(TAG, "${gatt?.device?.name}.onServicesDiscovered status = $status")
+        if (mState != STATE_DISCOVER_SERVICE) {
+          Log.d(TAG, "Invalid state : $mState")
+          return
+        }
         wrappedCallback.onServicesDiscovered(gatt, status)
 
         Log.i("$TAG|onServicesDiscovered", "Services Discovered")
+        mState = STATE_REQUEST_MTU
         gatt?.requestMtu(247)
       }
 
       override fun onMtuChanged(gatt: BluetoothGatt?, mtu: Int, status: Int) {
         Log.d(TAG, "${gatt?.device?.name}.onMtuChanged: connecting to CHIP device")
         super.onMtuChanged(gatt, mtu, status)
+        if (mState != STATE_REQUEST_MTU) {
+          Log.d(TAG, "Invalid state : $mState")
+          return
+        }
         wrappedCallback.onMtuChanged(gatt, mtu, status)
         if (coroutineContinuation.isActive) {
           coroutineContinuation.resume(gatt)

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

@@ -28,6 +28,7 @@
 
 #include "AppEvent.h"
 #include "BaseApplication.h"
+#include <app/icd/server/ICDStateObserver.h>
 #include <ble/Ble.h>
 #include <cmsis_os2.h>
 #include <lib/core/CHIPError.h>
@@ -49,11 +50,12 @@
  * AppTask Declaration
  *********************************************************/
 
-class AppTask : public BaseApplication
+class AppTask : public BaseApplication, public chip::app::ICDStateObserver
 {
 
 public:
-    AppTask() = default;
+    AppTask()          = default;
+    virtual ~AppTask() = default;
 
     static AppTask & GetAppTask() { return sAppTask; }
 
@@ -76,6 +78,28 @@ class AppTask : public BaseApplication
      */
     static void ButtonEventHandler(uint8_t button, uint8_t btnAction);
 
+    /**
+     * @brief When the ICD enters ActiveMode, update LCD to reflect the ICD current state.
+     *        Set LCD to ActiveMode UI.
+     */
+    void OnEnterActiveMode();
+
+    /**
+     * @brief When the ICD enters IdleMode, update LCD to reflect the ICD current state.
+     *        Set LCD to IdleMode UI.
+     */
+    void OnEnterIdleMode();
+
+    /**
+     * @brief AppTask has no action to do on this ICD event. Do nothing.
+     */
+    void OnTransitionToIdle(){};
+
+    /**
+     * @brief AppTask has no action to do on this ICD event. Do nothing.
+     */
+    void OnICDModeChange(){};
+
 private:
     static AppTask sAppTask;
 

examples/lit-icd-app/silabs/include/CHIPProjectConfig.h

@@ -86,3 +86,10 @@
  * A size, in bytes, of the individual debug event logging buffer.
  */
 #define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)
+
+/**
+ * @brief CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE
+ *
+ * Increase default(2) by 1 to account for the AppTask registering
+ */
+#define CHIP_CONFIG_ICD_OBSERVERS_POOL_SIZE 3

examples/lit-icd-app/silabs/src/AppTask.cpp

@@ -33,17 +33,18 @@
 #endif // QR_CODE_ENABLED
 #endif // DISPLAY_ENABLED
 
+#include <app-common/zap-generated/attributes/Accessors.h>
+#include <app-common/zap-generated/ids/Clusters.h>
 #include <app/server/OnboardingCodesUtil.h>
 #include <app/server/Server.h>
 #include <app/util/attribute-storage.h>
 #include <assert.h>
 #include <lib/support/CodeUtils.h>
 #include <platform/CHIPDeviceLayer.h>
+#include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
 
-#include <platform/silabs/platformAbstraction/SilabsPlatform.h>
-
 /**********************************************************
  * Defines and Constants
  *********************************************************/
@@ -103,6 +104,8 @@ void AppTask::AppTaskMain(void * pvParameter)
         appError(err);
     }
 
+    chip::Server::GetInstance().GetICDManager().RegisterObserver(&sAppTask);
+
 #if !(defined(CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER)
     sAppTask.StartStatusLEDTimer();
 #endif
@@ -122,7 +125,28 @@ void AppTask::AppTaskMain(void * pvParameter)
 void AppTask::ApplicationEventHandler(AppEvent * aEvent)
 {
     VerifyOrReturn(aEvent->Type == AppEvent::kEventType_Button);
-    // TODO - trigger some application event
+    VerifyOrReturn(aEvent->ButtonEvent.Action == static_cast<uint8_t>(SilabsPlatform::ButtonAction::ButtonPressed));
+
+    // Simple Application logic that toggles the BoleanState StateValue attribute.
+    // DO NOT COPY for product logic. LIT ICD app is a test app with very simple application logic to enable testing.
+    // The goal of the app is just to enable testing of LIT ICD features without impacting product sample apps.
+    PlatformMgr().ScheduleWork([](intptr_t) {
+        bool state = true;
+
+        Protocols::InteractionModel::Status status = chip::app::Clusters::BooleanState::Attributes::StateValue::Get(1, &state);
+        if (status != Protocols::InteractionModel::Status::Success)
+        {
+            // Failed to read StateValue. Default to true (open state)
+            state = true;
+            ChipLogError(NotSpecified, "ERR: reading boolean status value %x", to_underlying(status));
+        }
+
+        status = chip::app::Clusters::BooleanState::Attributes::StateValue::Set(1, !state);
+        if (status != Protocols::InteractionModel::Status::Success)
+        {
+            ChipLogError(NotSpecified, "ERR: updating boolean status value %x", to_underlying(status));
+        }
+    });
 }
 
 void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
@@ -142,3 +166,15 @@ void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)
         sAppTask.PostEvent(&button_event);
     }
 }
+
+// DO NOT COPY for product logic. LIT ICD app is a test app with very simple application logic to enable testing.
+void AppTask::OnEnterActiveMode()
+{
+    sAppTask.GetLCD().WriteDemoUI(true);
+}
+
+// DO NOT COPY for product logic. LIT ICD app is a test app with very simple application logic to enable testing.
+void AppTask::OnEnterIdleMode()
+{
+    sAppTask.GetLCD().WriteDemoUI(false);
+}

examples/minimal-mdns/BUILD.gn

@@ -31,6 +31,21 @@ static_library("minimal-mdns-example-common") {
   ]
 }
 
+executable("minimal-mdns-tester") {
+  sources = [ "tester.cpp" ]
+
+  deps = [
+    ":minimal-mdns-example-common",
+    "${chip_root}/examples/common/tracing:commandline",
+    "${chip_root}/src/lib",
+    "${chip_root}/src/lib/dnssd/minimal_mdns",
+  ]
+
+  cflags = [ "-Wconversion" ]
+
+  output_dir = root_out_dir
+}
+
 executable("minimal-mdns-client") {
   sources = [ "client.cpp" ]
 
@@ -83,5 +98,6 @@ group("default") {
     ":minimal-mdns-client",
     ":minimal-mdns-example-common",
     ":minimal-mdns-server",
+    ":minimal-mdns-tester",
   ]
 }

examples/minimal-mdns/client.cpp

@@ -185,10 +185,10 @@ class ReportDelegate : public mdns::Minimal::ServerDelegate
 public:
     void OnQuery(const mdns::Minimal::BytesRange & data, const chip::Inet::IPPacketInfo * info) override
     {
-        char addr[32];
+        char addr[Inet::IPAddress::kMaxStringLength];
         info->SrcAddress.ToString(addr, sizeof(addr));
 
-        char ifName[64];
+        char ifName[Inet::InterfaceId::kMaxIfNameLength];
         VerifyOrDie(info->Interface.GetInterfaceName(ifName, sizeof(ifName)) == CHIP_NO_ERROR);
 
         printf("QUERY from: %-15s on port %d, via interface %s\n", addr, info->SrcPort, ifName);
@@ -197,10 +197,10 @@ class ReportDelegate : public mdns::Minimal::ServerDelegate
 
     void OnResponse(const mdns::Minimal::BytesRange & data, const chip::Inet::IPPacketInfo * info) override
     {
-        char addr[32];
+        char addr[Inet::IPAddress::kMaxStringLength];
         info->SrcAddress.ToString(addr, sizeof(addr));
 
-        char ifName[64];
+        char ifName[Inet::InterfaceId::kMaxIfNameLength];
         VerifyOrDie(info->Interface.GetInterfaceName(ifName, sizeof(ifName)) == CHIP_NO_ERROR);
 
         printf("RESPONSE from: %-15s on port %d, via interface %s\n", addr, info->SrcPort, ifName);

examples/minimal-mdns/server.cpp

@@ -126,10 +126,10 @@ class ReplyDelegate : public mdns::Minimal::ServerDelegate, public mdns::Minimal
 
     void OnQuery(const mdns::Minimal::BytesRange & data, const Inet::IPPacketInfo * info) override
     {
-        char addr[INET6_ADDRSTRLEN];
+        char addr[Inet::IPAddress::kMaxStringLength];
         info->SrcAddress.ToString(addr, sizeof(addr));
 
-        char ifName[64];
+        char ifName[Inet::InterfaceId::kMaxIfNameLength];
         VerifyOrDie(info->Interface.GetInterfaceName(ifName, sizeof(ifName)) == CHIP_NO_ERROR);
 
         printf("QUERY from: %-15s on port %d, via interface %s\n", addr, info->SrcPort, ifName);
@@ -145,10 +145,10 @@ class ReplyDelegate : public mdns::Minimal::ServerDelegate, public mdns::Minimal
 
     void OnResponse(const mdns::Minimal::BytesRange & data, const Inet::IPPacketInfo * info) override
     {
-        char addr[INET6_ADDRSTRLEN];
+        char addr[Inet::IPAddress::kMaxStringLength];
         info->SrcAddress.ToString(addr, sizeof(addr));
 
-        char ifName[64];
+        char ifName[Inet::InterfaceId::kMaxIfNameLength];
         VerifyOrDie(info->Interface.GetInterfaceName(ifName, sizeof(ifName)) == CHIP_NO_ERROR);
 
         printf("RESPONSE from: %-15s on port %d, via interface %s\n", addr, info->SrcPort, ifName);